Changeset 6589
- Timestamp:
- 05/02/07 21:57:05
- Files:
-
- OpenSceneGraph/trunk/genwrapper.conf (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgWrappers/CMakeLists.txt (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/Barrier.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/Block.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/Condition.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/Mutex.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/ReadWriteMutex.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/ReentrantMutex.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/OpenThreads/Thread.cpp (added)
- OpenSceneGraph/trunk/src/osgWrappers/osg/Camera.cpp (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsThread.cpp (modified) (4 diffs)
- OpenSceneGraph/trunk/src/osgWrappers/osgDB/DatabasePager.cpp (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgWrappers/osgDB/SharedStateManager.cpp (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgWrappers/osgParticle/ParticleSystem.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
OpenSceneGraph/trunk/genwrapper.conf
r6465 r6589 273 273 # specify the type kind explicitly 274 274 275 suppress reflector "OpenThreads::Mutex" 275 configure reflector "OpenThreads::Mutex" 276 object-type 277 end 278 279 configure reflector "OpenThreads::Condition" 280 object-type 281 end 282 283 configure reflector "OpenThreads::Block" 284 object-type 285 end 286 287 configure reflector "OpenThreads::Barrier" 288 object-type 289 end 276 290 277 291 configure reflector "OpenThreads::ReentrantMutex" OpenSceneGraph/trunk/src/osgWrappers/CMakeLists.txt
r6423 r6589 87 87 88 88 SET(OSGWRAPPER_LIB_LIST 89 OpenThreads 89 90 osg 90 91 osgDB OpenSceneGraph/trunk/src/osgWrappers/osg/Camera.cpp
r6460 r6589 11 11 #include <osgIntrospection/Attributes> 12 12 13 #include <OpenThreads/Mutex> 13 14 #include <osg/Camera> 14 15 #include <osg/ColorMask> OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp
r6460 r6589 11 11 #include <osgIntrospection/Attributes> 12 12 13 #include <OpenThreads/Mutex> 13 14 #include <osg/GraphicsContext> 14 15 #include <osg/GraphicsThread> OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsThread.cpp
r6267 r6589 30 30 BEGIN_OBJECT_REFLECTOR(osg::BarrierOperation) 31 31 I_BaseType(osg::Operation); 32 I_BaseType(OpenThreads::Barrier); 32 33 I_ConstructorWithDefaults2(IN, int, numThreads, , IN, osg::BarrierOperation::PreBlockOp, op, osg::BarrierOperation::NO_OPERATION, 33 34 ____BarrierOperation__int__PreBlockOp, … … 37 38 Properties::VIRTUAL, 38 39 __void__release, 39 " if this operation is a barrier then release it. ",40 "Release the barrier, now. ", 40 41 ""); 41 42 I_PublicMemberProperty(osg::BarrierOperation::PreBlockOp, _preBlockOp); … … 85 86 BEGIN_OBJECT_REFLECTOR(osg::OperationsThread) 86 87 I_BaseType(osg::Referenced); 88 I_BaseType(OpenThreads::Thread); 87 89 I_Constructor0(____OperationsThread, 88 90 "", … … 161 163 BEGIN_OBJECT_REFLECTOR(osg::RefBlock) 162 164 I_VirtualBaseType(osg::Referenced); 165 I_BaseType(OpenThreads::Block); 163 166 I_Constructor0(____RefBlock, 164 167 "", OpenSceneGraph/trunk/src/osgWrappers/osgDB/DatabasePager.cpp
r6460 r6589 51 51 BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) 52 52 I_BaseType(osg::NodeVisitor::DatabaseRequestHandler); 53 I_BaseType(OpenThreads::Thread); 53 54 I_Constructor0(____DatabasePager, 54 55 "", OpenSceneGraph/trunk/src/osgWrappers/osgDB/SharedStateManager.cpp
r6295 r6589 11 11 #include <osgIntrospection/Attributes> 12 12 13 #include <OpenThreads/Mutex> 13 14 #include <osg/Geode> 14 15 #include <osg/Node> OpenSceneGraph/trunk/src/osgWrappers/osgParticle/ParticleSystem.cpp
r6422 r6589 11 11 #include <osgIntrospection/Attributes> 12 12 13 #include <OpenThreads/ReadWriteMutex> 13 14 #include <osg/BoundingBox> 14 15 #include <osg/CopyOp>
