Changeset 9687 in orxonox.OLD

Timestamp:

Aug 22, 2006, 2:52:28 PM (18 years ago)

Author:

bensch

Message:

new_class_id: CDengine adapted

Location:

branches/new_class_id/src

Files:

• lib/collision_detection/aabb.cc (modified) (2 diffs)
• lib/collision_detection/aabb.h (modified) (1 diff)
• lib/collision_detection/aabb_tree_node.cc (modified) (2 diffs)
• lib/collision_detection/aabb_tree_node.h (modified) (1 diff)
• lib/collision_detection/bounding_sphere.cc (modified) (2 diffs)
• lib/collision_detection/bounding_sphere.h (modified) (2 diffs)
• lib/collision_detection/bounding_volume.cc (modified) (2 diffs)
• lib/collision_detection/bounding_volume.h (modified) (1 diff)
• lib/collision_detection/bv_tree.cc (modified) (2 diffs)
• lib/collision_detection/bv_tree.h (modified) (1 diff)
• lib/collision_detection/bv_tree_node.cc (modified) (2 diffs)
• lib/collision_detection/bv_tree_node.h (modified) (1 diff)
• lib/collision_detection/cd_engine.cc (modified) (3 diffs)
• lib/collision_detection/cd_engine.h (modified) (1 diff)
• lib/collision_detection/obb.cc (modified) (2 diffs)
• lib/collision_detection/obb.h (modified) (1 diff)
• lib/collision_detection/obb_tree.cc (modified) (2 diffs)
• lib/collision_detection/obb_tree.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (4 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (1 diff)
• lib/particles/dot_particles.cc (modified) (1 diff)
• lib/particles/model_particles.cc (modified) (1 diff)
• lib/particles/spark_particles.cc (modified) (1 diff)
• lib/particles/sprite_particles.cc (modified) (1 diff)
• world_entities/bsp_entity.h (modified) (3 diffs)

branches/new_class_id/src/lib/collision_detection/aabb.cc

@@ -21 +21 @@
 
 
-
+NewObjectListDefinition(AABB);
 /**
  *  standard constructor
@@ -27 +27 @@
 AABB::AABB ()
 {
-   this->setClassID(CL_OBB, "AABB");
+  this->registerObject(this, AABB::_objectList);
    this->halfLength[0] = this->halfLength[1] = this->halfLength[2] = 0.0f;
    this->bCollided = false;

branches/new_class_id/src/lib/collision_detection/aabb.h

@@ -11 +11 @@
 #include "bounding_volume.h"
 
-template<class T> class tList;
-
 //! A class representing an extended bounding volume tree: an obb tree
 class AABB : public BoundingVolume {
+  NewObjectListDeclaration(AABB);
 
  public:

branches/new_class_id/src/lib/collision_detection/aabb_tree_node.cc

@@ -32 +32 @@
 #include "debug.h"
 
-
-
-
-
-
 GLUquadricObj* AABBTreeNode_sphereObj = NULL;
 
-
+NewObjectListDefinition(AABBTreeNode);
 /**
  *  standard constructor
@@ -48 +43 @@
     : BVTreeNode()
 {
-  this->setClassID(CL_OBB_TREE_NODE, "AABBTreeNode");
+  this->registerObject(this, AABBTreeNode::_objectList);
 
   this->obbTree = &tree;

branches/new_class_id/src/lib/collision_detection/aabb_tree_node.h

@@ -21 +21 @@
 class AABBTreeNode : public BVTreeNode
 {
+  NewObjectListDeclaration(AABBTreeNode);
 
 

branches/new_class_id/src/lib/collision_detection/bounding_sphere.cc

@@ -20 +20 @@
 
 
-
+NewObjectListDefinition(BoundingSphere);
 /**
  *  standard constructor
@@ -26 +26 @@
 BoundingSphere::BoundingSphere ()
 {
-   this->setClassID(CL_BOUNDING_SPHERE, "BoundingSphere");
+  this->registerObject(this, BoundingSphere::_objectList);
 }
 

branches/new_class_id/src/lib/collision_detection/bounding_sphere.h

@@ -1 @@
-/*! 
+/*!
  * @file bounding_sphere.h
   *  Definition of a bounding sphere
@@ -14 +14 @@
 //! A class representing an extended bounding volume tree: an sphere
 class BoundingSphere : public BoundingVolume {
+  NewObjectListDeclaration(BoundingSphere);
 
  public:

branches/new_class_id/src/lib/collision_detection/bounding_volume.cc

@@ -20 +20 @@
 
 
-
+NewObjectListDefinition(BoundingVolume);
 /**
  *  standard constructor
@@ -26 +26 @@
 BoundingVolume::BoundingVolume ()
 {
-  this->setClassID(CL_BOUNDING_VOLUME, "BoundingVolume");
+  this->registerObject(this, BoundingVolume::_objectList);
   this->modelInf = NULL;
   this->triangleIndexes = NULL;

branches/new_class_id/src/lib/collision_detection/bounding_volume.h

@@ -17 +17 @@
 //! An abstract class representing a bounding volume
 class BoundingVolume : public BaseObject {
+  NewObjectListDeclaration(BoundingVolume);
 
   public:

branches/new_class_id/src/lib/collision_detection/bv_tree.cc

@@ -21 +21 @@
 
 
-
+NewObjectListDefinition(BVTree);
 /**
  *  standard constructor
@@ -27 +27 @@
 BVTree::BVTree ()
 {
-   this->setClassID(CL_BV_TREE, "BVTree");
+  this->registerObject(this, BVTree::_objectList);
 
 }

branches/new_class_id/src/lib/collision_detection/bv_tree.h

@@ -36 +36 @@
 class BVTree : public BaseObject
 {
+  NewObjectListDeclaration(BVTree);
 
   public:

branches/new_class_id/src/lib/collision_detection/bv_tree_node.cc

@@ -20 +20 @@
 
 
-
+NewObjectListDefinition(BVTreeNode);
 /**
  *  standard constructor
@@ -26 +26 @@
 BVTreeNode::BVTreeNode ()
 {
-   this->setClassID(CL_BV_TREE_NODE, "BVTreeNode");
+  this->registerObject(this, BVTreeNode::_objectList);
 
 }

branches/new_class_id/src/lib/collision_detection/bv_tree_node.h

@@ -24 +24 @@
 //! A class that represents a bounding volume tree
 class BVTreeNode : public BaseObject {
+  NewObjectListDeclaration(BVTreeNode);
 
 

branches/new_class_id/src/lib/collision_detection/cd_engine.cc

@@ -20 +20 @@
 #include "debug.h"
 
-#include "class_list.h"
-
 #include "model.h"
 #include "world_entity.h"
@@ -36 +34 @@
 
 
-
+NewObjectListDefinition(CDEngine);
 /**
- *  standard constructor
+ * @brief standard constructor
  */
 CDEngine::CDEngine ()
 {
-  this->setClassID(CL_CD_ENGINE, "CDEngine");
+  this->registerObject(this, CDEngine::_objectList);
 
   this->bAbordOnFirstCollision = false;
@@ -103 +101 @@
 void CDEngine::checkCollisionGround(std::list<WorldEntity*>& list1)
 {
-
-  std::list<BaseObject*>::const_iterator bspIterator;
   std::list<WorldEntity*>::iterator entityIterator;
-  const std::list<BaseObject*>* bspList = ClassList::getList(CL_BSP_ENTITY);
-  if( bspList == NULL)
-    return;
-
   // for all bsp managers check all entities
-  for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
+  for( NewObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
+       bspIterator != BspEntity::objectList().end();
+       bspIterator++) {
       for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
       {

branches/new_class_id/src/lib/collision_detection/cd_engine.h

@@ -36 +36 @@
 //! The class representing the collision detection system of orxonox
 class CDEngine : public BaseObject {
+  NewObjectListDeclaration(CDEngine);
 
   friend class WorldEntity;

branches/new_class_id/src/lib/collision_detection/obb.cc

@@ -21 +21 @@
 
 
-
+NewObjectListDefinition(OBB);
 /**
  *  standard constructor
@@ -27 +27 @@
 OBB::OBB ()
 {
-   this->setClassID(CL_OBB, "OBB");
+  this->registerObject(this, OBB::_objectList);
    this->halfLength[0] = this->halfLength[1] = this->halfLength[2] = 0.0f;
    this->bCollided = false;

branches/new_class_id/src/lib/collision_detection/obb.h

@@ -15 +15 @@
 //! A class representing an extended bounding volume tree: an obb tree
 class OBB : public BoundingVolume {
+  NewObjectListDeclaration(OBB);
 
  public:

branches/new_class_id/src/lib/collision_detection/obb_tree.cc

@@ -27 +27 @@
 
 
-
+NewObjectListDefinition(OBBTree);
 /**
  *  standard constructor
@@ -51 +51 @@
 void OBBTree::init()
 {
-  this->setClassID(CL_OBB_TREE, "OBBTree");
+  this->registerObject(this, OBBTree::_objectList);
   this->rootNode = NULL;
   this->id = 0;

branches/new_class_id/src/lib/collision_detection/obb_tree.h

@@ -20 +20 @@
 class OBBTree : public BVTree
 {
+  NewObjectListDeclaration(OBBTree);
 
   public:

branches/new_class_id/src/lib/collision_detection/obb_tree_node.cc

@@ -38 +38 @@
 GLUquadricObj* OBBTreeNode_sphereObj = NULL;
 
-
+NewObjectListDefinition(OBBTreeNode);
 /**
  *  standard constructor
@@ -47 +47 @@
     : BVTreeNode()
 {
-  this->setClassID(CL_OBB_TREE_NODE, "OBBTreeNode");
+  this->registerObject(this, OBBTreeNode::_objectList);
 
   this->obbTree = &tree;
@@ -284 +284 @@
 
 /**
- *  calculate the eigenvectors for the object oriented box
+ * @brief calculate the eigenvectors for the object oriented box
  * @param box: reference to the box
  * @param modelInf: the model info structure of the model
@@ -361 +361 @@
 
 /**
- *  this separates an ob-box in the middle
+ * @brief this separates an ob-box in the middle
  * @param box: the box to separate
  *

branches/new_class_id/src/lib/collision_detection/obb_tree_node.h

@@ -17 +17 @@
 class PNode;
 
-
 //! A class that represents a bounding volume tree
 class OBBTreeNode : public BVTreeNode
 {
-
-
+  NewObjectListDeclaration(OBBTreeNode);
   public:
     OBBTreeNode(const OBBTree& tree, OBBTreeNode* prev, int depth);

branches/new_class_id/src/lib/particles/dot_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "parser/tinyxml/tinyxml.h"
-#include <algorithm>
-
+#include "class_id.h"
 
 CREATE_FACTORY(DotParticles, CL_DOT_PARTICLES);

branches/new_class_id/src/lib/particles/model_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "parser/tinyxml/tinyxml.h"
-#include <algorithm>
-
+#include "class_id.h"
 
 CREATE_FACTORY(ModelParticles, CL_MODEL_PARTICLES);

branches/new_class_id/src/lib/particles/spark_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "parser/tinyxml/tinyxml.h"
-#include <algorithm>
-
-
-
-
+#include "class_id.h"
 
 CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);

branches/new_class_id/src/lib/particles/sprite_particles.cc

@@ -24 +24 @@
 #include "shell_command.h"
 
-#include "parser/tinyxml/tinyxml.h"
-#include <algorithm>
-
+#include "class_id.h"
 
 CREATE_FACTORY(SpriteParticles, CL_SPRITE_PARTICLES);

branches/new_class_id/src/world_entities/bsp_entity.h

@@ -18 +18 @@
 class BspEntity : public WorldEntity
 {
-
+  NewObjectListDeclaration(BspEntity);
  public:
   BspEntity(const TiXmlElement* root = NULL);
@@ -28 +28 @@
 
   void init();
-  
+
   virtual void varChangeHandler( std::list<int> & id );
 
@@ -40 +40 @@
  private:
    BspManager* bspManager;
-   
+
    std::string name;                   //!< store name
    std::string name_write;             //!< temp variable to store name