Show
Ignore:
Timestamp:
05/28/10 18:07:09 (5 years ago)
Author:
robert
Message:

Converted osg::notify to OSG_INFO etc.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgAnimation/RigTransformHardware.cpp

    r11009 r11484  
    5656        osg::Matrix result =  transformFromSkeletonToGeometry * resultBoneMatrix * invTransformFromSkeletonToGeometry; 
    5757        if (!_uniformMatrixPalette->setElement(i, result)) 
    58             osg::notify(osg::WARN) << "RigTransformHardware::computeUniformMatrixPalette can't set uniform at " << i << " elements" << std::endl; 
     58            OSG_WARN << "RigTransformHardware::computeUniformMatrixPalette can't set uniform at " << i << " elements" << std::endl; 
    5959    } 
    6060} 
     
    9595                if (boneMap.find(bw.getBoneName()) == boneMap.end()) 
    9696                { 
    97                     osg::notify(osg::INFO) << "RigTransformHardware::createPalette can't find bone " << bw.getBoneName() << " skip this influence" << std::endl; 
     97                    OSG_INFO << "RigTransformHardware::createPalette can't find bone " << bw.getBoneName() << " skip this influence" << std::endl; 
    9898                    continue; 
    9999                } 
     
    106106            else 
    107107            { 
    108                 osg::notify(osg::WARN) << "RigTransformHardware::createPalette Bone " << bw.getBoneName() << " has a weight " << bw.getWeight() << " for vertex " << vertexIndex << " this bone will not be in the palette" << std::endl; 
     108                OSG_WARN << "RigTransformHardware::createPalette Bone " << bw.getBoneName() << " has a weight " << bw.getWeight() << " for vertex " << vertexIndex << " this bone will not be in the palette" << std::endl; 
    109109            } 
    110110        } 
    111111        maxBonePerVertex = osg::maximum(maxBonePerVertex, bonesForThisVertex); 
    112112    } 
    113     osg::notify(osg::INFO) << "RigTransformHardware::createPalette maximum number of bone per vertex is " << maxBonePerVertex << std::endl; 
    114     osg::notify(osg::INFO) << "RigTransformHardware::createPalette matrix palette has " << boneNameCountMap.size() << " entries" << std::endl; 
     113    OSG_INFO << "RigTransformHardware::createPalette maximum number of bone per vertex is " << maxBonePerVertex << std::endl; 
     114    OSG_INFO << "RigTransformHardware::createPalette matrix palette has " << boneNameCountMap.size() << " entries" << std::endl; 
    115115 
    116116    for (BoneNameCountMap::iterator it = boneNameCountMap.begin(); it != boneNameCountMap.end(); ++it) 
    117117    { 
    118         osg::notify(osg::INFO) << "RigTransformHardware::createPalette Bone " << it->first << " is used " << it->second << " times" << std::endl; 
    119     } 
    120  
    121     osg::notify(osg::INFO) << "RigTransformHardware::createPalette will use " << boneNameCountMap.size() * 4 << " uniforms" << std::endl; 
     118        OSG_INFO << "RigTransformHardware::createPalette Bone " << it->first << " is used " << it->second << " times" << std::endl; 
     119    } 
     120 
     121    OSG_INFO << "RigTransformHardware::createPalette will use " << boneNameCountMap.size() * 4 << " uniforms" << std::endl; 
    122122 
    123123 
     
    200200    if (!positionSrc)  
    201201    { 
    202         osg::notify(osg::WARN) << "RigTransformHardware no vertex array in the geometry " << geom.getName() << std::endl; 
     202        OSG_WARN << "RigTransformHardware no vertex array in the geometry " << geom.getName() << std::endl; 
    203203        return false; 
    204204    } 
     
    206206    if (!geom.getSkeleton())  
    207207    { 
    208         osg::notify(osg::WARN) << "RigTransformHardware no skeleton set in geometry " << geom.getName() << std::endl; 
     208        OSG_WARN << "RigTransformHardware no skeleton set in geometry " << geom.getName() << std::endl; 
    209209        return false; 
    210210    } 
     
    228228 
    229229    if (!_shader.valid()) { 
    230         osg::notify(osg::WARN) << "RigTransformHardware can't load VertexShader" << std::endl; 
     230        OSG_WARN << "RigTransformHardware can't load VertexShader" << std::endl; 
    231231        return false; 
    232232    } 
     
    241241    str.replace(start, toreplace.size(), ss.str()); 
    242242    _shader->setShaderSource(str); 
    243     osg::notify(osg::INFO) << "Shader " << str << std::endl; 
     243    OSG_INFO << "Shader " << str << std::endl; 
    244244    } 
    245245 
     
    252252        program->addBindAttribLocation(ss.str(), attribIndex + i); 
    253253        geom.setVertexAttribData(attribIndex + i, osg::Geometry::ArrayData(getVertexAttrib(i),osg::Geometry::BIND_PER_VERTEX)); 
    254         osg::notify(osg::INFO) << "set vertex attrib " << ss.str() << std::endl; 
     254        OSG_INFO << "set vertex attrib " << ss.str() << std::endl; 
    255255    } 
    256256    program->addShader(_shader.get());