Changeset 12653

Show
Ignore:
Timestamp:
06/25/11 09:07:58 (3 years ago)
Author:
robert
Message:

Merged from svn/trunk changeset 12652, Tighten up float usage

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-3.0/examples/osganimationskinning/osganimationskinning.cpp

    r12649 r12653  
    149149        float val = (*array)[i][0]; 
    150150        std::cout << val << std::endl; 
    151         if (val >= -1 && val <= 0) 
     151        if (val >= -1.0f && val <= 0.0f) 
    152152            (*vim)[b0->getName()].push_back(osgAnimation::VertexIndexWeight(i,1.0f)); 
    153         else if ( val > 0 && val <= 1) 
     153        else if ( val > 0.0f && val <= 1.0f) 
    154154            (*vim)[b1->getName()].push_back(osgAnimation::VertexIndexWeight(i,1.0f)); 
    155         else if ( val > 1) 
     155        else if ( val > 1.0f) 
    156156            (*vim)[b2->getName()].push_back(osgAnimation::VertexIndexWeight(i,1.0f)); 
    157157    }