FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated wrappers.

Browse Source
This commit is contained in:
Robert Osfield
2005-05-20 21:12:57 +00:00
parent b8b6ed8e34
commit f609185e03
8 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgPlugins/quicktime/QuicktimeImageStream.cpp
View File

@@ -28,6 +28,7 @@
#include <osg/Timer>
#include <OpenThreads/ScopedLock>
#include <OpenThreads/Thread>
#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();

2
src/osgPlugins/xine/ReaderWriterXine.cpp
View File

@@ -104,7 +104,7 @@ class XineImageStream : public osg::ImageStream
while (!_ready)
{
osg::notify(osg::INFO)<<" waiting..."<<std::endl;
usleep(10000);
OpenThreads::Thread::microSleep(10000);
}
_status=PLAYING;

2
src/osgWrappers/osgGA/UFOManipulator.cpp
View File

@@ -33,7 +33,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator)
I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, invmat);
I_Method0(osg::Matrixd, getMatrix);
I_Method0(osg::Matrixd, getInverseMatrix);
I_Method1(void, setNode, IN, osg::Node *, x);
I_Method1(void, setNode, IN, osg::Node *, node);
I_Method0(const osg::Node *, getNode);
I_Method0(osg::Node *, getNode);
I_Method0(void, computeHomePosition);

16
src/osgWrappers/osgProducer/OsgCameraGroup.cpp
View File

@@ -33,7 +33,7 @@
TYPE_NAME_ALIAS(Producer::CameraGroup::ThreadingModel, osgProducer::OsgCameraGroup::ThreadingModel);
TYPE_NAME_ALIAS(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >, 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 > >);

4
src/osgWrappers/osgSim/SphereSegment.cpp
View File

@@ -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);

4
src/osgWrappers/osgUtil/RenderBin.cpp
View File

@@ -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);

2
src/osgWrappers/osgUtil/RenderStage.cpp
View File

@@ -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);

4
src/osgWrappers/osgUtil/SceneView.cpp
View File

@@ -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);