Changeset 10207 for OpenSceneGraph/trunk/applications/present3D/SlideShowConstructor.h

Timestamp:

05/14/09 15:40:02 (4 years ago)

Author:

robert

Message:

Integrated support for relative paths, and http hosted presentations

Files:

• OpenSceneGraph/trunk/applications/present3D/SlideShowConstructor.h (modified) (7 diffs)

OpenSceneGraph/trunk/applications/present3D/SlideShowConstructor.h

@@ -115 +115 @@
     struct PositionData
     {
-        PositionData():
+        PositionData():
             frame(SlideShowConstructor::SLIDE),
             position(0.0f,1.0f,0.0f),
@@ -123 +123 @@
             rotation(0.0f,0.0f,1.0f,0.0f),
             absolute_path(false),
-            inverse_path(false),
+            inverse_path(false),
             path_time_offset(0.0),
             path_time_multiplier(1.0f),
@@ -156 +156 @@
         }
 
-        CoordinateFrame                         frame;
-        osg::Vec3                               position;
-        osg::Vec3                               scale;
-        osg::Vec4                               rotate;
-        osg::Vec4                               rotation;
+        CoordinateFrame                         frame;
+        osg::Vec3                               position;
+        osg::Vec3                               scale;
+        osg::Vec4                               rotate;
+        osg::Vec4                               rotation;
         std::string                             animation_name;
-        bool                                    absolute_path;
-        bool                                    inverse_path;
+        bool                                    absolute_path;
+        bool                                    inverse_path;
         double                                  path_time_offset;
         double                                  path_time_multiplier;
         osg::AnimationPath::LoopMode            path_loop_mode;
-        std::string                             path;
+        std::string                             path;
         double                                  animation_material_time_offset;
         double                                  animation_material_time_multiplier;
         ss3d::AnimationMaterial::LoopMode       animation_material_loop_mode;
-        std::string                             animation_material_filename;
-        std::string                             fade;
+        std::string                             animation_material_filename;
+        std::string                             fade;
     };
 
@@ -207 +207 @@
     struct FontData
     {
-        FontData():
-            font("fonts/arial.ttf"),
-            layout(osgText::Text::LEFT_TO_RIGHT),
-            alignment(osgText::Text::LEFT_BASE_LINE),
-            axisAlignment(osgText::Text::XZ_PLANE),
-            characterSize(0.04f),
-            maximumHeight(1.0f),
-            maximumWidth(1.0f),
-            color(1.0f,1.0f,1.0f,1.0f) {}
-    
-        std::string                     font;
-        osgText::Text::Layout           layout;
-        osgText::Text::AlignmentType    alignment;
-        osgText::Text::AxisAlignment    axisAlignment;
-        float                           characterSize;
-        float                           maximumHeight;
-        float                           maximumWidth;
-        osg::Vec4                       color;
+        FontData():
+            font("fonts/arial.ttf"),
+            layout(osgText::Text::LEFT_TO_RIGHT),
+            alignment(osgText::Text::LEFT_BASE_LINE),
+            axisAlignment(osgText::Text::XZ_PLANE),
+            characterSize(0.04f),
+            maximumHeight(1.0f),
+            maximumWidth(1.0f),
+            color(1.0f,1.0f,1.0f,1.0f) {}
+
+        std::string                     font;
+        osgText::Text::Layout           layout;
+        osgText::Text::AlignmentType    alignment;
+        osgText::Text::AxisAlignment    axisAlignment;
+        float                           characterSize;
+        float                           maximumHeight;
+        float                           maximumWidth;
+        osg::Vec4                       color;
     };
 
 
-    SlideShowConstructor();
+    SlideShowConstructor(const osgDB::ReaderWriter::Options* options);
 
     void createPresentation();
@@ -347 +347 @@
     osg::Vec3 convertModelToSlide(const osg::Vec3& position) const;
 
-    osg::AnimationPath* readPivotPath(const std::string& filename) const;
-    osg::AnimationPath* readRotationPath(const std::string& filename) const;
-
     osg::AnimationPathCallback* getAnimationPathCallback(const PositionData& positionData);
     
@@ -361 +358 @@
         return stateset;
     }
+
+    osg::ref_ptr<const osgDB::ReaderWriter::Options> _options;
 
     osg::Vec3   _slideOrigin;
@@ -412 +411 @@
     std::string findFileAndRecordPath(const std::string& filename);
     
+    void recordOptionsFilePath(const osgDB::Options* options);
+
 };