Changeset 3848 in orxonox.OLD for orxonox/trunk/src/animation.h
- Timestamp:
- Apr 17, 2005, 2:16:45 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/animation.h
r3847 r3848 48 48 ANIM_INF_REWIND};//, ANIM_DELETE} 49 49 50 typedef struct AnimKeyFrame50 typedef struct KeyFrameF 51 51 { 52 52 float duration; … … 128 128 // ANIM_FUNCTION animFunc; 129 129 float (tAnimation<T>::*animFunc)(float) const; 130 AnimKeyFrame* currentKeyFrame;131 AnimKeyFrame* nextKeyFrame;132 tList< AnimKeyFrame>* keyFrameList;130 KeyFrameF* currentKeyFrame; 131 KeyFrameF* nextKeyFrame; 132 tList<KeyFrameF>* keyFrameList; 133 133 134 134 … … 151 151 { 152 152 // create a new List 153 this->keyFrameList = new tList< AnimKeyFrame>();154 AnimKeyFrame* tmpKeyFrame = new AnimKeyFrame;153 this->keyFrameList = new tList<KeyFrameF>(); 154 KeyFrameF* tmpKeyFrame = new KeyFrameF; 155 155 tmpKeyFrame->value = 0.0; 156 156 tmpKeyFrame->duration = 1.0; … … 174 174 { 175 175 // delete all the KeyFrames 176 tIterator< AnimKeyFrame>* itKF = keyFrameList->getIterator();177 AnimKeyFrame* enumKF = itKF->nextElement();176 tIterator<KeyFrameF>* itKF = keyFrameList->getIterator(); 177 KeyFrameF* enumKF = itKF->nextElement(); 178 178 while (enumKF) 179 179 { … … 209 209 210 210 211 AnimKeyFrame* tmpKeyFrame;211 KeyFrameF* tmpKeyFrame; 212 212 213 213 if (bHasKeys) 214 214 { 215 tmpKeyFrame = new AnimKeyFrame;215 tmpKeyFrame = new KeyFrameF; 216 216 if (this->currentKeyFrame == this->nextKeyFrame) 217 217 this->nextKeyFrame = tmpKeyFrame;
Note: See TracChangeset
for help on using the changeset viewer.