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

Ran script to remove trailing spaces and tabs

Browse Source
This commit is contained in:
Robert Osfield
2012-03-21 17:36:20 +00:00
parent 1e35f8975d
commit 14a563dc9f
1495 changed files with 21873 additions and 21873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgWrappers/serializers/osg/AlphaFunc.cpp
View File

@@ -18,6 +18,6 @@ REGISTER_OBJECT_WRAPPER( AlphaFunc,
ADD_ENUM_VALUE( GEQUAL );
ADD_ENUM_VALUE( ALWAYS );
END_ENUM_SERIALIZER(); // _comparisonFunc
ADD_FLOAT_SERIALIZER( ReferenceValue, 1.0f ); // _referenceValue
}

2
src/osgWrappers/serializers/osg/AnimationPath.cpp
View File

@@ -63,7 +63,7 @@ REGISTER_OBJECT_WRAPPER( AnimationPath,
"osg::Object osg::AnimationPath" )
{
ADD_USER_SERIALIZER( TimeControlPointMap ); // _timeControlPointMap
BEGIN_ENUM_SERIALIZER( LoopMode, LOOP );
ADD_ENUM_VALUE( SWING );
ADD_ENUM_VALUE( LOOP );

4
src/osgWrappers/serializers/osg/AutoTransform.cpp
View File

@@ -14,13 +14,13 @@ REGISTER_OBJECT_WRAPPER( AutoTransform,
ADD_VEC3D_SERIALIZER( Scale, osg::Vec3d() ); // _scale
ADD_VEC3D_SERIALIZER( PivotPoint, osg::Vec3d() ); // _pivotPoint
ADD_FLOAT_SERIALIZER( AutoUpdateEyeMovementTolerance, 0.0f ); // _autoUpdateEyeMovementTolerance
BEGIN_ENUM_SERIALIZER( AutoRotateMode, NO_ROTATION );
ADD_ENUM_VALUE( NO_ROTATION );
ADD_ENUM_VALUE( ROTATE_TO_SCREEN );
ADD_ENUM_VALUE( ROTATE_TO_CAMERA );
END_ENUM_SERIALIZER(); // _autoRotateMode
ADD_BOOL_SERIALIZER( AutoScaleToScreen, false ); // _autoScaleToScreen
ADD_QUAT_SERIALIZER( Rotation, osg::Quat() ); // _rotation
ADD_FLOAT_SERIALIZER( AutoScaleTransitionWidthRatio, 0.25f ); // _autoScaleTransitionWidthRatio

2
src/osgWrappers/serializers/osg/Billboard.cpp
View File

@@ -45,7 +45,7 @@ REGISTER_OBJECT_WRAPPER( Billboard,
ADD_ENUM_VALUE( POINT_ROT_WORLD );
ADD_ENUM_VALUE( AXIAL_ROT );
END_ENUM_SERIALIZER(); // _mode
ADD_VEC3_SERIALIZER( Axis, osg::Vec3f() ); // _axis
ADD_VEC3_SERIALIZER( Normal, osg::Vec3f() ); // _normal
ADD_USER_SERIALIZER( PositionList ); // _positionList

2
src/osgWrappers/serializers/osg/BlendEquation.cpp
View File

@@ -18,7 +18,7 @@ REGISTER_OBJECT_WRAPPER( BlendEquation,
ADD_ENUM_VALUE( FUNC_SUBTRACT );
ADD_ENUM_VALUE( FUNC_REVERSE_SUBTRACT );
END_ENUM_SERIALIZER(); // _equationRGB
BEGIN_ENUM_SERIALIZER2( EquationAlpha, osg::BlendEquation::Equation, FUNC_ADD );
ADD_ENUM_VALUE( RGBA_MIN );
ADD_ENUM_VALUE( RGBA_MAX );

16
src/osgWrappers/serializers/osg/Camera.cpp
View File

@@ -66,7 +66,7 @@ static osg::Camera::Attachment readBufferAttachment( osgDB::InputStream& is )
}
else
return attachment;
is >> osgDB::PROPERTY("MultisampleSamples") >> attachment._multisampleSamples;
is >> osgDB::PROPERTY("MultisampleColorSamples") >> attachment._multisampleColorSamples;
return attachment;
@@ -99,7 +99,7 @@ static void writeBufferAttachment( osgDB::OutputStream& os, const osg::Camera::A
os << (char)-1 << std::endl;
return;
}
os << osgDB::PROPERTY("MultisampleSamples") << attachment._multisampleSamples << std::endl;
os << osgDB::PROPERTY("MultisampleColorSamples") << attachment._multisampleColorSamples << std::endl;
}
@@ -191,7 +191,7 @@ static bool readBufferAttachmentMap( osgDB::InputStream& is, osg::Camera& node )
is >> osgDB::BEGIN_BRACKET;
osg::Camera::Attachment attachment = readBufferAttachment(is);
is >> osgDB::END_BRACKET;
if ( attachment._internalFormat!=GL_NONE )
{
node.attach( bufferComponent, attachment._internalFormat );
@@ -241,24 +241,24 @@ REGISTER_OBJECT_WRAPPER( Camera,
ADD_INT_SERIALIZER( ClearStencil, 0 ); // _clearStencil
ADD_OBJECT_SERIALIZER( ColorMask, osg::ColorMask, NULL ); // _colorMask
ADD_OBJECT_SERIALIZER( Viewport, osg::Viewport, NULL ); // _viewport
BEGIN_ENUM_SERIALIZER( TransformOrder, PRE_MULTIPLY );
ADD_ENUM_VALUE( PRE_MULTIPLY );
ADD_ENUM_VALUE( POST_MULTIPLY );
END_ENUM_SERIALIZER(); // _transformOrder
BEGIN_ENUM_SERIALIZER( ProjectionResizePolicy, HORIZONTAL );
ADD_ENUM_VALUE( FIXED );
ADD_ENUM_VALUE( HORIZONTAL );
ADD_ENUM_VALUE( VERTICAL );
END_ENUM_SERIALIZER(); // _projectionResizePolicy
ADD_MATRIXD_SERIALIZER( ProjectionMatrix, osg::Matrixd() ); // _projectionMatrix
ADD_MATRIXD_SERIALIZER( ViewMatrix, osg::Matrixd() ); // _viewMatrix
ADD_USER_SERIALIZER( RenderOrder ); // _renderOrder & _renderOrderNum
ADD_GLENUM_SERIALIZER( DrawBuffer, GLenum, GL_NONE ); // _drawBuffer
ADD_GLENUM_SERIALIZER( ReadBuffer, GLenum, GL_NONE ); // _readBuffer
BEGIN_ENUM_SERIALIZER( RenderTargetImplementation, FRAME_BUFFER );
ADD_ENUM_VALUE( FRAME_BUFFER_OBJECT );
ADD_ENUM_VALUE( PIXEL_BUFFER_RTT );
@@ -266,7 +266,7 @@ REGISTER_OBJECT_WRAPPER( Camera,
ADD_ENUM_VALUE( FRAME_BUFFER );
ADD_ENUM_VALUE( SEPERATE_WINDOW );
END_ENUM_SERIALIZER(); // _renderTargetImplementation
ADD_USER_SERIALIZER( BufferAttachmentMap ); // _bufferAttachmentMap
ADD_OBJECT_SERIALIZER( InitialDrawCallback, osg::Camera::DrawCallback, NULL ); // _initialDrawCallback
ADD_OBJECT_SERIALIZER( PreDrawCallback, osg::Camera::DrawCallback, NULL ); // _preDrawCallback

4
src/osgWrappers/serializers/osg/CameraView.cpp
View File

@@ -11,12 +11,12 @@ REGISTER_OBJECT_WRAPPER( CameraView,
ADD_VEC3D_SERIALIZER( Position, osg::Vec3d() ); // _position
ADD_QUAT_SERIALIZER( Attitude, osg::Quat() ); // _attitude
ADD_DOUBLE_SERIALIZER( FieldOfView, 60.0 ); // _fieldOfView
BEGIN_ENUM_SERIALIZER( FieldOfViewMode, VERTICAL );
ADD_ENUM_VALUE( UNCONSTRAINED );
ADD_ENUM_VALUE( HORIZONTAL );
ADD_ENUM_VALUE( VERTICAL );
END_ENUM_SERIALIZER(); // _fieldOfViewMode
ADD_DOUBLE_SERIALIZER( FocalLength, 0.0 ); // _focalLength
}

2
src/osgWrappers/serializers/osg/ClipNode.cpp
View File

@@ -9,7 +9,7 @@ REGISTER_OBJECT_WRAPPER( ClipNode,
"osg::Object osg::Node osg::Group osg::ClipNode" )
{
ADD_LIST_SERIALIZER( ClipPlaneList, osg::ClipNode::ClipPlaneList ); // _planes
BEGIN_ENUM_SERIALIZER( ReferenceFrame, RELATIVE_RF );
ADD_ENUM_VALUE( RELATIVE_RF );
ADD_ENUM_VALUE( ABSOLUTE_RF );

2
src/osgWrappers/serializers/osg/Depth.cpp
View File

@@ -18,7 +18,7 @@ REGISTER_OBJECT_WRAPPER( Depth,
ADD_ENUM_VALUE( GEQUAL );
ADD_ENUM_VALUE( ALWAYS );
END_ENUM_SERIALIZER(); // _func
ADD_DOUBLE_SERIALIZER( ZNear, 0.0 ); // _zNear
ADD_DOUBLE_SERIALIZER( ZFar, 1.0 ); // _zFar
ADD_BOOL_SERIALIZER( WriteMask, true ); // _depthWriteMask

2
src/osgWrappers/serializers/osg/Fog.cpp
View File

@@ -13,7 +13,7 @@ REGISTER_OBJECT_WRAPPER( Fog,
ADD_ENUM_VALUE( EXP );
ADD_ENUM_VALUE( EXP2 );
END_ENUM_SERIALIZER(); // _mode
ADD_FLOAT_SERIALIZER( Start, 0.0f ); // _start
ADD_FLOAT_SERIALIZER( End, 1.0f ); // _end
ADD_FLOAT_SERIALIZER( Density, 1.0f ); // _density

10
src/osgWrappers/serializers/osg/Geometry.cpp
View File

@@ -19,14 +19,14 @@ static void readArrayData( osgDB::InputStream& is, osg::Geometry::ArrayData& dat
bool hasArray = false;
is >> osgDB::PROPERTY("Array") >> hasArray;
if ( hasArray ) data.array = is.readArray();
bool hasIndices = false;
is >> osgDB::PROPERTY("Indices") >> hasIndices;
if ( hasIndices ) data.indices = dynamic_cast<osg::IndexArray*>( is.readArray() );
is >> osgDB::PROPERTY("Binding");
data.binding = (osg::Geometry::AttributeBinding)readAttributeBinding(is);
int normalizeValue = 0;
is >> osgDB::PROPERTY("Normalize") >> normalizeValue;
data.normalize = normalizeValue;
@@ -37,11 +37,11 @@ static void writeArrayData( osgDB::OutputStream& os, const osg::Geometry::ArrayD
os << osgDB::PROPERTY("Array") << data.array.valid();
if ( data.array.valid() ) os << data.array.get();
else os << std::endl;
os << osgDB::PROPERTY("Indices") << data.indices.valid();
if ( data.indices.valid() ) os << data.indices.get();
else os << std::endl;
os << osgDB::PROPERTY("Binding"); writeAttributeBinding(os, data.binding); os << std::endl;
os << osgDB::PROPERTY("Normalize") << (int)data.normalize << std::endl;
}

2
src/osgWrappers/serializers/osg/HeightField.cpp
View File

@@ -36,7 +36,7 @@ static bool readHeights( osgDB::InputStream& is, osg::HeightField& shape )
{
unsigned int numCols = shape.getNumColumns(), numRows = shape.getNumRows();
if ( array->size()<numRows*numCols ) return false;
unsigned int index = 0;
for ( unsigned int r=0; r<numRows; ++r )
{

4
src/osgWrappers/serializers/osg/ImageSequence.cpp
View File

@@ -73,13 +73,13 @@ REGISTER_OBJECT_WRAPPER( ImageSequence,
{
ADD_DOUBLE_SERIALIZER( ReferenceTime, DBL_MAX ); // _referenceTime
ADD_DOUBLE_SERIALIZER( TimeMultiplier, 1.0 ); // _timeMultiplier
BEGIN_ENUM_SERIALIZER( Mode, PRE_LOAD_ALL_IMAGES );
ADD_ENUM_VALUE( PRE_LOAD_ALL_IMAGES );
ADD_ENUM_VALUE( PAGE_AND_RETAIN_IMAGES );
ADD_ENUM_VALUE( PAGE_AND_DISCARD_USED_IMAGES );
END_ENUM_SERIALIZER(); // _mode
ADD_DOUBLE_SERIALIZER( Length, 1.0 ); // _length
ADD_USER_SERIALIZER( FileNames ); // _fileNames
ADD_USER_SERIALIZER( Images ); // _images

2
src/osgWrappers/serializers/osg/ImageStream.cpp
View File

@@ -12,6 +12,6 @@ REGISTER_OBJECT_WRAPPER( ImageStream,
ADD_ENUM_VALUE( NO_LOOPING );
ADD_ENUM_VALUE( LOOPING );
END_ENUM_SERIALIZER(); // _loopingMode
ADD_LIST_SERIALIZER( AudioStreams, osg::ImageStream::AudioStreams ); // _audioStreams
}

6
src/osgWrappers/serializers/osg/LOD.cpp
View File

@@ -65,13 +65,13 @@ REGISTER_OBJECT_WRAPPER( LOD,
ADD_ENUM_VALUE( USER_DEFINED_CENTER );
ADD_ENUM_VALUE( UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED );
END_ENUM_SERIALIZER(); // _centerMode
ADD_USER_SERIALIZER( UserCenter ); // _userDefinedCenter, _radius
BEGIN_ENUM_SERIALIZER( RangeMode, DISTANCE_FROM_EYE_POINT );
ADD_ENUM_VALUE( DISTANCE_FROM_EYE_POINT );
ADD_ENUM_VALUE( PIXEL_SIZE_ON_SCREEN );
END_ENUM_SERIALIZER(); // _rangeMode
ADD_USER_SERIALIZER( RangeList ); // _rangeList
}

4
src/osgWrappers/serializers/osg/LightModel.cpp
View File

@@ -9,12 +9,12 @@ REGISTER_OBJECT_WRAPPER( LightModel,
"osg::Object osg::StateAttribute osg::LightModel" )
{
ADD_VEC4_SERIALIZER( AmbientIntensity, osg::Vec4() ); // _ambient
BEGIN_ENUM_SERIALIZER( ColorControl, SINGLE_COLOR );
ADD_ENUM_VALUE( SEPARATE_SPECULAR_COLOR );
ADD_ENUM_VALUE( SINGLE_COLOR );
END_ENUM_SERIALIZER(); // _colorControl
ADD_BOOL_SERIALIZER( LocalViewer, false ); // _localViewer
ADD_BOOL_SERIALIZER( TwoSided, false ); // _twoSided
}

2
src/osgWrappers/serializers/osg/LightSource.cpp
View File

@@ -9,7 +9,7 @@ REGISTER_OBJECT_WRAPPER( LightSource,
"osg::Object osg::Node osg::Group osg::LightSource" )
{
ADD_OBJECT_SERIALIZER( Light, osg::Light, NULL ); // _light
BEGIN_ENUM_SERIALIZER( ReferenceFrame, RELATIVE_RF );
ADD_ENUM_VALUE( RELATIVE_RF );
ADD_ENUM_VALUE( ABSOLUTE_RF );

2
src/osgWrappers/serializers/osg/Material.cpp
View File

@@ -44,7 +44,7 @@ REGISTER_OBJECT_WRAPPER( Material,
ADD_ENUM_VALUE( AMBIENT_AND_DIFFUSE );
ADD_ENUM_VALUE( OFF );
END_ENUM_SERIALIZER(); // _colorMode
ADD_USER_SERIALIZER( Ambient ); // _ambient
ADD_USER_SERIALIZER( Diffuse ); // _diffuse
ADD_USER_SERIALIZER( Specular ); // _specular

2
src/osgWrappers/serializers/osg/Multisample.cpp
View File

@@ -10,7 +10,7 @@ REGISTER_OBJECT_WRAPPER( Multisample,
{
ADD_FLOAT_SERIALIZER( Coverage, 0.0f ); // _coverage
ADD_BOOL_SERIALIZER( Invert, false ); // _invert
BEGIN_ENUM_SERIALIZER2( Hint, osg::Multisample::Mode, DONT_CARE );
ADD_ENUM_VALUE( FASTEST );
ADD_ENUM_VALUE( NICEST );

4
src/osgWrappers/serializers/osg/Node.cpp
View File

@@ -77,12 +77,12 @@ REGISTER_OBJECT_WRAPPER( Node,
ADD_OBJECT_SERIALIZER( CullCallback, osg::NodeCallback, NULL ); // _cullCallback
ADD_BOOL_SERIALIZER( CullingActive, true ); // _cullingActive
ADD_HEXINT_SERIALIZER( NodeMask, 0xffffffff ); // _nodeMask
ADD_USER_SERIALIZER( Descriptions ); // _descriptions, deprecated
UPDATE_TO_VERSION( 77 )
{
REMOVE_SERIALIZER( Descriptions );
}
ADD_OBJECT_SERIALIZER( StateSet, osg::StateSet, NULL ); // _stateset
}

10
src/osgWrappers/serializers/osg/Object.cpp
View File

@@ -14,8 +14,8 @@ static bool checkUserData( const osg::Object& obj )
static bool readUserData( osgDB::InputStream& is, osg::Object& obj )
{
is >> osgDB::BEGIN_BRACKET;
osg::Object* object = is.readObject();
if(object) obj.setUserData(object);
osg::Object* object = is.readObject();
if(object) obj.setUserData(object);
is >> osgDB::END_BRACKET;
return true;
}
@@ -23,7 +23,7 @@ static bool readUserData( osgDB::InputStream& is, osg::Object& obj )
static bool writeUserData( osgDB::OutputStream& os, const osg::Object& obj )
{
os << osgDB::BEGIN_BRACKET << std::endl;
os.writeObject(dynamic_cast<const osg::Object*>(obj.getUserData()));
os.writeObject(dynamic_cast<const osg::Object*>(obj.getUserData()));
os << osgDB::END_BRACKET << std::endl;
return true;
}
@@ -34,7 +34,7 @@ REGISTER_OBJECT_WRAPPER( Object,
"osg::Object" )
{
ADD_STRING_SERIALIZER( Name, "" ); // _name
BEGIN_ENUM_SERIALIZER( DataVariance, UNSPECIFIED );
ADD_ENUM_VALUE( STATIC );
ADD_ENUM_VALUE( DYNAMIC );
@@ -42,7 +42,7 @@ REGISTER_OBJECT_WRAPPER( Object,
END_ENUM_SERIALIZER(); // _dataVariance
ADD_USER_SERIALIZER( UserData ); // _userData, deprecated
UPDATE_TO_VERSION( 77 )
{
REMOVE_SERIALIZER( UserData );

14
src/osgWrappers/serializers/osg/PagedLOD.cpp
View File

@@ -53,13 +53,13 @@ static bool readRangeDataList( osgDB::InputStream& is, osg::PagedLOD& node )
node.setFileName( i, name );
}
is >> osgDB::END_BRACKET;
size = 0; is >> osgDB::PROPERTY("PriorityList") >> size >> osgDB::BEGIN_BRACKET;
for ( unsigned int i=0; i<size; ++i )
{
float offset, scale;
is >> offset >> scale;
node.setPriorityOffset( i, offset );
node.setPriorityScale( i, scale );
}
@@ -77,7 +77,7 @@ static bool writeRangeDataList( osgDB::OutputStream& os, const osg::PagedLOD& no
os << std::endl;
}
os << osgDB::END_BRACKET << std::endl;
size = node.getNumPriorityOffsets();
os << osgDB::PROPERTY("PriorityList") << size << osgDB::BEGIN_BRACKET << std::endl;
for ( unsigned int i=0; i<size; ++i )
@@ -114,7 +114,7 @@ static bool writeChildren( osgDB::OutputStream& os, const osg::PagedLOD& node )
if ( !node.getFileName(i).empty() )
dynamicLoadedSize++;
}
unsigned int realSize = size-dynamicLoadedSize; os << realSize;
if ( realSize>0 )
{
@@ -137,7 +137,7 @@ REGISTER_OBJECT_WRAPPER( PagedLOD,
"osg::Object osg::Node osg::LOD osg::PagedLOD" )
{
// Note: osg::Group is not in the list to prevent recording dynamic loaded children
ADD_USER_SERIALIZER( DatabasePath ); // _databasePath
ADD_UINT_SERIALIZER( FrameNumberOfLastTraversal, 0 ); // _frameNumberOfLastTraversal, note, not required, removed from soversion 70 onwwards, see below
ADD_UINT_SERIALIZER( NumChildrenThatCannotBeExpired, 0 ); // _numChildrenThatCannotBeExpired
@@ -147,9 +147,9 @@ REGISTER_OBJECT_WRAPPER( PagedLOD,
UPDATE_TO_VERSION( 70 )
{
REMOVE_SERIALIZER( FrameNumberOfLastTraversal );
REMOVE_SERIALIZER( FrameNumberOfLastTraversal );
}
}

6
src/osgWrappers/serializers/osg/PolygonMode.cpp
View File

@@ -24,7 +24,7 @@ static bool readMode( osgDB::InputStream& is, osg::PolygonMode& attr )
is >> osgDB::PROPERTY("UseFrontAndBack") >> frontAndBack;
is >> osgDB::PROPERTY("Front"); int value1 = readModeValue(is);
is >> osgDB::PROPERTY("Back"); int value2 = readModeValue(is);
if ( frontAndBack )
attr.setMode( osg::PolygonMode::FRONT_AND_BACK, (osg::PolygonMode::Mode)value1 );
else
@@ -38,11 +38,11 @@ static bool readMode( osgDB::InputStream& is, osg::PolygonMode& attr )
static bool writeMode( osgDB::OutputStream& os, const osg::PolygonMode& attr )
{
os << osgDB::PROPERTY("UseFrontAndBack") << attr.getFrontAndBack() << std::endl;
os << osgDB::PROPERTY("Front");
writeModeValue( os, (int)attr.getMode(osg::PolygonMode::FRONT) );
os << std::endl;
os << osgDB::PROPERTY("Back");
writeModeValue( os, (int)attr.getMode(osg::PolygonMode::BACK) );
os << std::endl;

14
src/osgWrappers/serializers/osg/ProxyNode.cpp
View File

@@ -62,7 +62,7 @@ static bool writeChildren( osgDB::OutputStream& os, const osg::ProxyNode& node )
if ( !node.getFileName(i).empty() )
dynamicLoadedSize++;
}
unsigned int realSize = size-dynamicLoadedSize; os << realSize;
if ( realSize>0 )
{
@@ -104,13 +104,13 @@ struct ProxyNodeFinishedObjectReadCallback : public osgDB::FinishedObjectReadCal
virtual void objectRead(osgDB::InputStream& is, osg::Object& obj)
{
osg::ProxyNode& proxyNode = static_cast<osg::ProxyNode&>(obj);
if (proxyNode.getLoadingExternalReferenceMode() == osg::ProxyNode::LOAD_IMMEDIATELY)
{
for(unsigned int i=0; i<proxyNode.getNumFileNames(); i++)
{
if(i >= proxyNode.getNumChildren() && !proxyNode.getFileName(i).empty())
{
{
osgDB::FilePathList& fpl = ((osgDB::ReaderWriter::Options*)is.getOptions())->getDatabasePathList();
fpl.push_front( fpl.empty() ? osgDB::getFilePath(proxyNode.getFileName(i)) : fpl.front()+'/'+ osgDB::getFilePath(proxyNode.getFileName(i)));
osg::Node* node = osgDB::readNodeFile(proxyNode.getFileName(i), is.getOptions());
@@ -129,23 +129,23 @@ REGISTER_OBJECT_WRAPPER( ProxyNode,
"osg::Object osg::Node osg::ProxyNode" )
{
// Note: osg::Group is not in the list to prevent recording dynamic loaded children
ADD_USER_SERIALIZER( FileNames ); // _filenameList
ADD_USER_SERIALIZER( Children ); // _children (which are not loaded from external)
ADD_STRING_SERIALIZER( DatabasePath, "" ); // _databasePath
BEGIN_ENUM_SERIALIZER( LoadingExternalReferenceMode, LOAD_IMMEDIATELY );
ADD_ENUM_VALUE( LOAD_IMMEDIATELY );
ADD_ENUM_VALUE( DEFER_LOADING_TO_DATABASE_PAGER );
ADD_ENUM_VALUE( NO_AUTOMATIC_LOADING );
END_ENUM_SERIALIZER(); // _loadingExtReference
BEGIN_ENUM_SERIALIZER( CenterMode, USE_BOUNDING_SPHERE_CENTER );
ADD_ENUM_VALUE( USE_BOUNDING_SPHERE_CENTER );
ADD_ENUM_VALUE( USER_DEFINED_CENTER );
ADD_ENUM_VALUE( UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED );
END_ENUM_SERIALIZER(); // _centerMode
ADD_USER_SERIALIZER( UserCenter ); // _userDefinedCenter, _radius
wrapper->addFinishedObjectReadCallback(new ProxyNodeFinishedObjectReadCallback());

8
src/osgWrappers/serializers/osg/Sequence.cpp
View File

@@ -9,26 +9,26 @@ REGISTER_OBJECT_WRAPPER( Sequence,
"osg::Object osg::Node osg::Group osg::Sequence" )
{
ADD_LIST_SERIALIZER( TimeList, std::vector<double> ); // _frameTime
BEGIN_ENUM_SERIALIZER( LoopMode, LOOP );
ADD_ENUM_VALUE( LOOP );
ADD_ENUM_VALUE( SWING );
END_ENUM_SERIALIZER(); // _loopMode
ADD_INT_SERIALIZER( Begin, 0 ); // _begin
ADD_INT_SERIALIZER( End, -1 ); // _end
ADD_FLOAT_SERIALIZER( Speed, 0.0f ); // _speed
ADD_INT_SERIALIZER( NumRepeats, -1 ); // _nreps
ADD_DOUBLE_SERIALIZER( DefaultTime, 1.0 ); // _defaultTime
ADD_DOUBLE_SERIALIZER( LastFrameTime, 0.0 ); // _lastFrameTime
BEGIN_ENUM_SERIALIZER2( Mode, osg::Sequence::SequenceMode, STOP );
ADD_ENUM_VALUE( START );
ADD_ENUM_VALUE( STOP );
ADD_ENUM_VALUE( PAUSE );
ADD_ENUM_VALUE( RESUME );
END_ENUM_SERIALIZER(); // _mode
ADD_BOOL_SERIALIZER( Sync, false ); // _sync
ADD_BOOL_SERIALIZER( ClearOnStop, false ); // _clearOnStop
}

4
src/osgWrappers/serializers/osg/Shader.cpp
View File

@@ -32,7 +32,7 @@ static bool writeShaderSource( osgDB::OutputStream& os, const osg::Shader& shade
{
lines.push_back( line );
}
os.writeSize(lines.size()); os << osgDB::BEGIN_BRACKET << std::endl;
for ( std::vector<std::string>::const_iterator itr=lines.begin();
itr!=lines.end(); ++itr )
@@ -57,7 +57,7 @@ REGISTER_OBJECT_WRAPPER( Shader,
ADD_ENUM_VALUE( GEOMETRY );
ADD_ENUM_VALUE( UNDEFINED );
END_ENUM_SERIALIZER(); // _type
ADD_USER_SERIALIZER( ShaderSource ); // _shaderSource
ADD_OBJECT_SERIALIZER( ShaderBinary, osg::ShaderBinary, NULL ); // _shaderBinary
}

4
src/osgWrappers/serializers/osg/StateSet.cpp
View File

@@ -291,13 +291,13 @@ REGISTER_OBJECT_WRAPPER( StateSet,
ADD_USER_SERIALIZER( TextureAttributeList ); // _textureAttributeList
ADD_USER_SERIALIZER( UniformList ); // _uniformList
ADD_INT_SERIALIZER( RenderingHint, osg::StateSet::DEFAULT_BIN ); // _renderingHint
BEGIN_ENUM_SERIALIZER( RenderBinMode, INHERIT_RENDERBIN_DETAILS );
ADD_ENUM_VALUE( INHERIT_RENDERBIN_DETAILS );
ADD_ENUM_VALUE( USE_RENDERBIN_DETAILS );
ADD_ENUM_VALUE( OVERRIDE_RENDERBIN_DETAILS );
END_ENUM_SERIALIZER(); // _binMode
ADD_INT_SERIALIZER( BinNumber, 0 ); // _binNum
ADD_STRING_SERIALIZER( BinName, "" ); // _binName
ADD_BOOL_SERIALIZER( NestRenderBins, true ); // _nestRenderBins

10
src/osgWrappers/serializers/osg/Stencil.cpp
View File

@@ -18,10 +18,10 @@ REGISTER_OBJECT_WRAPPER( Stencil,
ADD_ENUM_VALUE( GEQUAL );
ADD_ENUM_VALUE( ALWAYS );
END_ENUM_SERIALIZER(); // _func
ADD_INT_SERIALIZER( FunctionRef, 0 ); // _funcRef
ADD_HEXINT_SERIALIZER( FunctionMask, ~0u ); // _funcMask
BEGIN_ENUM_SERIALIZER2( StencilFailOperation, osg::Stencil::Operation, KEEP );
ADD_ENUM_VALUE( KEEP );
ADD_ENUM_VALUE( ZERO );
@@ -32,7 +32,7 @@ REGISTER_OBJECT_WRAPPER( Stencil,
ADD_ENUM_VALUE( INCR_WRAP );
ADD_ENUM_VALUE( DECR_WRAP );
END_ENUM_SERIALIZER(); // _sfail
BEGIN_ENUM_SERIALIZER2( StencilPassAndDepthFailOperation, osg::Stencil::Operation, KEEP );
ADD_ENUM_VALUE( KEEP );
ADD_ENUM_VALUE( ZERO );
@@ -43,7 +43,7 @@ REGISTER_OBJECT_WRAPPER( Stencil,
ADD_ENUM_VALUE( INCR_WRAP );
ADD_ENUM_VALUE( DECR_WRAP );
END_ENUM_SERIALIZER(); // _zfail
BEGIN_ENUM_SERIALIZER2( StencilPassAndDepthPassOperation, osg::Stencil::Operation, KEEP );
ADD_ENUM_VALUE( KEEP );
ADD_ENUM_VALUE( ZERO );
@@ -54,6 +54,6 @@ REGISTER_OBJECT_WRAPPER( Stencil,
ADD_ENUM_VALUE( INCR_WRAP );
ADD_ENUM_VALUE( DECR_WRAP );
END_ENUM_SERIALIZER(); // _zpass
ADD_HEXINT_SERIALIZER( WriteMask, ~0u ); // _writeMask
}

2
src/osgWrappers/serializers/osg/TessellationHints.cpp
View File

@@ -12,7 +12,7 @@ REGISTER_OBJECT_WRAPPER( TessellationHints,
ADD_ENUM_VALUE( USE_SHAPE_DEFAULTS );
ADD_ENUM_VALUE( USE_TARGET_NUM_FACES );
END_ENUM_SERIALIZER(); // _TessellationMode
ADD_FLOAT_SERIALIZER( DetailRatio, 1.0f ); // _detailRatio
ADD_UINT_SERIALIZER( TargetNumFaces, 100 ); // _targetNumFaces
ADD_BOOL_SERIALIZER( CreateFrontFace, true ); // _createFrontFace

2
src/osgWrappers/serializers/osg/TexEnv.cpp
View File

@@ -15,6 +15,6 @@ REGISTER_OBJECT_WRAPPER( TexEnv,
ADD_ENUM_VALUE( REPLACE );
ADD_ENUM_VALUE( ADD );
END_ENUM_SERIALIZER(); // _mode
ADD_VEC4_SERIALIZER( Color, osg::Vec4() ); // _color
}

2
src/osgWrappers/serializers/osg/TexGen.cpp
View File

@@ -32,7 +32,7 @@ REGISTER_OBJECT_WRAPPER( TexGen,
ADD_ENUM_VALUE( NORMAL_MAP );
ADD_ENUM_VALUE( REFLECTION_MAP );
END_ENUM_SERIALIZER(); // _mode
ADD_USER_SERIALIZER( PlaneS );
ADD_USER_SERIALIZER( PlaneT );
ADD_USER_SERIALIZER( PlaneR );

2
src/osgWrappers/serializers/osg/TexGenNode.cpp
View File

@@ -10,7 +10,7 @@ REGISTER_OBJECT_WRAPPER( TexGenNode,
{
ADD_UINT_SERIALIZER( TextureUnit, 0 ); // _textureUnit
ADD_OBJECT_SERIALIZER( TexGen, osg::TexGen, NULL ); // _texgen
BEGIN_ENUM_SERIALIZER( ReferenceFrame, RELATIVE_RF );
ADD_ENUM_VALUE( RELATIVE_RF );
ADD_ENUM_VALUE( ABSOLUTE_RF );

10
src/osgWrappers/serializers/osg/Texture.cpp
View File

@@ -87,7 +87,7 @@ REGISTER_OBJECT_WRAPPER( Texture,
ADD_BOOL_SERIALIZER( ResizeNonPowerOfTwoHint, true ); // _resizeNonPowerOfTwoHint
ADD_VEC4D_SERIALIZER( BorderColor, osg::Vec4d(0.0,0.0,0.0,0.0) ); // _borderColor
ADD_GLINT_SERIALIZER( BorderWidth, 0 ); // _borderWidth
BEGIN_ENUM_SERIALIZER( InternalFormatMode, USE_IMAGE_DATA_FORMAT );
ADD_ENUM_VALUE( USE_IMAGE_DATA_FORMAT );
ADD_ENUM_VALUE( USE_USER_DEFINED_FORMAT );
@@ -103,12 +103,12 @@ REGISTER_OBJECT_WRAPPER( Texture,
ADD_ENUM_VALUE( USE_S3TC_DXT1c_COMPRESSION );
ADD_ENUM_VALUE( USE_S3TC_DXT1a_COMPRESSION );
END_ENUM_SERIALIZER(); // _internalFormatMode
ADD_USER_SERIALIZER( InternalFormat ); // _internalFormat
ADD_USER_SERIALIZER( SourceFormat ); // _sourceFormat
ADD_USER_SERIALIZER( SourceType ); // _sourceType
ADD_BOOL_SERIALIZER( ShadowComparison, false ); // _use_shadow_comparison
BEGIN_ENUM_SERIALIZER( ShadowCompareFunc, LEQUAL );
ADD_ENUM_VALUE( NEVER );
ADD_ENUM_VALUE( LESS );
@@ -119,12 +119,12 @@ REGISTER_OBJECT_WRAPPER( Texture,
ADD_ENUM_VALUE( GEQUAL );
ADD_ENUM_VALUE( ALWAYS );
END_ENUM_SERIALIZER(); // _shadow_compare_func
BEGIN_ENUM_SERIALIZER( ShadowTextureMode, LUMINANCE );
ADD_ENUM_VALUE( LUMINANCE );
ADD_ENUM_VALUE( INTENSITY );
ADD_ENUM_VALUE( ALPHA );
END_ENUM_SERIALIZER(); // _shadow_texture_mode
ADD_FLOAT_SERIALIZER( ShadowAmbient, 0.0f ); // _shadow_ambient
}

2
src/osgWrappers/serializers/osg/TextureCubeMap.cpp
View File

@@ -42,7 +42,7 @@ REGISTER_OBJECT_WRAPPER( TextureCubeMap,
ADD_USER_SERIALIZER( NegY );
ADD_USER_SERIALIZER( PosZ );
ADD_USER_SERIALIZER( NegZ ); // _images
ADD_INT_SERIALIZER( TextureWidth, 0 ); // _textureWidth
ADD_INT_SERIALIZER( TextureHeight, 0 ); // _textureHeight
}

2
src/osgWrappers/serializers/osg/Uniform.cpp
View File

@@ -109,7 +109,7 @@ REGISTER_OBJECT_WRAPPER( Uniform,
ADD_ENUM_VALUE( UNSIGNED_INT_SAMPLER_BUFFER );
ADD_ENUM_VALUE( UNDEFINED );
END_ENUM_SERIALIZER(); // _type
ADD_UINT_SERIALIZER( NumElements, 0 ); // _numElements
ADD_USER_SERIALIZER( Elements ); // _floatArray, _intArray, _uintArray
ADD_OBJECT_SERIALIZER( UpdateCallback, osg::Uniform::Callback, NULL ); // _updateCallback

2
src/osgWrappers/serializers/osg/ValueObject.cpp
View File

@@ -16,7 +16,7 @@
SERIALIZER_TYPE( Value, DEFAULT ); \
} \
} \
WRAPVALUEOBJECT( BoolValueObject, "osg::Object osg::BoolValueObject", ADD_REF_BOOL_SERIALIZER, 0)
WRAPVALUEOBJECT( CharValueObject, "osg::Object osg::CharValueObject", ADD_REF_CHAR_SERIALIZER, 0)

8
src/osgWrappers/serializers/osgAnimation/Animation.cpp
View File

@@ -154,7 +154,7 @@ static bool readChannels( osgDB::InputStream& is, osgAnimation::Animation& ani )
{
std::string type;
is >> osgDB::PROPERTY("Type") >> type >> osgDB::BEGIN_BRACKET;
READ_CHANNEL_FUNC( DoubleStepChannel, osgAnimation::DoubleStepChannel, osgAnimation::DoubleKeyframeContainer, double );
READ_CHANNEL_FUNC( FloatStepChannel, osgAnimation::FloatStepChannel, osgAnimation::FloatKeyframeContainer, float );
READ_CHANNEL_FUNC( Vec2StepChannel, osgAnimation::Vec2StepChannel, osgAnimation::Vec2KeyframeContainer, osg::Vec2 );
@@ -224,7 +224,7 @@ static bool writeChannels( osgDB::OutputStream& os, const osgAnimation::Animatio
osgAnimation::Vec3CubicBezierKeyframeContainer );
WRITE_CHANNEL_FUNC2( Vec4CubicBezierChannel, osgAnimation::Vec4CubicBezierChannel,
osgAnimation::Vec4CubicBezierKeyframeContainer );
os << osgDB::PROPERTY("Type") << std::string("UnknownChannel") << osgDB::BEGIN_BRACKET << std::endl;
os << osgDB::END_BRACKET << std::endl;
}
@@ -240,13 +240,13 @@ REGISTER_OBJECT_WRAPPER( osgAnimation_Animation,
ADD_DOUBLE_SERIALIZER( Duration, 0.0f ); // _duration
ADD_FLOAT_SERIALIZER( Weight, 0.0f ); // _weight
ADD_DOUBLE_SERIALIZER( StartTime, 0.0f ); // _startTime
BEGIN_ENUM_SERIALIZER( PlayMode, LOOP );
ADD_ENUM_VALUE( ONCE );
ADD_ENUM_VALUE( STAY );
ADD_ENUM_VALUE( LOOP );
ADD_ENUM_VALUE( PPONG );
END_ENUM_SERIALIZER(); // _playmode
ADD_USER_SERIALIZER( Channels ); // _channels
}

2
src/osgWrappers/serializers/osgAnimation/MorphGeometry.cpp
View File

@@ -45,7 +45,7 @@ REGISTER_OBJECT_WRAPPER( osgAnimation_MorphGeometry,
ADD_ENUM_VALUE( NORMALIZED );
ADD_ENUM_VALUE( RELATIVE );
END_ENUM_SERIALIZER(); // _method
ADD_USER_SERIALIZER( MorphTargets ); // _morphTargets
ADD_BOOL_SERIALIZER( MorphNormals, true ); // _morphNormals
}

6
src/osgWrappers/serializers/osgAnimation/RigGeometry.cpp
View File

@@ -17,7 +17,7 @@ static bool readInfluenceMap( osgDB::InputStream& is, osgAnimation::RigGeometry&
std::string name;
unsigned int viSize = 0;
is >> osgDB::PROPERTY("VertexInfluence") >> name; viSize = is.readSize(); is >> osgDB::BEGIN_BRACKET;
osgAnimation::VertexInfluence vi;
vi.setName( name );
vi.reserve( viSize );
@@ -32,7 +32,7 @@ static bool readInfluenceMap( osgDB::InputStream& is, osgAnimation::RigGeometry&
is >> osgDB::END_BRACKET;
}
is >> osgDB::END_BRACKET;
if ( !map->empty() ) geom.setInfluenceMap( map );
return true;
}
@@ -47,7 +47,7 @@ static bool writeInfluenceMap( osgDB::OutputStream& os, const osgAnimation::RigG
std::string name = itr->first;
const osgAnimation::VertexInfluence& vi = itr->second;
if ( name.empty() ) name = "Empty";
os << osgDB::PROPERTY("VertexInfluence") << name; os.writeSize(vi.size()) ; os << osgDB::BEGIN_BRACKET << std::endl;
for ( osgAnimation::VertexInfluence::const_iterator vitr=vi.begin();

2
src/osgWrappers/serializers/osgManipulator/Dragger.cpp
View File

@@ -74,7 +74,7 @@ REGISTER_OBJECT_WRAPPER( osgManipulator_Dragger,
"osg::Object osg::Node osg::Transform osg::MatrixTransform osgManipulator::Dragger" )
{
// Dragger should not record children seperately, so ignore the osg::Group class wrapper
ADD_BOOL_SERIALIZER( HandleEvents, false ); // _handleEvents
ADD_BOOL_SERIALIZER( DraggerActive, false ); // _draggerActive
ADD_UINT_SERIALIZER( ActivationModKeyMask, 0 ); // _activationModKeyMask

8
src/osgWrappers/serializers/osgParticle/DomainOperator.cpp
View File

@@ -24,7 +24,7 @@ static bool readDomains( osgDB::InputStream& is, osgParticle::DomainOperator& dp
else if (typeName=="SPHERE") type = osgParticle::DomainOperator::Domain::SPHERE_DOMAIN;
else if (typeName=="BOX") type = osgParticle::DomainOperator::Domain::BOX_DOMAIN;
else if (typeName=="DISK") type = osgParticle::DomainOperator::Domain::DISK_DOMAIN;
osgParticle::DomainOperator::Domain domain(type);
is >> osgDB::PROPERTY("Plane") >> domain.plane;
is >> osgDB::PROPERTY("Vertices1") >> domain.v1;
@@ -34,7 +34,7 @@ static bool readDomains( osgDB::InputStream& is, osgParticle::DomainOperator& dp
is >> osgDB::PROPERTY("Basis2") >> domain.s2;
is >> osgDB::PROPERTY("Factors") >> domain.r1 >> domain.r2;
dp.addDomain(domain);
is >> osgDB::END_BRACKET;
}
is >> osgDB::END_BRACKET;
@@ -48,7 +48,7 @@ static bool writeDomains( osgDB::OutputStream& os, const osgParticle::DomainOper
for ( unsigned int i=0; i<size; ++i )
{
const osgParticle::DomainOperator::Domain& domain = dp.getDomain(i);
os << osgDB::PROPERTY("Domain");
switch (domain.type)
{
@@ -71,7 +71,7 @@ static bool writeDomains( osgDB::OutputStream& os, const osgParticle::DomainOper
default:
os << std::string("UNDEFINED") << osgDB::BEGIN_BRACKET << std::endl; break;
}
os << osgDB::PROPERTY("Plane") << domain.plane << std::endl;
os << osgDB::PROPERTY("Vertices1") << domain.v1 << std::endl;
os << osgDB::PROPERTY("Vertices2") << domain.v2 << std::endl;

28
src/osgWrappers/serializers/osgParticle/Particle.cpp
View File

@@ -18,18 +18,18 @@ USER_WRITE_FUNC( Shape, writeShapeValue )
bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
{
is >> osgDB::BEGIN_BRACKET;
is >> osgDB::PROPERTY("Shape");
p.setShape( static_cast<osgParticle::Particle::Shape>(readShapeValue(is)) );
double lifeTime; is >> osgDB::PROPERTY("LifeTime") >> lifeTime;
p.setLifeTime( lifeTime );
float min, max; osg::Vec4d minV, maxV;
is >> osgDB::PROPERTY("SizeRange") >> min >> max; p.setSizeRange( osgParticle::rangef(min, max) );
is >> osgDB::PROPERTY("AlphaRange") >> min >> max; p.setAlphaRange( osgParticle::rangef(min, max) );
is >> osgDB::PROPERTY("ColorRange") >> minV >> maxV; p.setColorRange( osgParticle::rangev4(minV, maxV) );
bool hasInterpolator = false;
is >> osgDB::PROPERTY("SizeInterpolator") >> hasInterpolator;
if ( hasInterpolator )
@@ -52,7 +52,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
p.setColorInterpolator( static_cast<osgParticle::Interpolator*>(is.readObject()) );
is >> osgDB::END_BRACKET;
}
float radius; is >> osgDB::PROPERTY("Radius") >> radius;
float mass; is >> osgDB::PROPERTY("Mass") >> mass;
osg::Vec3d pos; is >> osgDB::PROPERTY("Position") >> pos;
@@ -60,7 +60,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
osg::Vec3d angle; is >> osgDB::PROPERTY("Angle") >> angle;
osg::Vec3d angleV; is >> osgDB::PROPERTY("AngularVelocity") >> angleV;
int s, t, num; is >> osgDB::PROPERTY("TextureTile") >> s >> t >> num;
p.setRadius( radius );
p.setMass( mass );
p.setPosition( pos );
@@ -68,7 +68,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
p.setAngle( angle );
p.setAngularVelocity( angleV );
p.setTextureTile( s, t, num );
bool hasObject = false; is >> osgDB::PROPERTY("Drawable") >> hasObject;
if ( hasObject )
{
@@ -76,7 +76,7 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
p.setDrawable( dynamic_cast<osg::Drawable*>(is.readObject()) );
is >> osgDB::END_BRACKET;
}
is >> osgDB::END_BRACKET;
return true;
}
@@ -84,15 +84,15 @@ bool readParticle( osgDB::InputStream& is, osgParticle::Particle& p )
bool writeParticle( osgDB::OutputStream& os, const osgParticle::Particle& p )
{
os << osgDB::BEGIN_BRACKET << std::endl;
os << osgDB::PROPERTY("Shape"); writeShapeValue( os, (int)p.getShape() ); os << std::endl;
os << osgDB::PROPERTY("LifeTime") << p.getLifeTime() << std::endl;
os << osgDB::PROPERTY("SizeRange") << p.getSizeRange().minimum << p.getSizeRange().maximum << std::endl;
os << osgDB::PROPERTY("AlphaRange") << p.getAlphaRange().minimum << p.getAlphaRange().maximum << std::endl;
os << osgDB::PROPERTY("ColorRange") << osg::Vec4d(p.getColorRange().minimum)
<< osg::Vec4d(p.getColorRange().maximum) << std::endl;
os << osgDB::PROPERTY("SizeInterpolator") << (p.getSizeInterpolator()!=NULL);
if ( p.getSizeInterpolator()!=NULL )
os << osgDB::BEGIN_BRACKET << std::endl << p.getSizeInterpolator() << osgDB::END_BRACKET << std::endl;
@@ -102,7 +102,7 @@ bool writeParticle( osgDB::OutputStream& os, const osgParticle::Particle& p )
os << osgDB::PROPERTY("ColorInterpolator") << (p.getColorInterpolator()!=NULL);
if ( p.getColorInterpolator()!=NULL )
os << osgDB::BEGIN_BRACKET << std::endl << p.getColorInterpolator() << osgDB::END_BRACKET << std::endl;
os << osgDB::PROPERTY("Radius") << p.getRadius() << std::endl;
os << osgDB::PROPERTY("Mass") << p.getMass() << std::endl;
os << osgDB::PROPERTY("Position") << osg::Vec3d(p.getPosition()) << std::endl;
@@ -110,7 +110,7 @@ bool writeParticle( osgDB::OutputStream& os, const osgParticle::Particle& p )
os << osgDB::PROPERTY("Angle") << osg::Vec3d(p.getAngle()) << std::endl;
os << osgDB::PROPERTY("AngularVelocity") << osg::Vec3d(p.getAngularVelocity()) << std::endl;
os << osgDB::PROPERTY("TextureTile") << p.getTileS() << p.getTileT() << p.getNumTiles() << std::endl;
os << osgDB::PROPERTY("Drawable") << (p.getDrawable()!=NULL);
if ( p.getDrawable()!=NULL )
{
@@ -119,7 +119,7 @@ bool writeParticle( osgDB::OutputStream& os, const osgParticle::Particle& p )
os << osgDB::END_BRACKET;
}
os << std::endl;
os << osgDB::END_BRACKET << std::endl;
return true;
}

2
src/osgWrappers/serializers/osgParticle/ParticleProcessor.cpp
View File

@@ -12,7 +12,7 @@ REGISTER_OBJECT_WRAPPER( osgParticleParticleProcessor,
ADD_ENUM_VALUE( RELATIVE_RF );
ADD_ENUM_VALUE( ABSOLUTE_RF );
END_ENUM_SERIALIZER(); // _rf
ADD_BOOL_SERIALIZER( Enabled, true ); // _enabled
ADD_OBJECT_SERIALIZER( ParticleSystem, osgParticle::ParticleSystem, NULL ); // _ps
ADD_BOOL_SERIALIZER( Endless, true ); // _endless

12
src/osgWrappers/serializers/osgParticle/ParticleSystem.cpp
View File

@@ -61,32 +61,32 @@ REGISTER_OBJECT_WRAPPER( osgParticleParticleSystem,
"osg::Object osg::Drawable osgParticle::ParticleSystem" )
{
ADD_USER_SERIALIZER( DefaultBoundingBox ); // _def_bbox
BEGIN_ENUM_SERIALIZER2( ParticleAlignment, osgParticle::ParticleSystem::Alignment, BILLBOARD );
ADD_ENUM_VALUE( BILLBOARD );
ADD_ENUM_VALUE( FIXED );
END_ENUM_SERIALIZER(); // _alignment
ADD_VEC3_SERIALIZER( AlignVectorX, osg::Vec3() ); // _align_X_axis
ADD_VEC3_SERIALIZER( AlignVectorY, osg::Vec3() ); // _align_Y_axis
BEGIN_ENUM_SERIALIZER( ParticleScaleReferenceFrame, WORLD_COORDINATES );
ADD_ENUM_VALUE( LOCAL_COORDINATES );
ADD_ENUM_VALUE( WORLD_COORDINATES );
END_ENUM_SERIALIZER(); // _particleScaleReferenceFrame
ADD_BOOL_SERIALIZER( UseVertexArray, false ); // _useVertexArray
ADD_BOOL_SERIALIZER( UseShaders, false ); // _useShaders
ADD_BOOL_SERIALIZER( DoublePassRendering, false ); // _doublepass
ADD_BOOL_SERIALIZER( Frozen, false ); // _frozen
ADD_USER_SERIALIZER( DefaultParticleTemplate ); // _def_ptemp
ADD_BOOL_SERIALIZER( FreezeOnCull, false ); // _freeze_on_cull
BEGIN_ENUM_SERIALIZER( SortMode, NO_SORT );
ADD_ENUM_VALUE( NO_SORT );
ADD_ENUM_VALUE( SORT_FRONT_TO_BACK );
ADD_ENUM_VALUE( SORT_BACK_TO_FRONT );
END_ENUM_SERIALIZER(); // _sortMode
ADD_DOUBLE_SERIALIZER( VisibilityDistance, -1.0 ); // _visibilityDistance
}

2
src/osgWrappers/serializers/osgParticle/SinkOperator.cpp
View File

@@ -13,7 +13,7 @@ REGISTER_OBJECT_WRAPPER( osgParticleSinkOperator,
ADD_ENUM_VALUE( SINK_VELOCITY );
ADD_ENUM_VALUE( SINK_ANGULAR_VELOCITY );
END_ENUM_SERIALIZER(); // _sinkTarget
BEGIN_ENUM_SERIALIZER( SinkStrategy, SINK_INSIDE );
ADD_ENUM_VALUE( SINK_INSIDE );
ADD_ENUM_VALUE( SINK_OUTSIDE );

2
src/osgWrappers/serializers/osgShadow/MinimalShadowMap.cpp
View File

@@ -12,7 +12,7 @@ REGISTER_OBJECT_WRAPPER( osgShadow_MinimalShadowMap,
ADD_MATRIX_SERIALIZER( ModellingSpaceToWorldTransform, osg::Matrix() ); // _modellingSpaceToWorld
ADD_FLOAT_SERIALIZER( MaxFarPlane, FLT_MAX ); // _maxFarPlane
ADD_FLOAT_SERIALIZER( MinLightMargin, 0.0f ); // _minLightMargin
BEGIN_ENUM_SERIALIZER( ShadowReceivingCoarseBoundAccuracy, BOUNDING_BOX );
ADD_ENUM_VALUE( EMPTY_BOX );
ADD_ENUM_VALUE( BOUNDING_SPHERE );

2
src/osgWrappers/serializers/osgShadow/ParallelSplitShadowMap.cpp
View File

@@ -17,7 +17,7 @@ REGISTER_OBJECT_WRAPPER( osgShadow_ParallelSplitShadowMap,
ADD_DOUBLE_SERIALIZER( MinNearDistanceForSplits, 5.0 ); // _split_min_near_dist
ADD_OBJECT_SERIALIZER( UserLight, osg::Light, NULL ); // _userLight
ADD_VEC2_SERIALIZER( AmbientBias, osg::Vec2() ); // _ambientBias
BEGIN_ENUM_SERIALIZER2( SplitCalculationMode, osgShadow::ParallelSplitShadowMap::SplitCalcMode, SPLIT_EXP );
ADD_ENUM_VALUE( SPLIT_LINEAR );
ADD_ENUM_VALUE( SPLIT_EXP );

2
src/osgWrappers/serializers/osgShadow/ShadowMap.cpp
View File

@@ -11,7 +11,7 @@ REGISTER_OBJECT_WRAPPER( osgShadow_ShadowMap,
ADD_UINT_SERIALIZER( TextureUnit, 1 ); // _shadowTextureUnit
ADD_VEC2_SERIALIZER( PolygonOffset, osg::Vec2f() ); // _polyOffset
ADD_VEC2_SERIALIZER( AmbientBias, osg::Vec2d() ); // _ambientBias
ADD_SERIALIZER( (new osgDB::PropByRefSerializer<osgShadow::ShadowMap, osg::Vec2s>
("TextureSize", osg::Vec2s(1024, 1024),
&osgShadow::ShadowMap::getTextureSize,

2
src/osgWrappers/serializers/osgShadow/ShadowVolume.cpp
View File

@@ -13,6 +13,6 @@ REGISTER_OBJECT_WRAPPER( osgShadow_ShadowVolume,
ADD_ENUM_CLASS_VALUE( osgShadow::ShadowVolumeGeometry, STENCIL_TWO_PASS );
ADD_ENUM_CLASS_VALUE( osgShadow::ShadowVolumeGeometry, STENCIL_TWO_SIDED );
END_ENUM_SERIALIZER(); // _drawMode
ADD_BOOL_SERIALIZER( DynamicShadowVolumes, false ); // _dynamicShadowVolumes
}

4
src/osgWrappers/serializers/osgShadow/StandardShadowMap.cpp
View File

@@ -13,12 +13,12 @@ REGISTER_OBJECT_WRAPPER( osgShadow_StandardShadowMap,
ADD_UINT_SERIALIZER( ShadowTextureUnit, 1 ); // _shadowTextureUnit
ADD_UINT_SERIALIZER( BaseTextureCoordIndex, 0 ); // _baseTextureCoordIndex
ADD_UINT_SERIALIZER( ShadowTextureCoordIndex, 1 ); // _shadowTextureCoordIndex
ADD_SERIALIZER( (new osgDB::PropByRefSerializer<osgShadow::StandardShadowMap, osg::Vec2s>
("TextureSize", osg::Vec2s(1024, 1024),
&osgShadow::StandardShadowMap::getTextureSize,
&osgShadow::StandardShadowMap::setTextureSize))
); // _textureSize
ADD_OBJECT_SERIALIZER( Light, osg::Light, NULL ); // _light
}

2
src/osgWrappers/serializers/osgSim/DOFTransform.cpp
View File

@@ -57,7 +57,7 @@ REGISTER_OBJECT_WRAPPER( osgSim_DOFTransform,
ADD_USER_SERIALIZER( PutMatrix ); // _Put, _inversePut
ADD_USER_SERIALIZER( LimitationFlags ); // _limitationFlags
ADD_BOOL_SERIALIZER( AnimationOn, false ); // _animationOn
BEGIN_ENUM_SERIALIZER2( HPRMultOrder, osgSim::DOFTransform::MultOrder, PRH );
ADD_ENUM_VALUE( PRH );
ADD_ENUM_VALUE( PHR );

4
src/osgWrappers/serializers/osgSim/LightPointNode.cpp
View File

@@ -17,11 +17,11 @@ static bool readLightPointList( osgDB::InputStream& is, osgSim::LightPointNode&
is >> osgDB::PROPERTY("LightPoint") >> osgDB::BEGIN_BRACKET;
is >> osgDB::PROPERTY("Position") >> pt._position;
is >> osgDB::PROPERTY("Color") >> pt._color;
int blendingMode = 0;
is >> osgDB::PROPERTY("Attributes") >> pt._on >> blendingMode >> pt._intensity >> pt._radius;
pt._blendingMode = (osgSim::LightPoint::BlendingMode)blendingMode;
bool hasObject = false; is >> osgDB::PROPERTY("Sector") >> hasObject;
if ( hasObject )
{

2
src/osgWrappers/serializers/osgSim/MultiSwitch.cpp
View File

@@ -15,7 +15,7 @@ static bool readValues( osgDB::InputStream& is, osgSim::MultiSwitch& node )
{
is >> osgDB::PROPERTY("SwitchSet");
unsigned int valueSize = is.readSize(); is >> osgDB::BEGIN_BRACKET;
osgSim::MultiSwitch::ValueList values;
for ( unsigned int j=0; j<valueSize; ++j )
{

2
src/osgWrappers/serializers/osgSim/OverlayNode.cpp
View File

@@ -14,7 +14,7 @@ REGISTER_OBJECT_WRAPPER( osgSim_OverlayNode,
ADD_ENUM_VALUE( VIEW_DEPENDENT_WITH_ORTHOGRAPHIC_OVERLAY );
ADD_ENUM_VALUE( VIEW_DEPENDENT_WITH_PERSPECTIVE_OVERLAY );
END_ENUM_SERIALIZER(); // _overlayTechnique
ADD_OBJECT_SERIALIZER( OverlaySubgraph, osg::Node, NULL ); // _overlaySubgraph
ADD_GLENUM_SERIALIZER( TexEnvMode, GLenum, GL_DECAL ); // _texEnvMode
ADD_UINT_SERIALIZER( OverlayTextureUnit, 1 ); // _textureUnit

18
src/osgWrappers/serializers/osgSim/ScalarBar.cpp
View File

@@ -12,7 +12,7 @@ static bool readScalarsToColors( osgDB::InputStream& is, osgSim::ScalarBar& bar
float min, max;
is >> osgDB::BEGIN_BRACKET;
is >> osgDB::PROPERTY("Range") >> min >> max;
bool hasColorRange = false;
unsigned int colorSize = 0;
is >> osgDB::PROPERTY("Colors") >> hasColorRange >> colorSize;
@@ -31,7 +31,7 @@ static bool readScalarsToColors( osgDB::InputStream& is, osgSim::ScalarBar& bar
colors.push_back( color );
}
is >> osgDB::END_BRACKET;
osgSim::ColorRange* cr = new osgSim::ColorRange(min, max, colors);
bar.setScalarsToColors( cr );
}
@@ -44,14 +44,14 @@ static bool writeScalarsToColors( osgDB::OutputStream& os, const osgSim::ScalarB
os << osgDB::BEGIN_BRACKET << std::endl;
os << osgDB::PROPERTY("Range") << stc->getMin() << stc->getMax() << std::endl;
os << osgDB::PROPERTY("Colors");
unsigned int colorSize = 0;
const osgSim::ColorRange* cr = dynamic_cast<const osgSim::ColorRange*>(stc);
if ( cr )
{
const std::vector<osg::Vec4>& colors = cr->getColors();
colorSize = colors.size();
os << true << colorSize << osgDB::BEGIN_BRACKET << std::endl;
for ( unsigned int i=0; i<colorSize; ++i )
{
@@ -77,7 +77,7 @@ static bool readScalarPrinter( osgDB::InputStream& is, osgSim::ScalarBar& bar )
is >> osgDB::BEGIN_BRACKET;
osgSim::ScalarBar::ScalarPrinter* sp =
dynamic_cast<osgSim::ScalarBar::ScalarPrinter*>( is.readObject() );
if ( sp ) bar.setScalarPrinter( sp );
if ( sp ) bar.setScalarPrinter( sp );
is >> osgDB::END_BRACKET;
return true;
}
@@ -85,7 +85,7 @@ static bool readScalarPrinter( osgDB::InputStream& is, osgSim::ScalarBar& bar )
static bool writeScalarPrinter( osgDB::OutputStream& os, const osgSim::ScalarBar& bar )
{
os << osgDB::BEGIN_BRACKET << std::endl;
os.writeObject( dynamic_cast<const osg::Object*>(bar.getScalarPrinter()) );
os.writeObject( dynamic_cast<const osg::Object*>(bar.getScalarPrinter()) );
os << osgDB::END_BRACKET << std::endl;
return true;
}
@@ -104,7 +104,7 @@ static bool readTextProperties( osgDB::InputStream& is, osgSim::ScalarBar& bar )
is >> osgDB::PROPERTY("CharacterSize") >> prop._characterSize;
is >> osgDB::PROPERTY("Color") >> prop._fontFile;
is >> osgDB::END_BRACKET;
prop._fontResolution = std::pair<int, int>(resX, resY);
bar.setTextProperties( prop );
return true;
@@ -135,12 +135,12 @@ REGISTER_OBJECT_WRAPPER( osgSim_ScalarBar,
ADD_VEC3_SERIALIZER( Position, osg::Vec3() ); // _position
ADD_FLOAT_SERIALIZER( Width, 0.0f ); // _width
ADD_FLOAT_SERIALIZER( AspectRatio, 0.0f ); // _aspectRatio
BEGIN_ENUM_SERIALIZER( Orientation, HORIZONTAL );
ADD_ENUM_VALUE( HORIZONTAL );
ADD_ENUM_VALUE( VERTICAL );
END_ENUM_SERIALIZER(); // _orientation
ADD_USER_SERIALIZER( ScalarPrinter ); // _sp
ADD_USER_SERIALIZER( TextProperties ); // _textProperties
}

38
src/osgWrappers/serializers/osgTerrain/ImageLayer.cpp
View File

@@ -10,42 +10,42 @@ static bool checkImage( const osgTerrain::ImageLayer& im )
{ return im.getImage() != NULL; }
static bool readImage( osgDB::InputStream& is, osgTerrain::ImageLayer& il )
{
if(!is.isBinary()) is >> osgDB::BEGIN_BRACKET;
{
if(!is.isBinary()) is >> osgDB::BEGIN_BRACKET;
bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ?
osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false;
bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ?
osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false;
osg::ref_ptr<osg::Image> image = is.readImage(!deferExternalLayerLoading);
if (image.valid())
{
if(image->valid())
if(image->valid())
{
il.setImage(image.get());
}
}
if(!is.isBinary()) is >> osgDB::END_BRACKET;
il.setImage(image.get());
}
}
if(!is.isBinary()) is >> osgDB::END_BRACKET;
return true;
}
static bool writeImage( osgDB::OutputStream& os, const osgTerrain::ImageLayer& il )
{
const osg::Image* image = il.getImage();
{
const osg::Image* image = il.getImage();
if(!os.isBinary()) os << osgDB::BEGIN_BRACKET << std::endl;
if(!os.isBinary()) os << osgDB::BEGIN_BRACKET << std::endl;
os.writeImage(image);
if(!os.isBinary()) os << osgDB::END_BRACKET << std::endl;
return true;
if(!os.isBinary()) os << osgDB::END_BRACKET << std::endl;
return true;
}
REGISTER_OBJECT_WRAPPER( osgTerrain_ImageLayer,
new osgTerrain::ImageLayer,
osgTerrain::ImageLayer,
"osg::Object osgTerrain::Layer osgTerrain::ImageLayer" )
{
ADD_USER_SERIALIZER( Image );
{
ADD_USER_SERIALIZER( Image );
}

4
src/osgWrappers/serializers/osgTerrain/Layer.cpp
View File

@@ -39,14 +39,14 @@ static bool writeValidDataOperator( osgDB::OutputStream& os, const osgTerrain::L
os << (unsigned int)1 << ndv->getValue() << std::endl;
return true;
}
const osgTerrain::ValidRange* vr = dynamic_cast<const osgTerrain::ValidRange*>( layer.getValidDataOperator() );
if ( vr )
{
os << (unsigned int)2 << vr->getMinValue() << vr->getMaxValue() << std::endl;
return true;
}
os << (unsigned int)0 << std::endl;
return true;
}

2
src/osgWrappers/serializers/osgTerrain/Locator.cpp
View File

@@ -13,7 +13,7 @@ REGISTER_OBJECT_WRAPPER( osgTerrain_Locator,
ADD_ENUM_VALUE( GEOGRAPHIC );
ADD_ENUM_VALUE( PROJECTED );
END_ENUM_SERIALIZER(); // _coordinateSystemType
ADD_STRING_SERIALIZER( Format, "" ); // _format
ADD_STRING_SERIALIZER( CoordinateSystem, "" ); // _cs
ADD_OBJECT_SERIALIZER( EllipsoidModel, osg::EllipsoidModel, NULL ); // _ellipsoidModel

2
src/osgWrappers/serializers/osgTerrain/TerrainTile.cpp
View File

@@ -99,6 +99,6 @@ REGISTER_OBJECT_WRAPPER( osgTerrain_TerrainTile,
ADD_ENUM_VALUE( ENABLE_BLENDING );
ADD_ENUM_VALUE( ENABLE_BLENDING_WHEN_ALPHA_PRESENT );
END_ENUM_SERIALIZER(); // BlendingPolicy
wrapper->addFinishedObjectReadCallback( new TerrainTileFinishedObjectReadCallback() );
}

8
src/osgWrappers/serializers/osgText/Text.cpp
View File

@@ -72,22 +72,22 @@ REGISTER_OBJECT_WRAPPER( osgText_Text,
ADD_ENUM_VALUE( OUTLINE );
ADD_ENUM_VALUE( NONE );
END_ENUM_SERIALIZER(); // _backdropType
BEGIN_ENUM_SERIALIZER( BackdropImplementation, DEPTH_RANGE );
ADD_ENUM_VALUE( POLYGON_OFFSET );
ADD_ENUM_VALUE( NO_DEPTH_BUFFER );
ADD_ENUM_VALUE( DEPTH_RANGE );
ADD_ENUM_VALUE( STENCIL_BUFFER );
END_ENUM_SERIALIZER(); // _backdropImplementation
ADD_USER_SERIALIZER( BackdropOffset ); // _backdropHorizontalOffset, _backdropVerticalOffset
ADD_VEC4_SERIALIZER( BackdropColor, osg::Vec4() ); // _backdropColor
BEGIN_ENUM_SERIALIZER( ColorGradientMode, SOLID );
ADD_ENUM_VALUE( SOLID );
ADD_ENUM_VALUE( PER_CHARACTER );
ADD_ENUM_VALUE( OVERALL );
END_ENUM_SERIALIZER(); // _colorGradientMode
ADD_USER_SERIALIZER( ColorGradientCorners ); // _colorGradientTopLeft .. _colorGradientBottomRight
}

16
src/osgWrappers/serializers/osgText/TextBase.cpp
View File

@@ -103,7 +103,7 @@ static bool writeText( osgDB::OutputStream& os, const osgText::TextBase& text )
break;
}
}
os << isACString;
if ( isACString )
{
@@ -177,19 +177,19 @@ REGISTER_OBJECT_WRAPPER( osgText_TextBase,
ADD_USER_SERIALIZER( Font ); // _font
ADD_USER_SERIALIZER( FontSize ); // _fontSize
ADD_USER_SERIALIZER( CharacterSize ); // _characterHeight, _characterAspectRatio
BEGIN_ENUM_SERIALIZER( CharacterSizeMode, OBJECT_COORDS );
ADD_ENUM_VALUE( OBJECT_COORDS );
ADD_ENUM_VALUE( SCREEN_COORDS );
ADD_ENUM_VALUE( OBJECT_COORDS_WITH_MAXIMUM_SCREEN_SIZE_CAPPED_BY_FONT_HEIGHT );
END_ENUM_SERIALIZER(); // _characterSizeMode
ADD_FLOAT_SERIALIZER( MaximumWidth, 0.0f ); // _maximumWidth
ADD_FLOAT_SERIALIZER( MaximumHeight, 0.0f ); // _maximumHeight
ADD_FLOAT_SERIALIZER( LineSpacing, 0.0f ); // _lineSpacing
ADD_USER_SERIALIZER( Text ); // _text
ADD_VEC3_SERIALIZER( Position, osg::Vec3() ); // _position
BEGIN_ENUM_SERIALIZER2( Alignment, osgText::TextBase::AlignmentType, LEFT_BASE_LINE );
ADD_ENUM_VALUE( LEFT_TOP );
ADD_ENUM_VALUE( LEFT_CENTER );
@@ -207,7 +207,7 @@ REGISTER_OBJECT_WRAPPER( osgText_TextBase,
ADD_ENUM_VALUE( CENTER_BOTTOM_BASE_LINE );
ADD_ENUM_VALUE( RIGHT_BOTTOM_BASE_LINE );
END_ENUM_SERIALIZER(); // _alignment
BEGIN_ENUM_SERIALIZER( AxisAlignment, XY_PLANE );
ADD_ENUM_VALUE( XY_PLANE );
ADD_ENUM_VALUE( REVERSED_XY_PLANE );
@@ -218,16 +218,16 @@ REGISTER_OBJECT_WRAPPER( osgText_TextBase,
ADD_ENUM_VALUE( SCREEN );
ADD_ENUM_VALUE( USER_DEFINED_ROTATION );
END_ENUM_SERIALIZER(); // _axisAlignment
ADD_QUAT_SERIALIZER( Rotation, osg::Quat() ); // _rotation
ADD_BOOL_SERIALIZER( AutoRotateToScreen, false ); // _autoRotateToScreen
BEGIN_ENUM_SERIALIZER( Layout, LEFT_TO_RIGHT );
ADD_ENUM_VALUE( LEFT_TO_RIGHT );
ADD_ENUM_VALUE( RIGHT_TO_LEFT );
ADD_ENUM_VALUE( VERTICAL );
END_ENUM_SERIALIZER(); // _layout
ADD_USER_SERIALIZER( DrawMode ); // _drawMode
ADD_FLOAT_SERIALIZER( BoundingBoxMargin, 0.0f ); // _textBBMargin
ADD_VEC4_SERIALIZER( BoundingBoxColor, osg::Vec4() ); // _textBBColor

2
src/osgWrappers/serializers/osgVolume/ScalarProperty.cpp
View File

@@ -9,6 +9,6 @@ REGISTER_OBJECT_WRAPPER( osgVolume_ScalarProperty,
"osg::Object osgVolume::Property osgVolume::ScalarProperty" )
{
// FIXME: don't set constructor directly, try implementing a setName() method?
ADD_FLOAT_SERIALIZER( Value, 1.0f );
}

4
src/osgWrappers/serializers/osgVolume/VolumeTile.cpp
View File

@@ -30,9 +30,9 @@ REGISTER_OBJECT_WRAPPER( osgVolume_VolumeTile,
ADD_OBJECT_SERIALIZER( Volume, osgVolume::Volume, NULL ); // _volume
UPDATE_TO_VERSION( 90 )
{
REMOVE_SERIALIZER( Volume );
REMOVE_SERIALIZER( Volume );
}
ADD_BOOL_SERIALIZER( Dirty, false ); // _dirty
ADD_USER_SERIALIZER( TileID ); // _tileID
ADD_OBJECT_SERIALIZER( VolumeTechnique, osgVolume::VolumeTechnique, NULL ); // _volumeTechnique