Changeset 3798 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 13, 2005, 5:22:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: play/rewind and so on work perfectly. (you can try them out on [1-5] keys
1 play
2 stop
3 pause
4 replay
5 rewind

Location:

orxonox/trunk/src

Files:

• animation.cc (modified) (1 diff)
• animation.h (modified) (1 diff)
• orxonox.conf (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)

orxonox/trunk/src/animation.cc

@@ -47 +47 @@
 {
   this->rewind();
+  this->bRunning = true;
+  this->tick(0.0);
   this->bRunning = false;
 }

orxonox/trunk/src/animation.h

@@ -170 +170 @@
   this->currentKeyFrame = keyFrameList->firstElement();
   this->nextKeyFrame = keyFrameList->nextElement(keyFrameList->firstElement());
+  this->localTime = 0.0;
 }
 

orxonox/trunk/src/orxonox.conf

@@ -18 +18 @@
 4=view3
 5=view4
-5=view5
+6=view5

orxonox/trunk/src/story_entities/world.cc

@@ -940 +940 @@
       this->simpleAnimation->tick(seconds);
       
-      //      testAnim->tick(seconds);
+            testAnim->tick(seconds);
 
     }
@@ -1050 +1050 @@
   else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
   else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
-  
+  if (!strcmp(cmd->cmd, "view0")) testAnim->play();
+  if (!strcmp(cmd->cmd, "view1")) testAnim->stop();
+  if (!strcmp(cmd->cmd, "view2")) testAnim->pause();
+  if (!strcmp(cmd->cmd, "view3")) testAnim->replay();
+  if (!strcmp(cmd->cmd, "view4")) testAnim->rewind();
+
   return false;
 }