Changeset 10727 in orxonox.OLD for branches

Timestamp:

Jun 20, 2007, 10:20:07 AM (17 years ago)

Author:

rennerc

Message:

ActionboxEnemy loadParam

Location:

branches/presentation/src/world_entities/npcs

Files:

• actionbox_enemy.cc (modified) (4 diffs)
• actionbox_enemy.h (modified) (1 diff)

branches/presentation/src/world_entities/npcs/actionbox_enemy.cc

@@ -49 +49 @@
   this->acceleration = 3;
   this->speed = 0;
+  this->agility = 1;
   
   this->onEscape = false;
   this->escaped = false;
   this->endPoint = Vector(0, 0, 0);
-  if ( root )
-    this->loadParams( root );
-  
-  
-    this->weaponMan.setParentEntity( this);
+  
+  this->weaponMan.setParentEntity( this);
   //weapons:
 
@@ -114 +112 @@
   
   LoadParam(root, "endPoint", this, ActionboxEnemy, setEndPoint);
+  LoadParam(root, "maxSpeed", this, ActionboxEnemy, setMaxSpeed);
+  LoadParam(root, "agility", this, ActionboxEnemy, setAgility);
+  LoadParam(root, "acceleration", this, ActionboxEnemy, setAcceleration);
 }
 
@@ -217 +218 @@
 {
   Quaternion cur = myDir;
-  Quaternion rx( dt, Vector( 0, 0, 1 ) );
+  Quaternion rx( agility*dt, Vector( 0, 0, 1 ) );
   
   Quaternion tmp1 = cur * rx;
@@ -234 +235 @@
   }
   
-  Quaternion ry( dt, cur.inverse().apply( Vector( 0, 1, 0 ) ) );
+  Quaternion ry( agility*dt, cur.inverse().apply( Vector( 0, 1, 0 ) ) );
   
   tmp1 = cur * ry;

branches/presentation/src/world_entities/npcs/actionbox_enemy.h

@@ -31 +31 @@
     float maxSpeed;
     float speed;
+    float agility;
+    
+    void setAcceleration( float f ){ this->acceleration = f; }
+    void setMaxSpeed( float f ){ this->maxSpeed = f; }
+    void setAgility( float f ){ this->agility = f; }
     
     Quaternion myDir;