Changeset 5795 in orxonox.OLD for trunk/src

Timestamp:

Nov 27, 2005, 4:04:52 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/worldEntities back to the trunk svn merge -r5750:HEAD branches/world_entities/ trunk/

Location:

trunk/src

Files:

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

trunk/src/util/object_manager.cc

@@ -17 +17 @@
 
 #include "object_manager.h"
+#include "class_list.h"
+
+#include "p_node.h"
+#include "world_entity.h"
+#include "list.h"
 
 using namespace std;
@@ -28 +33 @@
    this->setClassID(CL_OBJECT_MANAGER, "ObjectManager");
    this->setName("ObjectManager");
+
+   pNodeList = NULL;
 }
 
@@ -42 +49 @@
   ObjectManager::singletonRef = NULL;
 }
+
+/**
+ * returns a new List with a list of WorldEntities of distance Radius from center
+ */
+std::list<WorldEntity*>* ObjectManager::distanceFromObject(const PNode& center, float radius, ClassID classID)
+{
+  const std::list<BaseObject*>* objectList = ClassList::getList(classID);
+  if (objectList != NULL)
+  {
+    std::list<WorldEntity*>* newList = new std::list<WorldEntity*>;
+
+    list<BaseObject*>::const_iterator node;
+    for (node = objectList->begin(); node != objectList->end(); node++)
+    {
+      printf("1:::%s\n", (*node)->getName());
+      if ((dynamic_cast<PNode*>(*node)->getAbsCoor() - center.getAbsCoor()).len() < radius)
+      {
+        newList->push_back(dynamic_cast<WorldEntity*>(*node));
+        printf("%s\n",(*node)->getName());
+      }
+    }
+    return newList;
+  }
+  return NULL;
+}

trunk/src/util/object_manager.h

@@ -11 +11 @@
 
 // FORWARD DECLARATION
-
+class PNode;
+class WorldEntity;
 
 class ObjectGroupList
@@ -30 +31 @@
 
 
+  static std::list<WorldEntity*>* distanceFromObject(const PNode& center, float radius, ClassID classID);
+
   ObjectGroupList* getGroupList( );
 
@@ -38 +41 @@
   std::list<ObjectGroupList>           groupList;
 
+  const std::list<BaseObject>*         pNodeList;
+
 
 };

trunk/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 ()
 {
-    
+
 }

trunk/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 ();