Changeset 3851 in orxonox.OLD for orxonox/trunk/src/simple_animation.h

Timestamp:

Apr 17, 2005, 1:21:59 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: animation: more adaptions to the new Framework

File:

• orxonox/trunk/src/simple_animation.h (modified) (6 diffs)

orxonox/trunk/src/simple_animation.h

@@ -18 +18 @@
 class Vector;
 class Quaternion;
-class WorldEntity;
 class PNode;
 
@@ -33 +32 @@
   Vector* position;
   Quaternion* direction;
-  WorldEntity* object;
+  PNode* object;
   float time;
   movementMode mode;
@@ -58 +57 @@
   void setAnimFunc(ANIM_FUNCTION animFunc);
 
+ private:
   float constant(float timePassed) const;
   float linear(float timePassed) const;
@@ -73 +73 @@
 
   // private
-  WorldEntity* object;
+  PNode* object;
   Vector* lastPosition;
   Vector* tmpVect;
@@ -100 +100 @@
   void animatorBegin();
   void animatorEnd();
-  void selectObject(WorldEntity* entity);
+  void selectObject(PNode* entity);
   void addKeyFrame(Vector* point, Quaternion* direction, float time);
   void addKeyFrame(Vector* point, Quaternion* direction, float time, movementMode mode);
@@ -132 +132 @@
   
   Vector* tmpVect;                 //<! this is the temporary vector save place - 
-  WorldEntity* workingObject;      //<! this is a pointer to the current working object that has been selected via selectObject()
+  PNode* workingObject;      //<! this is a pointer to the current working object that has been selected via selectObject()
   Animation3D* workingAnimator;       //<! the animator with which you are currently working
   float deltaT;                    //<! this is a time constant for the movement
 
-  Animation3D* getAnimationFromWorldEntity(WorldEntity* entity);
+  Animation3D* getAnimationFromPNode(PNode* entity);
 
 };