Changeset 3832 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Apr 14, 2005, 1:16:31 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: animation class functions implemented, list enhanced

Location:

orxonox/trunk/src/story_entities

Files:

• campaign.cc (modified) (2 diffs)
• world.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/campaign.cc

@@ -212 +212 @@
 
 
-
-  StoryEntity* entity = this->entities->enumerate();
+  tIterator<StoryEntity>* iterator = this->entities->getIterator();
+  StoryEntity* entity = iterator->nextElement();
   while( entity != NULL) 
     { 
@@ -223 +223 @@
           return entity;
         }
-      entity = this->entities->nextElement();
-    }
-
+      entity = iterator->nextElement();
+    }
+  delete iterator;
 
 

orxonox/trunk/src/story_entities/world.cc

@@ -374 +374 @@
 
             this->testText = TextEngine::getInstance()->createText("fonts/earth.ttf", 30, TEXT_DYNAMIC, 0, 255, 0);
-            testText->setText("TEXT  rocks");
+            testText->setText("We've got Hostiles!");
             testText->setBlending(1.0);
             testText->setBindNode(tn);
 
-            aTest* test = new aTest();
-            tAnim<aTest>* testAnim = new tAnim<aTest>(test, &aTest::littleDebug);
+            //aTest* test = new aTest();
+            //tAnim<aTest>* testAnim = new tAnim<aTest>(test, &aTest::littleDebug);
+            tAnim<Text>* testAnim = new tAnim<Text>(testText, &Text::setBlending);
+            
+            testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+            testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
+            testAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+            
+            testAnim->addKeyFrame(0.0, 1.0, ANIM_COSINE);
+            testAnim->addKeyFrame(1.0, 1.0, ANIM_COSINE);         
+            
             testAnim->addKeyFrame(0.0, 1.0, ANIM_SINE);
-            testAnim->addKeyFrame(3.5, 1.0, ANIM_SINE);
-            //testAnim->addKeyFrame(0.0, 1.0, ANIM_LINEAR);
-            //testAnim->addKeyFrame(1.0, 1.0, ANIM_LINEAR);
+            testAnim->addKeyFrame(1.0, 1.0, ANIM_SINE);
+                    testAnim->addKeyFrame(0.0, 1.0, ANIM_NEG_EXP);
+            testAnim->addKeyFrame(1.0, 1.0, ANIM_NEG_EXP);
+            
             testAnim->setInfinity(ANIM_INF_REWIND);
             break;