Changeset 10440 in orxonox.OLD

Timestamp:

Jan 28, 2007, 2:09:09 PM (17 years ago)

Author:

patrick

Message:

making weapons loadable

Location:

trunk/src/world_entities

Files:

• mount_point.cc (modified) (2 diffs)
• npcs/npc.cc (modified) (5 diffs)
• npcs/npc.h (modified) (3 diffs)
• weapons/weapon_slot.cc (modified) (4 diffs)
• weapons/weapon_slot.h (modified) (1 diff)

trunk/src/world_entities/mount_point.cc

@@ -21 +21 @@
 #include "util/loading/load_param_xml.h"
 
-
+#include "weapons/weapon_slot.h"
 
 #include "mount_point.h"
@@ -178 +178 @@
       this->_mount->toList( (OM_LIST)(this->getOMListNumber()+1));
     }
+    else if( obj->isA( WeaponSlot::staticClassID()))
+    {
+      PRINTF(0)("=========+>we got a weapon slot\n");
+    }
   }
   else

trunk/src/world_entities/npcs/npc.cc

@@ -34 +34 @@
 #include "debug.h"
 #include "loading/load_param.h"
+#include "util/loading/load_param_xml.h"
 #include "track/track.h"
 
@@ -58 +59 @@
 
   this->toList(OM_GROUP_01);
+  this->bAIEnabled = false;
 
   if( root != NULL)
-          this->loadParams(root);
-
-  std::cout << "Team Number: " << teamNumber << "\n";
-  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);
+    this->loadParams(root);
+
+  if( this->bAIEnabled)
+  {
+    std::cout << "Team Number: " << teamNumber << "\n";
+    std::cout << "Swarm Number:" << swarmNumber << "\n";
+
+    if( this->entityTrack)
+      this->setParent(this->entityTrack->getTrackNode());
+    else
+      AIEngine::getInstance()->addAI(teamNumber,swarmNumber,(WorldEntity*)this,maxSpeed,attackDistance);
+  }
 
   this->bFire = false;
@@ -123 +127 @@
 
 
- 
+
 
 }
@@ -144 +148 @@
    WorldEntity::loadParams(root);
 
+  LoadParam(root, "enableAI", this, NPC, enableAI)
+      .describe("enables the AI algorithms");
+
   LoadParam(root, "team", this, NPC, setTeamNumber)
   .describe("this sets the team number")
@@ -159 +166 @@
   .describe("this sets the NPC distance to target")
   .defaultValues(0);
+
+
+    // Track
+  LoadParamXML(root, "Weapons", this, NPC, addWeapons)
+  .describe("creates and adds weapons");
+}
+
+
+void NPC::addWeapons(const TiXmlElement* root)
+{
+  if( root == NULL)
+    return;
+
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    PRINTF(0)("got weapon: %s\n", element->Value());
+    BaseObject* obj = Factory::fabricate(element);
+    if( obj != NULL && obj->isA( Weapon::staticClassID()))
+    {
+      PRINTF(0)("created a weapon\n");
+    }
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 

trunk/src/world_entities/npcs/npc.h

@@ -20 +20 @@
 
 
+  void addWeapons(const TiXmlElement* root);
   bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
   void removeWeapon(Weapon* weapon);
@@ -31 +32 @@
   inline void fire(){ this->bFire=true;}
 
-
+  inline void enableAI() { this->bAIEnabled = true; }
 
 private:
@@ -51 +52 @@
 
   AIModule*             aiModule;
+
+  bool                  bAIEnabled;   //!< true is AI enabled
 };
 

trunk/src/world_entities/weapons/weapon_slot.cc

@@ -19 +19 @@
 #include "weapon_slot.h"
 #include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 
 
@@ -27 +28 @@
 {
   this->registerObject(this, WeaponSlot::_objectList);
-
 }
 
@@ -34 +34 @@
    this->registerObject(this, WeaponSlot::_objectList);
 
+   if( root != NULL)
+     this->loadParams( root);
 }
 
@@ -39 +41 @@
 WeaponSlot::~WeaponSlot()
 {}
+
+
+
+void WeaponSlot::loadParams(const TiXmlElement* root)
+{
+  PNode::loadParams( root);
+
+    // now check for the orx class to create
+  LoadParam(root, "WeaponClass", this, WeaponSlot, setWeaponClass)
+  .describe("Sets the class this mount points should host");
+}
+
+
+
+
+void WeaponSlot::setWeaponClass()
+{
+
+}
+

trunk/src/world_entities/weapons/weapon_slot.h

@@ -23 +23 @@
   virtual ~WeaponSlot();
 
+  virtual void loadParams(const TiXmlElement* root);
+
+  void setWeaponClass();
 
   long getCapability() { return this->capability; }