- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/AnimationPath.cpp
r10974 r13041 33 33 osg::AnimationPath *ap = dynamic_cast<osg::AnimationPath*>(&obj); 34 34 if (!ap) return false; 35 36 35 36 37 37 bool itAdvanced = false; 38 38 … … 43 43 ap->setLoopMode(AnimationPath::SWING); 44 44 fr += 2; 45 itAdvanced = true; 45 itAdvanced = true; 46 46 } 47 47 else if (fr[1].matchWord("LOOP")) … … 49 49 ap->setLoopMode(AnimationPath::LOOP); 50 50 fr += 2; 51 itAdvanced = true; 52 } 51 itAdvanced = true; 52 } 53 53 else if (fr[1].matchWord("NO_LOOPING")) 54 54 { 55 55 ap->setLoopMode(AnimationPath::NO_LOOPING); 56 56 fr += 2; 57 itAdvanced = true; 58 } 57 itAdvanced = true; 58 } 59 59 } 60 60 … … 66 66 67 67 fr += 2; 68 68 69 69 70 70 double time; 71 71 Vec3d position,scale; 72 72 Quat rotation; 73 73 74 74 while (!fr.eof() && fr[0].getNoNestedBrackets()>entry) 75 75 { 76 76 if (fr[0].getFloat(time) && 77 fr[1].getFloat(position[0]) && 78 fr[2].getFloat(position[1]) && 77 fr[1].getFloat(position[0]) && 78 fr[2].getFloat(position[1]) && 79 79 fr[3].getFloat(position[2]) && 80 fr[4].getFloat(rotation[0]) && 81 fr[5].getFloat(rotation[1]) && 80 fr[4].getFloat(rotation[0]) && 81 fr[5].getFloat(rotation[1]) && 82 82 fr[6].getFloat(rotation[2]) && 83 83 fr[7].getFloat(rotation[3]) && 84 fr[8].getFloat(scale[0]) && 85 fr[9].getFloat(scale[1]) && 84 fr[8].getFloat(scale[0]) && 85 fr[9].getFloat(scale[1]) && 86 86 fr[10].getFloat(scale[2])) 87 87 { … … 91 91 ap->insert(time, ctrlPoint); 92 92 93 fr+=11; 94 } 93 fr+=11; 94 } 95 95 else fr.advanceOverCurrentFieldOrBlock(); 96 96 … … 100 100 101 101 } 102 102 103 103 return itAdvanced; 104 104 } … … 133 133 134 134 for (AnimationPath::TimeControlPointMap::const_iterator itr=tcpm.begin(); 135 itr!=tcpm.end(); 135 itr!=tcpm.end(); 136 136 ++itr) 137 137 { … … 171 171 172 172 bool iteratorAdvanced = false; 173 173 174 174 if (fr.matchSequence("pivotPoint %f %f %f")) 175 175 { … … 178 178 fr[2].getFloat(pivot[1]); 179 179 fr[3].getFloat(pivot[2]); 180 180 181 181 apc->setPivotPoint(pivot); 182 182 183 183 fr += 4; 184 184 iteratorAdvanced = true; 185 185 } 186 186 187 187 if (fr.matchSequence("timeOffset %f")) 188 188 { … … 191 191 iteratorAdvanced = true; 192 192 } 193 193 194 194 else if(fr.matchSequence("timeMultiplier %f")) 195 195 { … … 207 207 iteratorAdvanced = true; 208 208 } 209 209 210 210 return iteratorAdvanced; 211 211 }
