Changeset 6909 in orxonox.OLD for branches/current_cd/src/world_entities

Timestamp:

Jan 31, 2006, 6:02:16 PM (19 years ago)

Author:

patrick

Message:

current_cd: merged with the current version of the trunk

Location:

branches/current_cd/src/world_entities

Files:

• environment.cc (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (3 diffs)

branches/current_cd/src/world_entities/environment.cc

@@ -37 +37 @@
   this->init();
   this->loadModel("models/ships/bolido.obj");
+//   if(this->obbTree == NULL)
+//     this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

branches/current_cd/src/world_entities/test_entity.cc

@@ -38 +38 @@
 {
   this->init();
+  this->md2Model = new MD2Model("models/droidika.md2", "models/droideka.pcx");
 }
 
+
+//   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
+// this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
+//   this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
 

branches/current_cd/src/world_entities/world_entity.cc

@@ -206 +206 @@
 bool WorldEntity::buildObbTree(unsigned int depth)
 {
+<<<<<<< .working
   if (this->obbTree)
     delete this->obbTree;
@@ -211 +212 @@
   if (this->models[0] != NULL)
   {
+=======
+  if( this->model != NULL) {
+>>>>>>> .merge-right.r6905
     PRINTF(4)("creating obb tree\n");
+<<<<<<< .working
 
 
     this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
+=======
+    //this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+    this->obbTree = new OBBTree(depth, *model->getModelInfo());
+>>>>>>> .merge-right.r6905
     return true;
   }
   else
   {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+    PRINTF(1)("could not create obb-tree, because no model was loaded yet\n");
     this->obbTree = NULL;
     return false;
@@ -257 +266 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
+void WorldEntity::collidesWith(const WorldEntity& entity, const Vector& location) const
 {
   /**

branches/current_cd/src/world_entities/world_entity.h

@@ -60 +60 @@
   virtual void draw () const;
 
+
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
+
   void drawBVTree(unsigned int depth, int drawMode) const;
+  /** @returns a reference to the obb tree of this worldentity */
+  inline const BVTree* getOBBTree() const { return this->obbTree; };
+
 
 
@@ -78 +83 @@
   void toList(OM_LIST list);
 
+<<<<<<< .working
   /** @returns a Reference to the objectListNumber to set. */
   OM_LIST& getOMListNumber() { return this->objectListNumber; }
@@ -100 +106 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
+=======
+ protected:
+  Model*                  model;            //!< The model that should be loaded for this entity.
+  const BVTree*           obbTree;          //!< this is the obb tree reference needed for collision detection
+>>>>>>> .merge-right.r6905
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: