Changeset 5794 in orxonox.OLD

Timestamp:

Nov 27, 2005, 3:50:20 PM (18 years ago)

Author:

bensch

Message:

we: sync

Location:

branches/world_entities/src

Files:

• util/object_manager.cc (modified) (3 diffs)
• util/object_manager.h (modified) (1 diff)
• world_entities/weapons/ground_turret.cc (modified) (6 diffs)
• world_entities/weapons/ground_turret.h (modified) (1 diff)

branches/world_entities/src/util/object_manager.cc

@@ -53 +53 @@
  * returns a new List with a list of WorldEntities of distance Radius from center
  */
-const std::list<WorldEntity*>* ObjectManager::distanceFromObject(const PNode& center, float radius, ClassID classID)
+std::list<WorldEntity*>* ObjectManager::distanceFromObject(const PNode& center, float radius, ClassID classID)
 {
   const tList<BaseObject>* objectList = ClassList::getList(classID);
@@ -61 +61 @@
 
     tIterator<BaseObject>* iter = objectList->getIterator();
-    PNode* tmp = dynamic_cast<PNode*>(iter->firstElement());
+    WorldEntity* tmp = dynamic_cast<WorldEntity*>(iter->firstElement());
     while (tmp != NULL)
     {
@@ -67 +67 @@
         newList->push_back(dynamic_cast<WorldEntity*>(tmp));
 
-      tmp = dynamic_cast<PNode*>(iter->nextElement());
+      tmp = dynamic_cast<WorldEntity*>(iter->nextElement());
     }
     delete iter;

branches/world_entities/src/util/object_manager.h

@@ -31 +31 @@
 
 
-  const std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
+  static std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
 
   ObjectGroupList* getGroupList( );

branches/world_entities/src/world_entities/weapons/ground_turret.cc

@@ -15 +15 @@
 
 #include "ground_turret.h"
-#include "factory.h"
 #include "model.h"
 #include "turret.h"
+
+#include "factory.h"
+#include "load_param.h"
 
 CREATE_FACTORY(GroundTurret, CL_GROUND_TURRET);
@@ -53 +55 @@
   this->setClassID(CL_GROUND_TURRET, "GroundTurret");
   this->loadModel("models/ground_turret.obj", 5);
-  left = new Turret();
+  this->left = NULL;
+  this->right = NULL;
+
+  /*  left = new Turret();
   left->setParent(this);
   left->setRelCoor(0,10,0);
   right = new Turret();
   right->setParent(this);
-  right->setRelCoor(0,10,0);
+  right->setRelCoor(0,10,0);*/
 }
 
@@ -76 +81 @@
    * @todo: make the class Loadable
    */
+  LoadParamXML(root, "Weapons", this, GroundTurret, loadWeapon);
 }
 
@@ -105 +111 @@
   glMultMatrixf((float*)matrix);
 
-  if (model)
-    model->draw();
-  //left->draw();
-  //right->draw();
+  if (this->model)
+    this->model->draw();
+  if (left != NULL)
+    this->left->draw();
+  if (this->right != NULL)
+    this->right->draw();
+
   glPopMatrix();
 }
@@ -128 +137 @@
 void GroundTurret::postSpawn ()
 {
-    
+
 }
 
@@ -137 +146 @@
 void GroundTurret::leftWorld ()
 {
-    
+
 }

branches/world_entities/src/world_entities/weapons/ground_turret.h

@@ -19 +19 @@
   virtual ~GroundTurret();
 
+  void init();
   void loadParams(const TiXmlElement* root);
-  void init();
+
+  void loadWeapons(const TiXmlElement* root);
 
   virtual void postSpawn ();