Show
Ignore:
Timestamp:
04/19/10 12:35:18 (4 years ago)
Author:
robert
Message:

From Wang Rui, "Attached is the osgAnimation wrappers for serialize IO operations. A
few headers and the osgAnimation sources are also modified to make
everything goes well, including:

A new REGISTER_OBJECT_WRAPPER2 macro to wrap classes like
Skeleton::UpdateSkeleton?.
A bug fix in the Seralizer header which avoids setting default values
to objects.
Naming style fixes in osgAnimation headers and sources, also in the
deprecated dotosg wrappers.
A bug fix for the XML support, to write char values correctly.
A small change in the osg::Geometry wrapper to ignore the
InternalGeometry? property, which is used by the MorphGeometry? and
should not be set by user applications.

The avatar.osg, nathan.osg and robot.osg data files all work fine with
serializers, with some 'unsupported wrapper' warnings when converting.
I'm thinking of removing these warnings by disabling related property
serializers (ComputeBoundingBoxCallback? and Drawable::UpdateCallback?),
which are seldom recorded by users.

By the way, I still wonder how would we handle the C4121 problem,
discussed some days before. The /Zp compile option is set to 16 in the
attached cmake script file. And is there a better solution now?"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgAnimation/ReaderWriter.cpp

    r11009 r11338  
    188188    if (fr.matchSequence("playmode %w")) 
    189189    { 
    190         if      (fr[1].matchWord("ONCE")) anim.setPlaymode(osgAnimation::Animation::ONCE); 
    191         else if (fr[1].matchWord("STAY")) anim.setPlaymode(osgAnimation::Animation::STAY); 
    192         else if (fr[1].matchWord("LOOP")) anim.setPlaymode(osgAnimation::Animation::LOOP); 
    193         else if (fr[1].matchWord("PPONG")) anim.setPlaymode(osgAnimation::Animation::PPONG); 
     190        if      (fr[1].matchWord("ONCE")) anim.setPlayMode(osgAnimation::Animation::ONCE); 
     191        else if (fr[1].matchWord("STAY")) anim.setPlayMode(osgAnimation::Animation::STAY); 
     192        else if (fr[1].matchWord("LOOP")) anim.setPlayMode(osgAnimation::Animation::LOOP); 
     193        else if (fr[1].matchWord("PPONG")) anim.setPlayMode(osgAnimation::Animation::PPONG); 
    194194        fr += 2; 
    195195        iteratorAdvanced = true;