- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/Camera.cpp
r12292 r13041 67 67 else 68 68 return attachment; 69 69 70 70 is >> osgDB::PROPERTY("MultisampleSamples") >> attachment._multisampleSamples; 71 71 is >> osgDB::PROPERTY("MultisampleColorSamples") >> attachment._multisampleColorSamples; … … 100 100 return; 101 101 } 102 102 103 103 os << osgDB::PROPERTY("MultisampleSamples") << attachment._multisampleSamples << std::endl; 104 104 os << osgDB::PROPERTY("MultisampleColorSamples") << attachment._multisampleColorSamples << std::endl; … … 192 192 osg::Camera::Attachment attachment = readBufferAttachment(is); 193 193 is >> osgDB::END_BRACKET; 194 194 195 195 if ( attachment._internalFormat!=GL_NONE ) 196 196 { … … 242 242 ADD_OBJECT_SERIALIZER( ColorMask, osg::ColorMask, NULL ); // _colorMask 243 243 ADD_OBJECT_SERIALIZER( Viewport, osg::Viewport, NULL ); // _viewport 244 244 245 245 BEGIN_ENUM_SERIALIZER( TransformOrder, PRE_MULTIPLY ); 246 246 ADD_ENUM_VALUE( PRE_MULTIPLY ); 247 247 ADD_ENUM_VALUE( POST_MULTIPLY ); 248 248 END_ENUM_SERIALIZER(); // _transformOrder 249 249 250 250 BEGIN_ENUM_SERIALIZER( ProjectionResizePolicy, HORIZONTAL ); 251 251 ADD_ENUM_VALUE( FIXED ); … … 253 253 ADD_ENUM_VALUE( VERTICAL ); 254 254 END_ENUM_SERIALIZER(); // _projectionResizePolicy 255 255 256 256 ADD_MATRIXD_SERIALIZER( ProjectionMatrix, osg::Matrixd() ); // _projectionMatrix 257 257 ADD_MATRIXD_SERIALIZER( ViewMatrix, osg::Matrixd() ); // _viewMatrix … … 259 259 ADD_GLENUM_SERIALIZER( DrawBuffer, GLenum, GL_NONE ); // _drawBuffer 260 260 ADD_GLENUM_SERIALIZER( ReadBuffer, GLenum, GL_NONE ); // _readBuffer 261 261 262 262 BEGIN_ENUM_SERIALIZER( RenderTargetImplementation, FRAME_BUFFER ); 263 263 ADD_ENUM_VALUE( FRAME_BUFFER_OBJECT ); … … 267 267 ADD_ENUM_VALUE( SEPERATE_WINDOW ); 268 268 END_ENUM_SERIALIZER(); // _renderTargetImplementation 269 269 270 270 ADD_USER_SERIALIZER( BufferAttachmentMap ); // _bufferAttachmentMap 271 271 ADD_OBJECT_SERIALIZER( InitialDrawCallback, osg::Camera::DrawCallback, NULL ); // _initialDrawCallback
