Changeset 3314

Show
Ignore:
Timestamp:
08/24/04 10:43:53 (10 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:
3 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/mpeg/MpegImageStream.h

    r3285 r3314  
    3535#include <OpenThreads/Mutex> 
    3636 
    37 #define NUM_CMD_INDEX 4 
     37#define NUM_CMD_INDEX 20 
    3838 
    3939namespace osg { 
     
    7171 
    7272        /// Rewind stream to beginning. 
    73         virtual void rewind() { setCmd(THREAD_REWIND); } 
     73        virtual void rewind() 
     74        { 
     75            osg::notify(osg::INFO)<<"Rewind video"<<this<<std::endl; 
     76            setCmd(THREAD_REWIND); 
     77        } 
    7478 
    7579        virtual void quit(bool wiatForThreadToExit); 
  • OpenSceneGraph/trunk/src/osgPlugins/obj/glm.cpp

    r3284 r3314  
    1919#include <osg/Math> 
    2020 
     21#include <iostream> 
    2122 
    2223/* defines */ 
     
    211212    model->groups = group; 
    212213    model->numgroups++; 
     214 
     215    std::cout<<"_glmAddGroup="<<name<<std::endl; 
    213216  } 
    214217 
     
    608611   
    609612  while(fscanf(file, "%s", buf) != EOF) { 
     613   
     614   
    610615    switch(buf[0]) { 
    611616    case '#':                /* comment */ 
     
    721726      break; 
    722727    } 
     728 
     729    std::cout<<"line="<<buf<<std::endl; 
     730 
    723731  } 
    724732 
     
    851859      char compositeName[128]; 
    852860      createCompositeName(buf,compositeName); 
    853  
    854861      group = _glmFindGroup(model, compositeName); 
     862      std::cout<<"compositeName="<<compositeName<<"  group="<<group<<std::endl; 
    855863      group->material = material; 
    856864      firstGroup = false; 
  • OpenSceneGraph/trunk/src/osgPlugins/quicktime/QuicktimeImageStream.h

    r3191 r3314  
    3131#include <OpenThreads/Mutex> 
    3232 
    33 #define NUM_CMD_INDEX 4 
     33#define NUM_CMD_INDEX 20 
    3434 
    3535namespace osg {