Changeset 10439 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 1:58:29 PM (18 years ago)

Author:

snellen

Message:

npc is now trackable

Location:

trunk/src/world_entities

Files:

• npcs/npc.cc (modified) (5 diffs)
• test_entity.cc (modified) (6 diffs)

trunk/src/world_entities/npcs/npc.cc

@@ -34 +34 @@
 #include "debug.h"
 #include "loading/load_param.h"
+#include "track/track.h"
 
 
@@ -64 +65 @@
   std::cout << "Swarm Number:" << swarmNumber << "\n";
 
+//add to track
+  if(this->entityTrack)
+    this->setParent(this->entityTrack->getTrackNode());
+  else
   AIEngine::getInstance()->addAI(teamNumber,swarmNumber,(WorldEntity*)this,maxSpeed,attackDistance);
 
@@ -117 +122 @@
 //   this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
 
+
+ 
+
 }
 
@@ -122 +130 @@
 NPC::~NPC ()
 {
+ if(! this->entityTrack)
   AIEngine::getInstance()->removeAI(teamNumber,swarmNumber,(WorldEntity*)this);
 }
@@ -220 +229 @@
     weaponMan.fire();
   this->bFire = false;
-}
+
+ if(this->entityTrack)
+    this->entityTrack->tick(dt);
+
+}

trunk/src/world_entities/test_entity.cc

@@ -26 +26 @@
 #include "debug.h"
 
+#include "track/track.h"
+
 
 
@@ -37 +39 @@
 CREATE_FACTORY(TestEntity);
 
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(TestEntity,
+                        addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
+                        ->addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("setAbsDir", Executor4<PNode, lua_State*,float,float,float,float>(&PNode::setAbsDir))
+                       );
 
 
@@ -53 +63 @@
 TestEntity::TestEntity(const TiXmlElement* root)
 {
-  this->init();
-
   if( root != NULL)
     this->loadParams(root);
+
+  this->init();
 }
 
@@ -74 +84 @@
   this->registerObject(this, TestEntity::_objectList);
   this->toList(OM_GROUP_00);
+
+ //add to track
+  if(this->entityTrack)
+    this->setParent(this->entityTrack->getTrackNode());
+
 }
 
@@ -121 +136 @@
   glPopMatrix();
   glPopAttrib();
+
+
+if( this->entityTrack != NULL)
+    this->entityTrack->drawGraph();
+
 }
 
@@ -128 +148 @@
 void TestEntity::tick (float time)
 {
+ if(this->entityTrack)
+    this->entityTrack->tick(time);