dd996a3289
forcing users to use osgDB::readRef*File() methods. The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache. This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero. Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.
To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage. The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:
bool addChild(Node* child); // old method which can only be used with a Node*
tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method
These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
#include <osg/Shape>
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
|
|
// _columns, _rows
|
|
static bool checkArea( const osg::HeightField& shape )
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static bool readArea( osgDB::InputStream& is, osg::HeightField& shape )
|
|
{
|
|
unsigned int numCols, numRows;
|
|
is >> numCols >> numRows;
|
|
shape.allocate( numCols, numRows );
|
|
return true;
|
|
}
|
|
|
|
static bool writeArea( osgDB::OutputStream& os, const osg::HeightField& shape )
|
|
{
|
|
os << shape.getNumColumns() << shape.getNumRows() << std::endl;
|
|
return true;
|
|
}
|
|
|
|
// _heights
|
|
static bool checkHeights( const osg::HeightField& shape )
|
|
{
|
|
return shape.getFloatArray()!=NULL;
|
|
}
|
|
|
|
static bool readHeights( osgDB::InputStream& is, osg::HeightField& shape )
|
|
{
|
|
osg::ref_ptr<osg::Array> array = is.readArray();
|
|
osg::FloatArray* farray = dynamic_cast<osg::FloatArray*>( array.get() );
|
|
if ( farray )
|
|
{
|
|
unsigned int numCols = shape.getNumColumns(), numRows = shape.getNumRows();
|
|
if ( farray->size()<numRows*numCols ) return false;
|
|
|
|
unsigned int index = 0;
|
|
for ( unsigned int r=0; r<numRows; ++r )
|
|
{
|
|
for ( unsigned int c=0; c<numCols; ++c )
|
|
shape.setHeight( c, r, (*farray)[index++] );
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static bool writeHeights( osgDB::OutputStream& os, const osg::HeightField& shape )
|
|
{
|
|
os.writeArray( shape.getFloatArray() );
|
|
return true;
|
|
}
|
|
|
|
REGISTER_OBJECT_WRAPPER( HeightField,
|
|
new osg::HeightField,
|
|
osg::HeightField,
|
|
"osg::Object osg::Shape osg::HeightField" )
|
|
{
|
|
ADD_USER_SERIALIZER( Area ); // _columns, _rows
|
|
ADD_VEC3_SERIALIZER( Origin, osg::Vec3() ); // _origin
|
|
ADD_FLOAT_SERIALIZER( XInterval, 0.0f ); // _dx
|
|
ADD_FLOAT_SERIALIZER( YInterval, 0.0f ); // _dy
|
|
ADD_FLOAT_SERIALIZER( SkirtHeight, 0.0f ); // _skirtHeight
|
|
ADD_UINT_SERIALIZER( BorderWidth, 0 ); // _borderWidth
|
|
ADD_QUAT_SERIALIZER( Rotation, osg::Quat() ); // _rotation
|
|
ADD_USER_SERIALIZER( Heights ); // _heights
|
|
}
|