Changeset 7927 in orxonox.OLD for trunk/src/world_entities

Timestamp:

May 28, 2006, 6:46:33 PM (19 years ago)

Author:

patrick

Message:

trunk: added more cr framework, i will branche soon with this stuff so the trunk dosn't get involved to much in the development phase

Location:

trunk/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (8 diffs)

trunk/src/world_entities/world_entity.cc

@@ -32 +32 @@
 #include "camera.h"
 
+#include "cr_engine.h"
+#include "collision_handle.h"
+
+
 using namespace std;
 
@@ -65 +69 @@
 
   this->toList(OM_NULL);
+
+  //this->collisionHandles = new *CollisionHandle[CREngine::CR_NUMBER]();
 }
 
@@ -228 +234 @@
 }
 
+
+/**
+ * subscribes this world entity to a collision reaction
+ *  @param type the type of reaction to subscribe to
+ *  @param nrOfTargets number of target filters
+ *  @param ... the targets as classIDs
+ */
+void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, ...)
+{}
+
+
 /**
  * @brief moves this entity to the List OM_List

trunk/src/world_entities/world_entity.h

@@ -11 +11 @@
 #include "model.h"
 
+#include "cr_engine.h"
 #include "object_manager.h"
 #include "glincl.h"
 #include <vector>
+#include <stdarg.h>
+
+
 
 // FORWARD DECLARATION
@@ -21 +25 @@
 class BVTree;
 class Model;
+class CollisionHandle;
+
 
 //class CharacterAttributes;
@@ -54 +60 @@
   virtual void draw () const;
 
+  /* --- Collision Detection Block  --- */
   bool buildObbTree(int depth);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
@@ -60 +67 @@
   void drawBVTree(int depth, int drawMode) const;
 
-  void debugWE() { this->debugEntity(); }
-  ;  ///FIXME
-  void debugEntity() const;
+  /* --- Collision Reaction Block --- */
+  void subscribeReaction(CREngine::CRType type, int nrOfTargets, ...);
 
 
@@ -72 +78 @@
   //  CharacterAttributes* getCharacterAttributes();
 
+  /* --- Object Manager Block --- */
   void toList(OM_LIST list);
-
-
   /** @returns a Reference to the objectListNumber to set. */
   OM_LIST& getOMListNumber() { return this->objectListNumber; }
@@ -80 +85 @@
   ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; }
 
+  /* --- Network Block --- */
   int       writeState(const byte* data, int length, int sender);
   int       readState(byte* data, int maxLength );
 
+  /* --- Character Attribute Block --- */
   /** @returns the Energy of the entity */
   float getHealth() const { return this->health; };
@@ -92 +99 @@
   OrxGui::GLGuiWidget* getHealthWidget();
   bool hasHealthWidget() const { return this->healthWidget; };
+
+  /* --- Misc Stuff Block --- */
+  void debugWE() { this->debugEntity(); }
+  ;  ///FIXME
+  void debugEntity() const;
+
 
 protected:
@@ -121 +134 @@
 
   float                   scaling;
+  CollisionHandle**       collisionHandles;