Refactored projection matrix to be public.

Author: ggarra13

src/docs/HISTORY.md

@@ -64,6 +64,7 @@ ChangeLog
 - Added support for Pixar's Renderman .z or .zfile shadow map files.
 - Fixed the OpenGL bug in macOS mrv2.  There's no longer any need to change your System Settings.
 - Switch to A Compare Mode if only a single file is left open.
+- Python command to getVoiceAnnotationsJSON now returns the projection matrix.
 
 
 v1.5.2

src/lib/mrvGL/mrvGLViewportDraw.cpp

@@ -860,7 +860,7 @@ namespace mrv
             const auto& viewportSize = getViewportSize();
             const auto& renderSize = getRenderSize();
 
-            math::Matrix4x4f mvp = _projectionMatrix();
+            math::Matrix4x4f mvp = projectionMatrix();
             mvp = mvp * math::scale(math::Vector3f(1.F, -1.F, 1.F));
             gl.render->setTransform(mvp);
 
@@ -1216,7 +1216,7 @@ namespace mrv
             box.min.y = -(renderSize.h - box.min.y);
             box.max.y = -(renderSize.h - box.max.y);
 
-            math::Matrix4x4f mvp = _projectionMatrix();
+            math::Matrix4x4f mvp = projectionMatrix();
             mvp = mvp * math::scale(math::Vector3f(1.F, -1.F, 1.F));
             gl.render->setTransform(mvp);
 

src/lib/mrvGL/mrvGLViewportPrims.cpp

@@ -196,7 +196,7 @@ namespace mrv
                 CHECK_GL;
             }
 
-            return _projectionMatrix();
+            return projectionMatrix();
         }
 
     } // namespace opengl

src/lib/mrvPy/Annotations.cpp

@@ -120,6 +120,7 @@ namespace mrv2
             const auto& viewportSize = App::ui->uiView->getViewportSize();
             const auto& renderSize = App::ui->uiView->getRenderSize();
             const float viewZoom = App::ui->uiView->viewZoom();
+            const math::Matrix4x4f& mvp = App::ui->uiView->projectionMatrix();
 
             // Calculate resolution multiplier.
             float resolutionMultiplier = renderSize.w * 6 / 4096.0 / viewZoom;
@@ -129,6 +130,7 @@ namespace mrv2
             j["viewportSize"] = viewportSize;
             j["renderSize"] = renderSize;
             j["viewZoom"] = viewZoom;
+            j["mvp"] = mvp;
 
             auto annotations = player->getVoiceAnnotations();
             std::vector<nlohmann::json > voiceAnnotations;

src/lib/mrvViewport/mrvTimelineViewport.cpp

@@ -3872,7 +3872,8 @@ namespace mrv
         }
 
 
-        math::Matrix4x4f TimelineViewport::_projectionMatrix() const noexcept
+        const math::Matrix4x4f
+        TimelineViewport::projectionMatrix() const noexcept
         {
             TLRENDER_P();
 

src/lib/mrvViewport/mrvTimelineViewport.h

@@ -424,6 +424,9 @@ namespace mrv
 
             //! Append audio and mouse movements to current voice over.
             void voiceOverAppend();
+
+            //! Get the full projection matrix.
+            const math::Matrix4x4f projectionMatrix() const noexcept;
 
         protected:
             void _init();
@@ -452,9 +455,6 @@ namespace mrv
             //! Get the render projection matrix.
             math::Matrix4x4f _renderProjectionMatrix() const noexcept;
 
-            //! Get the full projection matrix.
-            math::Matrix4x4f _projectionMatrix() const noexcept;
-
             //! Get the matrix to pixel (raster) coordinates of image.
             math::Matrix4x4f _pixelMatrix() const noexcept;
 

src/lib/mrvVk/mrvVkViewportDraw.cpp

@@ -548,7 +548,7 @@ namespace mrv
                 selection.max.x++;
                 selection.max.y++;
             }
-            const math::Matrix4x4f mvp = _projectionMatrix();
+            const math::Matrix4x4f& mvp = projectionMatrix();
             _drawRectangleOutline("selection", mvp, selection, color);
         }
 
@@ -622,7 +622,7 @@ namespace mrv
             const auto& viewportSize = getViewportSize();
             const auto& renderSize = getRenderSize();
 
-            const math::Matrix4x4f mvp = _projectionMatrix();
+            const math::Matrix4x4f& mvp = projectionMatrix();
             const VkRenderPass oldRenderPass = vk.render->getRenderPass();
             const math::Matrix4x4f oldTransform = vk.render->getTransform();
 
@@ -993,7 +993,7 @@ namespace mrv
             std::stringstream ss(dw);
             ss >> box;
 
-            const math::Matrix4x4f mvp = _projectionMatrix();
+            const math::Matrix4x4f& mvp = projectionMatrix();
             const VkRenderPass oldRenderPass = vk.render->getRenderPass();
             const math::Matrix4x4f oldTransform = vk.render->getTransform();
 

src/lib/mrvVk/mrvVkViewportPrims.cpp

@@ -195,7 +195,7 @@ namespace mrv
                 prepare_pipeline();
             }
 
-            return _projectionMatrix();
+            return projectionMatrix();
         }
 
     } // namespace vulkan