From f609185e03ba797a403a2325f4d37cbb614798c1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 20 May 2005 21:12:57 +0000 Subject: [PATCH] Updated wrappers. --- .../quicktime/QuicktimeImageStream.cpp | 3 ++- src/osgPlugins/xine/ReaderWriterXine.cpp | 2 +- src/osgWrappers/osgGA/UFOManipulator.cpp | 2 +- src/osgWrappers/osgProducer/OsgCameraGroup.cpp | 16 ++++++++++++++-- src/osgWrappers/osgSim/SphereSegment.cpp | 4 ++-- src/osgWrappers/osgUtil/RenderBin.cpp | 4 +++- src/osgWrappers/osgUtil/RenderStage.cpp | 2 +- src/osgWrappers/osgUtil/SceneView.cpp | 4 ++-- 8 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/osgPlugins/quicktime/QuicktimeImageStream.cpp b/src/osgPlugins/quicktime/QuicktimeImageStream.cpp index 063ccdd4a..21567398c 100644 --- a/src/osgPlugins/quicktime/QuicktimeImageStream.cpp +++ b/src/osgPlugins/quicktime/QuicktimeImageStream.cpp @@ -28,6 +28,7 @@ #include #include +#include #include "QTUtils.h" #include "MovieData.h" @@ -225,7 +226,7 @@ void QuicktimeImageStream::run() } else if (!done) { - ::usleep(IDLE_TIMEOUT); + OpenThreads::Thread::microSleep(IDLE_TIMEOUT); } } // err = ExitMoviesOnThread(); diff --git a/src/osgPlugins/xine/ReaderWriterXine.cpp b/src/osgPlugins/xine/ReaderWriterXine.cpp index 53eae4d8f..3ec114ed5 100644 --- a/src/osgPlugins/xine/ReaderWriterXine.cpp +++ b/src/osgPlugins/xine/ReaderWriterXine.cpp @@ -104,7 +104,7 @@ class XineImageStream : public osg::ImageStream while (!_ready) { osg::notify(osg::INFO)<<" waiting..."< >, osgProducer::OsgCameraGroup::SceneHandlerList); +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgProducer::OsgSceneHandler > >, osgProducer::OsgCameraGroup::SceneHandlerList); BEGIN_VALUE_REFLECTOR(osgProducer::OsgCameraGroup) I_Constructor0(); @@ -106,5 +106,17 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgCameraGroup::RealizeCallback) I_Constructor0(); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >); +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgProducer::OsgSceneHandler >) + I_Constructor0(); + I_Constructor1(IN, osgProducer::OsgSceneHandler *, t); + I_Constructor1(IN, const osg::ref_ptr< osgProducer::OsgSceneHandler > &, rp); + I_Method0(bool, valid); + I_Method0(osgProducer::OsgSceneHandler *, get); + I_Method0(const osgProducer::OsgSceneHandler *, get); + I_Method0(osgProducer::OsgSceneHandler *, take); + I_Method0(osgProducer::OsgSceneHandler *, release); + I_ReadOnlyProperty(osgProducer::OsgSceneHandler *, ); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgProducer::OsgSceneHandler > >); diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index 2b3c17a0c..9b49a905d 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -42,8 +42,8 @@ BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) I_Method0(const osg::Vec3 &, getCentre); I_Method1(void, setRadius, IN, float, r); I_Method0(float, getRadius); - I_Method3(void, setArea, IN, const osg::Vec3 &, v, IN, float, azRange, IN, float, elevRange); - I_Method3(void, getArea, IN, osg::Vec3 &, v, IN, float &, azRange, IN, float &, elevRange); + I_Method3(void, setArea, IN, const osg::Vec3 &, vec, IN, float, azRange, IN, float, elevRange); + I_Method3(void, getArea, IN, osg::Vec3 &, vec, IN, float &, azRange, IN, float &, elevRange); I_Method4(void, setArea, IN, float, azMin, IN, float, azMax, IN, float, elevMin, IN, float, elevMax); I_Method4(void, getArea, IN, float &, azMin, IN, float &, azMax, IN, float &, elevMin, IN, float &, elevMax); I_Method1(void, setDensity, IN, int, d); diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index 1964d55eb..a0f390f43 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -38,13 +38,14 @@ TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUt BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) I_EnumLabel(osgUtil::RenderBin::SORT_BY_STATE); + I_EnumLabel(osgUtil::RenderBin::SORT_BY_STATE_THEN_FRONT_TO_BACK); I_EnumLabel(osgUtil::RenderBin::SORT_FRONT_TO_BACK); I_EnumLabel(osgUtil::RenderBin::SORT_BACK_TO_FRONT); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_BaseType(osg::Object); - I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::SORT_BY_STATE); + I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, getDefaultRenderBinSortMode()); I_ConstructorWithDefaults2(IN, const osgUtil::RenderBin &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_Method0(osg::Object *, cloneType); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); @@ -70,6 +71,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_Method1(void, setSortMode, IN, osgUtil::RenderBin::SortMode, mode); I_Method0(osgUtil::RenderBin::SortMode, getSortMode); I_Method0(void, sortByState); + I_Method0(void, sortByStateThenFrontToBack); I_Method0(void, sortFrontToBack); I_Method0(void, sortBackToFront); I_Method1(void, setSortCallback, IN, osgUtil::RenderBin::SortCallback *, sortCallback); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index 00c26e3e8..5663e0357 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -33,7 +33,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_BaseType(osgUtil::RenderBin); - I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, osgUtil::RenderBin::SORT_BY_STATE); + I_ConstructorWithDefaults1(IN, osgUtil::RenderBin::SortMode, mode, getDefaultRenderBinSortMode()); I_ConstructorWithDefaults2(IN, const osgUtil::RenderStage &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); I_Method0(osg::Object *, cloneType); I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 98f218651..00362474d 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -85,7 +85,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_Method0(osg::StateSet *, getLocalStateSet); I_Method0(const osg::StateSet *, getLocalStateSet); I_Method1(void, setActiveUniforms, IN, int, activeUniforms); - I_Method1(int, getActiveUniforms, IN, int, activeUniforms); + I_Method0(int, getActiveUniforms); I_Method0(void, updateUniforms); I_Method1(void, setLightingMode, IN, osgUtil::SceneView::LightingMode, mode); I_Method0(osgUtil::SceneView::LightingMode, getLightingMode); @@ -178,7 +178,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_Method0(void, releaseAllGLObjects); I_Method0(void, flushAllDeletedGLObjects); I_Method1(void, flushDeletedGLObjects, IN, double &, availableTime); - I_WriteOnlyProperty(int, ActiveUniforms); + I_Property(int, ActiveUniforms); I_Property(const osg::Vec4 &, ClearColor); I_Property(osg::CollectOccludersVisitor *, CollectOccludersVisitor); I_Property(osgUtil::SceneView::ComputeStereoMatricesCallback *, ComputeStereoMatricesCallback);