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
196 lines
7.2 KiB
C++
196 lines
7.2 KiB
C++
#include <osg/Uniform>
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
|
|
static bool checkElements( const osg::Uniform& uniform )
|
|
{
|
|
return uniform.getNumElements()>0;
|
|
}
|
|
|
|
static bool readElements( osgDB::InputStream& is, osg::Uniform& uniform )
|
|
{
|
|
bool hasArray; is >> hasArray;
|
|
if ( hasArray )
|
|
{
|
|
osg::ref_ptr<osg::Array> array = is.readArray();
|
|
switch ( array->getType() )
|
|
{
|
|
case osg::Array::FloatArrayType:
|
|
uniform.setArray( static_cast<osg::FloatArray*>(array.get()) ); break;
|
|
case osg::Array::DoubleArrayType:
|
|
uniform.setArray( static_cast<osg::DoubleArray*>(array.get()) ); break;
|
|
case osg::Array::IntArrayType:
|
|
uniform.setArray( static_cast<osg::IntArray*>(array.get()) ); break;
|
|
case osg::Array::UIntArrayType:
|
|
uniform.setArray( static_cast<osg::UIntArray*>(array.get()) ); break;
|
|
default: break;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static bool writeElements( osgDB::OutputStream& os, const osg::Uniform& uniform )
|
|
{
|
|
if ( uniform.getFloatArray()!=NULL )
|
|
{
|
|
os << (uniform.getFloatArray()!=NULL);
|
|
os.writeArray( uniform.getFloatArray() );
|
|
}
|
|
else if ( uniform.getDoubleArray()!=NULL )
|
|
{
|
|
os << (uniform.getDoubleArray()!=NULL);
|
|
os.writeArray( uniform.getDoubleArray() );
|
|
}
|
|
else if ( uniform.getIntArray()!=NULL )
|
|
{
|
|
os << (uniform.getIntArray()!=NULL);
|
|
os.writeArray( uniform.getIntArray() );
|
|
}
|
|
else
|
|
{
|
|
os << (uniform.getUIntArray()!=NULL);
|
|
os.writeArray( uniform.getUIntArray() );
|
|
}
|
|
return true;
|
|
}
|
|
|
|
REGISTER_OBJECT_WRAPPER( Uniform,
|
|
new osg::Uniform,
|
|
osg::Uniform,
|
|
"osg::Object osg::Uniform" )
|
|
{
|
|
BEGIN_ENUM_SERIALIZER3( Type, UNDEFINED );
|
|
ADD_ENUM_VALUE( FLOAT );
|
|
ADD_ENUM_VALUE( FLOAT_VEC2 );
|
|
ADD_ENUM_VALUE( FLOAT_VEC3 );
|
|
ADD_ENUM_VALUE( FLOAT_VEC4 );
|
|
|
|
ADD_ENUM_VALUE( DOUBLE );
|
|
ADD_ENUM_VALUE( DOUBLE_VEC2 );
|
|
ADD_ENUM_VALUE( DOUBLE_VEC3 );
|
|
ADD_ENUM_VALUE( DOUBLE_VEC4 );
|
|
|
|
ADD_ENUM_VALUE( INT );
|
|
ADD_ENUM_VALUE( INT_VEC2 );
|
|
ADD_ENUM_VALUE( INT_VEC3 );
|
|
ADD_ENUM_VALUE( INT_VEC4 );
|
|
|
|
ADD_ENUM_VALUE( UNSIGNED_INT );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_VEC2 );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_VEC3 );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_VEC4 );
|
|
|
|
ADD_ENUM_VALUE( BOOL );
|
|
ADD_ENUM_VALUE( BOOL_VEC2 );
|
|
ADD_ENUM_VALUE( BOOL_VEC3 );
|
|
ADD_ENUM_VALUE( BOOL_VEC4 );
|
|
|
|
ADD_ENUM_VALUE( FLOAT_MAT2 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT3 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT4 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT2x3 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT2x4 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT3x2 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT3x4 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT4x2 );
|
|
ADD_ENUM_VALUE( FLOAT_MAT4x3 );
|
|
|
|
ADD_ENUM_VALUE( DOUBLE_MAT2 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT3 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT4 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT2x3 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT2x4 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT3x2 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT3x4 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT4x2 );
|
|
ADD_ENUM_VALUE( DOUBLE_MAT4x3 );
|
|
|
|
ADD_ENUM_VALUE( SAMPLER_1D );
|
|
ADD_ENUM_VALUE( SAMPLER_2D );
|
|
ADD_ENUM_VALUE( SAMPLER_3D );
|
|
ADD_ENUM_VALUE( SAMPLER_CUBE );
|
|
ADD_ENUM_VALUE( SAMPLER_1D_SHADOW );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_SHADOW );
|
|
ADD_ENUM_VALUE( SAMPLER_1D_ARRAY );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_ARRAY );
|
|
ADD_ENUM_VALUE( SAMPLER_CUBE_MAP_ARRAY );
|
|
ADD_ENUM_VALUE( SAMPLER_1D_ARRAY_SHADOW );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_ARRAY_SHADOW );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_MULTISAMPLE );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_MULTISAMPLE_ARRAY );
|
|
ADD_ENUM_VALUE( SAMPLER_CUBE_SHADOW );
|
|
ADD_ENUM_VALUE( SAMPLER_CUBE_MAP_ARRAY_SHADOW );
|
|
ADD_ENUM_VALUE( SAMPLER_BUFFER );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_RECT );
|
|
ADD_ENUM_VALUE( SAMPLER_2D_RECT_SHADOW );
|
|
|
|
ADD_ENUM_VALUE( INT_SAMPLER_1D );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_2D );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_3D );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_CUBE );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_1D_ARRAY );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_2D_ARRAY );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_CUBE_MAP_ARRAY );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_2D_MULTISAMPLE );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_2D_MULTISAMPLE_ARRAY );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_BUFFER );
|
|
ADD_ENUM_VALUE( INT_SAMPLER_2D_RECT );
|
|
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_1D );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_2D );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_3D );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_CUBE );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_1D_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_2D_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_BUFFER );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_2D_RECT );
|
|
|
|
ADD_ENUM_VALUE( IMAGE_1D );
|
|
ADD_ENUM_VALUE( IMAGE_2D );
|
|
ADD_ENUM_VALUE( IMAGE_3D );
|
|
ADD_ENUM_VALUE( IMAGE_2D_RECT );
|
|
ADD_ENUM_VALUE( IMAGE_CUBE );
|
|
ADD_ENUM_VALUE( IMAGE_BUFFER );
|
|
ADD_ENUM_VALUE( IMAGE_1D_ARRAY );
|
|
ADD_ENUM_VALUE( IMAGE_2D_ARRAY );
|
|
ADD_ENUM_VALUE( IMAGE_CUBE_MAP_ARRAY );
|
|
ADD_ENUM_VALUE( IMAGE_2D_MULTISAMPLE );
|
|
ADD_ENUM_VALUE( IMAGE_2D_MULTISAMPLE_ARRAY );
|
|
|
|
ADD_ENUM_VALUE( INT_IMAGE_1D );
|
|
ADD_ENUM_VALUE( INT_IMAGE_2D );
|
|
ADD_ENUM_VALUE( INT_IMAGE_3D );
|
|
ADD_ENUM_VALUE( INT_IMAGE_2D_RECT );
|
|
ADD_ENUM_VALUE( INT_IMAGE_CUBE );
|
|
ADD_ENUM_VALUE( INT_IMAGE_BUFFER );
|
|
ADD_ENUM_VALUE( INT_IMAGE_1D_ARRAY );
|
|
ADD_ENUM_VALUE( INT_IMAGE_2D_ARRAY );
|
|
ADD_ENUM_VALUE( INT_IMAGE_CUBE_MAP_ARRAY );
|
|
ADD_ENUM_VALUE( INT_IMAGE_2D_MULTISAMPLE );
|
|
ADD_ENUM_VALUE( INT_IMAGE_2D_MULTISAMPLE_ARRAY );
|
|
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_1D );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_2D );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_3D );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_2D_RECT );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_CUBE );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_BUFFER );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_1D_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_2D_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_2D_MULTISAMPLE );
|
|
ADD_ENUM_VALUE( UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY );
|
|
|
|
ADD_ENUM_VALUE( UNDEFINED );
|
|
END_ENUM_SERIALIZER(); // _type
|
|
|
|
ADD_UINT_SERIALIZER( NumElements, 0 ); // _numElements
|
|
ADD_USER_SERIALIZER( Elements ); // _floatArray, _doubleArray, _intArray, _uintArray
|
|
ADD_OBJECT_SERIALIZER( UpdateCallback, osg::UniformCallback, NULL ); // _updateCallback
|
|
ADD_OBJECT_SERIALIZER( EventCallback, osg::UniformCallback, NULL ); // _eventCallback
|
|
}
|