Changeset 11034

Show
Ignore:
Timestamp:
01/31/10 19:24:01 (4 years ago)
Author:
robert
Message:

Build fixes for build without ref_ptr<> automatic type conversion

Location:
OpenSceneGraph/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgDB/Serializer

    r11018 r11034  
    867867 
    868868#define END_ENUM_SERIALIZER() \ 
    869     wrapper->addSerializer(serializer); } 
     869    wrapper->addSerializer(serializer.get()); } 
    870870 
    871871 
  • OpenSceneGraph/trunk/src/osgAnimation/StackedTransform.cpp

    r11009 r11034  
    2424    for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it) 
    2525    { 
    26         const StackedTransformElement* element = *it; 
     26        const StackedTransformElement* element = it->get(); 
    2727        if (element) 
    2828            push_back(osg::clone(element,co)); 
     
    3737    { 
    3838         
    39         StackedTransformElement* element = *it; 
     39        StackedTransformElement* element = it->get(); 
    4040        if (!element) 
    4141            continue; 
     
    5454    for (StackedTransform::iterator it = begin(); it != end(); ++it) 
    5555    { 
    56         StackedTransformElement* element = *it; 
     56        StackedTransformElement* element = it->get(); 
    5757        if (!element || element->isIdentity()) 
    5858            continue; 
  • OpenSceneGraph/trunk/src/osgAnimation/UpdateMatrixTransform.cpp

    r11009 r11034  
    5353    for (StackedTransform::iterator it = _transforms.begin(); it != _transforms.end(); ++it) 
    5454    { 
    55         StackedTransformElement* element = *it; 
     55        StackedTransformElement* element = it->get(); 
    5656        if (element && !element->getName().empty() && channelName == element->getName()) 
    5757        { 
  • OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.cpp

    r11032 r11034  
    281281    // (ivStateStack is used to track the state that is not accessible by 
    282282    // SoCallbackAction functions) 
    283     ivStateStack.push(IvStateItem(ivRootNode, osgRootNode)); 
     283    ivStateStack.push(IvStateItem(ivRootNode, osgRootNode.get())); 
    284284 
    285285    // Create callback actions for the inventor nodes 
     
    512512 
    513513        // Get osgStateRoot (note: we HAVE TO reference it) 
    514         osg::Group *stateRoot = ivState.osgStateRoot; 
    515         osg::ref_ptr<osg::Group> r = stateRoot; 
    516 /*    assert(strcmp(stateRoot->className(), "Group") == 0 && 
    517            "IvStateStack osg graph is expected to be " 
    518            "headed by osg::Group"); 
    519         if (stateRoot->getNumChildren() == 1) { 
    520             r = stateRoot->getChild(0)->asGroup(); 
    521             osg::notify(osg::FATAL) << stateRoot->className() << std::endl; 
    522             osg::notify(osg::FATAL) << stateRoot->getChild(0)->className() << std::endl; 
    523             exit(0); 
    524             assert(r != NULL && "Node must be group."); 
    525         }*/ 
     514        osg::ref_ptr<osg::Group> r = ivState.osgStateRoot; 
    526515 
    527516        // Pop state 
     
    539528        // APPEND_AT_PUSH 
    540529        if (!(ivState.flags & IvStateItem::APPEND_AT_PUSH)) 
    541             appendNode(r, action); 
     530            appendNode(r.get(), action); 
    542531 
    543532    } while (multipop); 
     
    12291218    } 
    12301219 
    1231     return osgProgram->addShader(osgShader); 
     1220    return osgProgram->addShader(osgShader.get()); 
    12321221} 
    12331222#endif // INVENTOR_SHADERS_AVAILABLE 
  • OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osgAnimation/UpdateMatrixTransform.cpp

    r11009 r11034  
    5151    for (osgAnimation::StackedTransform::const_iterator it = transforms.begin(); it != transforms.end(); ++it) 
    5252    { 
    53         osgAnimation::StackedTransformElement* element = *it; 
     53        osgAnimation::StackedTransformElement* element = it->get(); 
    5454        if (element) 
    5555            fw.writeObject(*element);