Merge pull request #334 from vsg-dev/CoordinateFrame

robertosfield · web-flow · commit 2a7bd2e62fa0 · 2024-12-16T19:32:20.000Z
Added vsgcoordinateframe example to test/illustrate use of the vsg::CoordinateFrame node.
diff --git a/examples/app/vsgheadless/vsgheadless.cpp b/examples/app/vsgheadless/vsgheadless.cpp
@@ -526,7 +526,7 @@ int main(int argc, char** argv)
 
     if (pathFilename)
     {
-        auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (cameraAnimation->animation) cameraAnimation->play();
     }
diff --git a/examples/app/vsgmultigpu/vsgmultigpu.cpp b/examples/app/vsgmultigpu/vsgmultigpu.cpp
@@ -337,7 +337,7 @@ int main(int argc, char** argv)
 
     if (pathFilename)
     {
-        auto cameraAnimation = vsg::CameraAnimation::create(master_camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(master_camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (cameraAnimation->animation) cameraAnimation->play();
     }
diff --git a/examples/app/vsgrendertotexturearray/vsgrendertotexturearray.cpp b/examples/app/vsgrendertotexturearray/vsgrendertotexturearray.cpp
@@ -551,7 +551,7 @@ int main(int argc, char** argv)
     // add close handler to respond to the close window button and pressing escape
     viewer->addEventHandler(vsg::CloseHandler::create(viewer));
 
-    auto animationPathHandler = vsg::CameraAnimation::create(camera, pathFilename, options);
+    auto animationPathHandler = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
     if (animationPathHandler->animation) animationPathHandler->play();
     viewer->addEventHandler(animationPathHandler);
 
diff --git a/examples/app/vsgviewer/vsgviewer.cpp b/examples/app/vsgviewer/vsgviewer.cpp
@@ -271,7 +271,7 @@ int main(int argc, char** argv)
         // add close handler to respond to the close window button and pressing escape
         viewer->addEventHandler(vsg::CloseHandler::create(viewer));
 
-        auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (autoPlay && cameraAnimation->animation)
         {
diff --git a/examples/commands/vsgexecutecommands/vsgexecutecommands.cpp b/examples/commands/vsgexecutecommands/vsgexecutecommands.cpp
@@ -279,7 +279,7 @@ int main(int argc, char** argv)
 
     if (pathFilename)
     {
-        auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (cameraAnimation->animation) cameraAnimation->play();
     }
diff --git a/examples/commands/vsgocclusionquery/vsgocclusionquery.cpp b/examples/commands/vsgocclusionquery/vsgocclusionquery.cpp
@@ -126,7 +126,7 @@ int main(int argc, char** argv)
 
     if (pathFilename)
     {
-        auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (cameraAnimation->animation) cameraAnimation->play();
     }
diff --git a/examples/commands/vsgtimestamps/vsgtimestamps.cpp b/examples/commands/vsgtimestamps/vsgtimestamps.cpp
@@ -145,7 +145,7 @@ int main(int argc, char** argv)
 
     if (pathFilename)
     {
-        auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (cameraAnimation->animation) cameraAnimation->play();
     }
diff --git a/examples/core/vsgallocator/vsgallocator.cpp b/examples/core/vsgallocator/vsgallocator.cpp
@@ -254,7 +254,7 @@ int main(int argc, char** argv)
 
             if (pathFilename)
             {
-                auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+                auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
                 viewer->addEventHandler(cameraAnimation);
                 if (cameraAnimation->animation) cameraAnimation->play();
             }
diff --git a/examples/lighting/vsgshadow/vsgshadow.cpp b/examples/lighting/vsgshadow/vsgshadow.cpp
@@ -641,7 +641,7 @@ int main(int argc, char** argv)
     // add close handler to respond the close window button and pressing escape
     viewer->addEventHandler(vsg::CloseHandler::create(viewer));
 
-    auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+    auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
     viewer->addEventHandler(cameraAnimation);
     if (cameraAnimation->animation)
     {
diff --git a/examples/nodes/vsgannotation/vsgannotation.cpp b/examples/nodes/vsgannotation/vsgannotation.cpp
@@ -234,7 +234,7 @@ int main(int argc, char** argv)
 
         if (pathFilename)
         {
-            auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+            auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
             viewer->addEventHandler(cameraAnimation);
             if (cameraAnimation->animation) cameraAnimation->play();
         }
diff --git a/examples/nodes/vsgcoordinateframe/vsgcoordinateframe.cpp b/examples/nodes/vsgcoordinateframe/vsgcoordinateframe.cpp
@@ -791,12 +791,13 @@ int main(int argc, char** argv)
     auto viewpoints = vsg::visit<FindViewpoints>(universe).viewpoints;
     for(auto& [name, objectPath] : viewpoints)
     {
-        std::cout<<"viewoint ["<<name<<"] ";
+        std::cout<<"viewpoint ["<<name<<"] ";
         for(auto& obj : objectPath) std::cout<<obj<<" ";
         std::cout<<std::endl;
     }
 
 
+
     // create the viewer and assign window(s) to it
     auto viewer = vsg::Viewer::create();
     auto window = vsg::Window::create(windowTraits);
@@ -860,24 +861,65 @@ int main(int argc, char** argv)
         }
     }
 
+    if (arguments.read("--tour"))
+    {
+        // set up camera animation to take you between each viewpoint
+        auto cameraAnimationHandler = vsg::CameraAnimationHandler::create();
+        cameraAnimationHandler->animation = vsg::Animation::create();
+        cameraAnimationHandler->object = camera;
 
-    auto stellarManipulator = StellarManipulator::create(camera);
-    stellarManipulator->viewpoints = viewpoints;
-    viewer->addEventHandler(stellarManipulator);
+        auto cameraSampler = cameraAnimationHandler->cameraSampler = vsg::CameraSampler::create();
+        cameraSampler->object = camera;
+        cameraAnimationHandler->animation->samplers.push_back(cameraSampler);
 
-    if (!active_viewpoint.empty())
-    {
-        auto itr = viewpoints.find(active_viewpoint);
-        if (itr != viewpoints.end())
+        auto cameraKeyframes = cameraSampler->keyframes = vsg::CameraKeyframes::create();
+        double time = 0.0;
+        double time_pause = 3.0;
+        double time_moving = 6.0;
+        for(auto& [name, objectPath] : viewpoints)
         {
-            vsg::info("initial viewpoint : ", itr->first);
-            stellarManipulator->currentFocus = itr->second;
+            cameraKeyframes->tracking.push_back(vsg::time_path{time, objectPath});
+            cameraKeyframes->tracking.push_back(vsg::time_path{time+time_pause, objectPath});
+
+            for(auto& object :objectPath)
+            {
+                if (auto perspective = object->getRefObject<vsg::Perspective>("projection"))
+                {
+                    cameraKeyframes->fieldOfViews.push_back(vsg::time_double{time, perspective->fieldOfViewY});
+                    cameraKeyframes->fieldOfViews.push_back(vsg::time_double{time+time_pause, perspective->fieldOfViewY});
+                }
+            }
+
+            time += (time_pause + time_moving);
         }
+
+        vsg::write(cameraAnimationHandler->animation, "test.vsgt", options);
+
+        cameraAnimationHandler->play();
+
+        viewer->addEventHandler(cameraAnimationHandler);
     }
-    else if (!viewpoints.empty())
+    else
     {
-        stellarManipulator->currentFocus = viewpoints.begin()->second;
-        vsg::info("initial viewpoint : ", viewpoints.begin()->first);
+        // set up manipulator for interactively moving between viewpoints
+        auto stellarManipulator = StellarManipulator::create(camera);
+        stellarManipulator->viewpoints = viewpoints;
+        viewer->addEventHandler(stellarManipulator);
+
+        if (!active_viewpoint.empty())
+        {
+            auto itr = viewpoints.find(active_viewpoint);
+            if (itr != viewpoints.end())
+            {
+                vsg::info("initial viewpoint : ", itr->first);
+                stellarManipulator->currentFocus = itr->second;
+            }
+        }
+        else if (!viewpoints.empty())
+        {
+            stellarManipulator->currentFocus = viewpoints.begin()->second;
+            vsg::info("initial viewpoint : ", viewpoints.begin()->first);
+        }
     }
 
     auto renderGraph = vsg::createRenderGraphForView(window, camera, universe, VK_SUBPASS_CONTENTS_INLINE, false);
diff --git a/examples/nodes/vsgpagedlod/vsgpagedlod.cpp b/examples/nodes/vsgpagedlod/vsgpagedlod.cpp
@@ -169,7 +169,7 @@ int main(int argc, char** argv)
 
         if (pathFilename)
         {
-            auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+            auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
             viewer->addEventHandler(cameraAnimation);
             if (cameraAnimation->animation) cameraAnimation->play();
         }
diff --git a/examples/nodes/vsgtextureprojection/vsgtextureprojection.cpp b/examples/nodes/vsgtextureprojection/vsgtextureprojection.cpp
@@ -624,7 +624,7 @@ int main(int argc, char** argv)
 
     if (pathFilename)
     {
-        auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         viewer->addEventHandler(cameraAnimation);
         if (cameraAnimation->animation) cameraAnimation->play();
     }
diff --git a/examples/nodes/vsgtiledatabase/vsgtiledatabase.cpp b/examples/nodes/vsgtiledatabase/vsgtiledatabase.cpp
@@ -185,7 +185,7 @@ int main(int argc, char** argv)
     // add close handler to respond to the close window button and pressing escape
     viewer->addEventHandler(vsg::CloseHandler::create(viewer));
 
-    auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);
+    auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
     viewer->addEventHandler(cameraAnimation);
     if (cameraAnimation->animation) cameraAnimation->play();
 
diff --git a/examples/utils/vsginstrumentation/vsginstrumentation.cpp b/examples/utils/vsginstrumentation/vsginstrumentation.cpp
@@ -234,7 +234,7 @@ int main(int argc, char** argv)
         // add close handler to respond to the close window button and pressing escape
         viewer->addEventHandler(vsg::CloseHandler::create(viewer));
 
-        auto animationPathHandler = vsg::CameraAnimation::create(camera, pathFilename, options);
+        auto animationPathHandler = vsg::CameraAnimationHandler::create(camera, pathFilename, options);
         if (animationPathHandler->animation) animationPathHandler->play();
         viewer->addEventHandler(animationPathHandler);
 

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ int main(int argc, char** argv)`
`526`	`526`
`527`	`527`	`if (pathFilename)`
`528`	`528`	`{`
`529`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`529`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`530`	`530`	`viewer->addEventHandler(cameraAnimation);`
`531`	`531`	`if (cameraAnimation->animation) cameraAnimation->play();`
`532`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ int main(int argc, char** argv)`
`337`	`337`
`338`	`338`	`if (pathFilename)`
`339`	`339`	`{`
`340`		`- auto cameraAnimation = vsg::CameraAnimation::create(master_camera, pathFilename, options);`
	`340`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(master_camera, pathFilename, options);`
`341`	`341`	`viewer->addEventHandler(cameraAnimation);`
`342`	`342`	`if (cameraAnimation->animation) cameraAnimation->play();`
`343`	`343`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ int main(int argc, char** argv)`
`271`	`271`	`// add close handler to respond to the close window button and pressing escape`
`272`	`272`	`viewer->addEventHandler(vsg::CloseHandler::create(viewer));`
`273`	`273`
`274`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`274`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`275`	`275`	`viewer->addEventHandler(cameraAnimation);`
`276`	`276`	`if (autoPlay && cameraAnimation->animation)`
`277`	`277`	`{`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ int main(int argc, char** argv)`
`279`	`279`
`280`	`280`	`if (pathFilename)`
`281`	`281`	`{`
`282`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`282`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`283`	`283`	`viewer->addEventHandler(cameraAnimation);`
`284`	`284`	`if (cameraAnimation->animation) cameraAnimation->play();`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ int main(int argc, char** argv)`
`126`	`126`
`127`	`127`	`if (pathFilename)`
`128`	`128`	`{`
`129`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`129`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`130`	`130`	`viewer->addEventHandler(cameraAnimation);`
`131`	`131`	`if (cameraAnimation->animation) cameraAnimation->play();`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ int main(int argc, char** argv)`
`145`	`145`
`146`	`146`	`if (pathFilename)`
`147`	`147`	`{`
`148`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`148`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`149`	`149`	`viewer->addEventHandler(cameraAnimation);`
`150`	`150`	`if (cameraAnimation->animation) cameraAnimation->play();`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ int main(int argc, char** argv)`
`254`	`254`
`255`	`255`	`if (pathFilename)`
`256`	`256`	`{`
`257`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`257`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`258`	`258`	`viewer->addEventHandler(cameraAnimation);`
`259`	`259`	`if (cameraAnimation->animation) cameraAnimation->play();`
`260`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ int main(int argc, char** argv)`
`641`	`641`	`// add close handler to respond the close window button and pressing escape`
`642`	`642`	`viewer->addEventHandler(vsg::CloseHandler::create(viewer));`
`643`	`643`
`644`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`644`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`645`	`645`	`viewer->addEventHandler(cameraAnimation);`
`646`	`646`	`if (cameraAnimation->animation)`
`647`	`647`	`{`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ int main(int argc, char** argv)`
`234`	`234`
`235`	`235`	`if (pathFilename)`
`236`	`236`	`{`
`237`		`- auto cameraAnimation = vsg::CameraAnimation::create(camera, pathFilename, options);`
	`237`	`+ auto cameraAnimation = vsg::CameraAnimationHandler::create(camera, pathFilename, options);`
`238`	`238`	`viewer->addEventHandler(cameraAnimation);`
`239`	`239`	`if (cameraAnimation->animation) cameraAnimation->play();`
`240`	`240`	`}`