Renamed vsg::CameraAnimation to vsg::CameraAnimationHandler

Author: robertosfield

include/vsg/all.h

@@ -85,13 +85,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/animation/Animation.h>
 #include <vsg/animation/AnimationGroup.h>
 #include <vsg/animation/AnimationManager.h>
-#include <vsg/animation/CameraAnimation.h>
+#include <vsg/animation/CameraAnimationHandler.h>
 #include <vsg/animation/CameraSampler.h>
 #include <vsg/animation/FindAnimations.h>
 #include <vsg/animation/Joint.h>
 #include <vsg/animation/JointSampler.h>
 #include <vsg/animation/MorphSampler.h>
 #include <vsg/animation/TransformSampler.h>
+#include <vsg/animation/time_value.h>
 
 // Lighting header files
 #include <vsg/lighting/AmbientLight.h>

include/vsg/animation/CameraAnimation.h …e/vsg/animation/CameraAnimationHandler.hinclude/vsg/animation/CameraAnimation.h renamed to include/vsg/animation/CameraAnimationHandler.h include/vsg/animation/CameraAnimation.h renamed to include/vsg/animation/CameraAnimationHandler.h

@@ -21,12 +21,12 @@ namespace vsg
 {
 
     /// event handler for controlling the playing and recording of camera animation paths
-    class VSG_DECLSPEC CameraAnimation : public Inherit<Visitor, CameraAnimation>
+    class VSG_DECLSPEC CameraAnimationHandler : public Inherit<Visitor, CameraAnimationHandler>
     {
     public:
-        CameraAnimation();
-        CameraAnimation(ref_ptr<Object> in_object, ref_ptr<Animation> in_animation, const Path& in_filename = "saved_animation.vsgt", ref_ptr<Options> in_options = {});
-        explicit CameraAnimation(ref_ptr<Object> in_object, const Path& in_filename = "saved_animation.vsgt", ref_ptr<Options> in_options = {});
+        CameraAnimationHandler();
+        CameraAnimationHandler(ref_ptr<Object> in_object, ref_ptr<Animation> in_animation, const Path& in_filename = "saved_animation.vsgt", ref_ptr<Options> in_options = {});
+        explicit CameraAnimationHandler(ref_ptr<Object> in_object, const Path& in_filename = "saved_animation.vsgt", ref_ptr<Options> in_options = {});
 
         /// object to track/modify
         ref_ptr<Object> object;
@@ -62,6 +62,9 @@ namespace vsg
 
     protected:
     };
-    VSG_type_name(vsg::CameraAnimation);
+    VSG_type_name(vsg::CameraAnimationHandler);
+
+    // fallback for naming prior to VulkanSceneGraph-1.1.9.
+    using CameraAnimation = vsg::CameraAnimationHandler;
 
 } // namespace vsg

src/vsg/CMakeLists.txt

@@ -199,7 +199,7 @@ set(SOURCES
     animation/Animation.cpp
     animation/AnimationGroup.cpp
     animation/AnimationManager.cpp
-    animation/CameraAnimation.cpp
+    animation/CameraAnimationHandler.cpp
     animation/FindAnimations.cpp
     animation/Joint.cpp
     animation/JointSampler.cpp

src/vsg/animation/CameraAnimation.cpp …vsg/animation/CameraAnimationHandler.cppsrc/vsg/animation/CameraAnimation.cpp renamed to src/vsg/animation/CameraAnimationHandler.cpp src/vsg/animation/CameraAnimation.cpp renamed to src/vsg/animation/CameraAnimationHandler.cpp

@@ -10,7 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 </editor-fold> */
 
-#include <vsg/animation/CameraAnimation.h>
+#include <vsg/animation/CameraAnimationHandler.h>
 #include <vsg/animation/TransformSampler.h>
 #include <vsg/app/Camera.h>
 #include <vsg/io/Logger.h>
@@ -23,11 +23,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 using namespace vsg;
 
-CameraAnimation::CameraAnimation()
+CameraAnimationHandler::CameraAnimationHandler()
 {
 }
 
-CameraAnimation::CameraAnimation(ref_ptr<Object> in_object, const Path& in_filename, ref_ptr<Options> in_options) :
+CameraAnimationHandler::CameraAnimationHandler(ref_ptr<Object> in_object, const Path& in_filename, ref_ptr<Options> in_options) :
     object(in_object),
     filename(in_filename),
     options(in_options)
@@ -87,7 +87,7 @@ CameraAnimation::CameraAnimation(ref_ptr<Object> in_object, const Path& in_filen
     }
 }
 
-CameraAnimation::CameraAnimation(ref_ptr<Object> in_object, ref_ptr<Animation> in_animation, const Path& in_filename, ref_ptr<Options> in_options) :
+CameraAnimationHandler::CameraAnimationHandler(ref_ptr<Object> in_object, ref_ptr<Animation> in_animation, const Path& in_filename, ref_ptr<Options> in_options) :
     object(in_object),
     filename(in_filename),
     options(in_options),
@@ -107,9 +107,9 @@ CameraAnimation::CameraAnimation(ref_ptr<Object> in_object, ref_ptr<Animation> i
     }
 }
 
-void CameraAnimation::apply(Camera& camera)
+void CameraAnimationHandler::apply(Camera& camera)
 {
-    info("CameraAnimation::apply(Camera& camera) ", cameraSampler);
+    info("CameraAnimationHandler::apply(Camera& camera) ", cameraSampler);
 
     if (cameraSampler)
     {
@@ -127,7 +127,7 @@ void CameraAnimation::apply(Camera& camera)
     }
 }
 
-void CameraAnimation::apply(MatrixTransform& transform)
+void CameraAnimationHandler::apply(MatrixTransform& transform)
 {
     if (cameraSampler)
     {
@@ -143,15 +143,15 @@ void CameraAnimation::apply(MatrixTransform& transform)
     }
 }
 
-void CameraAnimation::play()
+void CameraAnimationHandler::play()
 {
     if (playing) return;
 
     playing = animation->start(simulationTime);
     if (playing) info("Starting playback.");
 }
 
-void CameraAnimation::record()
+void CameraAnimationHandler::record()
 {
     if (recording) return;
 
@@ -181,7 +181,7 @@ void CameraAnimation::record()
     }
 }
 
-void CameraAnimation::stop()
+void CameraAnimationHandler::stop()
 {
     if (playing)
     {
@@ -205,7 +205,7 @@ void CameraAnimation::stop()
     }
 }
 
-void CameraAnimation::apply(KeyPressEvent& keyPress)
+void CameraAnimationHandler::apply(KeyPressEvent& keyPress)
 {
     if (keyPress.keyModified == togglePlaybackKey)
     {
@@ -235,7 +235,7 @@ void CameraAnimation::apply(KeyPressEvent& keyPress)
     }
 }
 
-void CameraAnimation::apply(FrameEvent& frame)
+void CameraAnimationHandler::apply(FrameEvent& frame)
 {
     simulationTime = frame.frameStamp->simulationTime;