Merge branch 'main' into remove_mu_print_redirect

Author: pbergeron-adsk

src/lib/app/RvApp/CommandsModule.cpp

@@ -550,20 +550,25 @@ namespace Rv
             d->width() - m.left - m.right, d->height() - m.bottom - m.top, 4,
             TwkFB::FrameBuffer::UCHAR);
 
-        const ImageRenderer::GLFBO* fbo =
-            renderer->newOutputOnlyImageFBO(GL_RGBA8)->fbo();
+        // Get current framebuffer id.
+        GLuint qtDefaultFBO;
+        glGetIntegerv(GL_FRAMEBUFFER_BINDING_EXT, (GLint*)&qtDefaultFBO);
+
         renderer->render(s->currentFrame(), s->displayImage());
 
         glFinish();
 
+        // Ensure we're reading from Qt's default framebuffer.
+        glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, d->fboID());
+
         glReadPixels(m.left, m.bottom, d->width() - m.left - m.right,
                      d->height() - m.bottom - m.top, GL_RGBA, GL_UNSIGNED_BYTE,
                      fb->pixels<unsigned char>());
 
         glFinish();
 
-        fbo->unbind();
-        renderer->releaseImageFBO(fbo);
+        // Restore original framebuffer.
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, qtDefaultFBO);
 
         TwkFB::FrameBufferIO::WriteRequest request;
         TwkFB::FrameBufferIO::ConstFrameBufferVector fbs(1);

src/lib/ip/IPMu/CommandsModule.cpp

@@ -1805,6 +1805,49 @@ namespace IPMu
         NODE_RETURN(mp);
     }
 
+    NODE_IMPLEMENTATION(ndc2event, Mu::Vector2f)
+    {
+        // Convert from Normalized Device Coordinates (NDC) space [-1, 1] to
+        // event space coordinates.
+        // This bypasses image transforms and works purely in viewport space.
+        // Height spans 2 NDC units, and assumes the viewport fully contains the
+        // height of the image (eg: has vertical bars, no horizontal bars).
+        //
+        // When that is not the case (eg: we have horizontal bars) the
+        // scale of the drawing end up not being "quite" the same, but, since
+        // this functionality (at least for now) is purely to test concurrent
+        // annotation drawing on multiple computers in live review scenarios,
+        // this doesn't matter one bit.
+        //
+        Session* s = Session::currentSession();
+        Vector2f inp = NODE_ARG(0, Vector2f);
+        float x = inp[0];
+        float y = inp[1];
+
+        Vector2f mp;
+        try
+        {
+            Box2f vp = s->renderer()->viewport();
+            float vpWidth = vp.size().x;
+            float vpHeight = vp.size().y;
+            // Map from NDC space to viewport space using the smaller dimension
+            // This ensures square coordinate space regardless of viewport
+            // aspect ratio
+            float minDimension = min(vpWidth, vpHeight);
+            mp[0] = (x + 1.0f) * 0.5f * minDimension + vp.min.x
+                    + (vpWidth - minDimension) * 0.5f;
+            mp[1] = (y + 1.0f) * 0.5f * minDimension + vp.min.y
+                    + (vpHeight - minDimension) * 0.5f;
+        }
+        catch (...)
+        {
+            // If viewport is not available, return the input coordinates
+            mp[0] = x;
+            mp[1] = y;
+        }
+        NODE_RETURN(mp);
+    }
+
     NODE_IMPLEMENTATION(imagesAtPixel, Pointer)
     {
         Process* p = NODE_THREAD.process();
@@ -6083,6 +6126,10 @@ namespace IPMu
                          new Param(c, "sourceName", "string"),
                          new Param(c, "point", "vector float[2]"), End),
 
+            new Function(c, "ndcToEventSpace", ndc2event, None, Return,
+                         "vector float[2]", Parameters,
+                         new Param(c, "point", "vector float[2]"), End),
+
             new Function(c, "imagesAtPixel", imagesAtPixel, None, Return,
                          "PixelImageInfo[]", Parameters,
                          new Param(c, "point", "vector float[2]"),