Changeset 3317

Timestamp:

08/24/04 14:55:15 (9 years ago)

Author:

robert

Message:

Added s/getLoopingMode() to ImageStream? and MPEG plugin

Location:

OpenSceneGraph/trunk

Files:

• ChangeLog (modified) (1 diff)
• include/osg/ImageStream (modified) (2 diffs)
• src/osg/ImageStream.cpp (modified) (1 diff)
• src/osgPlugins/mpeg/MpegImageStream.cpp (modified) (1 diff)

OpenSceneGraph/trunk/ChangeLog

@@ +1 @@
+2004-08-18 10:34  robert
+
+        * NEWS.txt: Set date for 0.9.7-2 release
+
+2004-08-18 07:06  robert
+
+        * src/osg/: dxtctool.cpp, dxtctool.h: Rejigged the __int*
+          definitions to try and get round Mingw compile errors
+
+2004-08-17 20:42  robert
+
+        * src/osg/: dxtctool.cpp, dxtctool.h: From Bruce Clay, fixes for
+          VS6.0 build.
+
+2004-08-17 19:57  robert
+
+        * include/osgUtil/RenderBin: From David Fries, added getBinNum()
+          method
+
+2004-08-17 19:56  robert
+
+        * src/osg/PrimitiveSet.cpp: Changed sizeof(..) references to 1,2,4
+          respectively.
+
+2004-08-17 09:14  robert
+
+        * ChangeLog: Updated changelog
+
 2004-08-17 08:58  robert
 

OpenSceneGraph/trunk/include/osg/ImageStream

@@ -56 +56 @@
         StreamStatus getStatus() { return _status; }
         
+
+        enum LoopingMode
+        {
+            NO_LOOPING,
+            LOOPING
+        };
+        
+        void setLoopingMode(LoopingMode mode) { _loopingMode = mode; }
+        LoopingMode getLoopingMode() const { return _loopingMode; }
+
+
         virtual void setReferenceTime(double) {}
         virtual double getReferenceTime() const { return 0.0; }
@@ -69 +80 @@
 
         StreamStatus    _status;
+        LoopingMode     _loopingMode;
 };
 

OpenSceneGraph/trunk/src/osg/ImageStream.cpp

@@ -17 +17 @@
 
 ImageStream::ImageStream():
-    _status(PAUSED)
+    _status(PAUSED),
+    _loopingMode(LOOPING)
 {
     setDataVariance(DYNAMIC); 

OpenSceneGraph/trunk/src/osgPlugins/mpeg/MpegImageStream.cpp

@@ -290 +290 @@
             if (frameNumber>=_frames)
             {
-                rewind(); 
-                //stop();
+                if (getLoopingMode()==LOOPING)
+                {
+                    rewind(); 
+                }
+                else
+                {
+                    pause();
+                }
             }
             else