Changeset 3314

Timestamp:

08/24/04 10:43:53 (9 years ago)

Author:

robert

Message:

Made the command buffer have 20 elements in it to protect against wrapping
around.

Location:

OpenSceneGraph/trunk/src/osgPlugins

Files:

• mpeg/MpegImageStream.h (modified) (2 diffs)
• obj/glm.cpp (modified) (5 diffs)
• quicktime/QuicktimeImageStream.h (modified) (1 diff)

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

@@ -35 +35 @@
 #include <OpenThreads/Mutex>
 
-#define NUM_CMD_INDEX 4
+#define NUM_CMD_INDEX 20
 
 namespace osg {
@@ -71 +71 @@
 
         /// Rewind stream to beginning.
-        virtual void rewind() { setCmd(THREAD_REWIND); }
+        virtual void rewind()
+        {
+            osg::notify(osg::INFO)<<"Rewind video"<<this<<std::endl;
+            setCmd(THREAD_REWIND);
+        }
 
         virtual void quit(bool wiatForThreadToExit);

OpenSceneGraph/trunk/src/osgPlugins/obj/glm.cpp

@@ -19 +19 @@
 #include <osg/Math>
 
+#include <iostream>
 
 /* defines */
@@ -211 +212 @@
     model->groups = group;
     model->numgroups++;
+
+    std::cout<<"_glmAddGroup="<<name<<std::endl;
   }
 
@@ -608 +611 @@
   
   while(fscanf(file, "%s", buf) != EOF) {
+  
+  
     switch(buf[0]) {
     case '#':                /* comment */
@@ -721 +726 @@
       break;
     }
+
+    std::cout<<"line="<<buf<<std::endl;
+
   }
 
@@ -851 +859 @@
       char compositeName[128];
       createCompositeName(buf,compositeName);
-
       group = _glmFindGroup(model, compositeName);
+      std::cout<<"compositeName="<<compositeName<<"  group="<<group<<std::endl;
       group->material = material;
       firstGroup = false;

OpenSceneGraph/trunk/src/osgPlugins/quicktime/QuicktimeImageStream.h

@@ -31 +31 @@
 #include <OpenThreads/Mutex>
 
-#define NUM_CMD_INDEX 4
+#define NUM_CMD_INDEX 20
 
 namespace osg {