Changeset 8234 in orxonox.OLD

Timestamp:

Jun 8, 2006, 1:30:08 PM (18 years ago)

Author:

patrick

Message:

bsp: cr and some manager stuff

Location:

branches/bsp_model/src

Files:

• lib/collision_reaction/collision_handle.h (modified) (1 diff)
• lib/collision_reaction/cr_engine.cc (modified) (1 diff)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• lib/graphics/importer/bsp_manager.cc (modified) (3 diffs)
• world_entities/playable.cc (modified) (1 diff)

branches/bsp_model/src/lib/collision_reaction/collision_handle.h

@@ -41 +41 @@
     /** @returns true if this handle should be pulled also if there are no collisions */
     inline bool isContinuousPoll() const { return this->bContinuousPoll; }
+    /** @returns the type */
+    inline CREngine::CRType getType() const { return this->type; }
 
     void handleCollisions();

branches/bsp_model/src/lib/collision_reaction/cr_engine.cc

@@ -145 +145 @@
     if( (*it)->isCollided() || (*it)->isContinuousPoll())  //does it have any collisions to report at all
     {
+      PRINTF(0)("CREngine: handle %i\n", (*it)->getType());
       (*it)->handleCollisions();
     }

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -53 +53 @@
 {
 //   Vector normal = collision
-
+  PRINTF(0)("Ground\n");
 
 }

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -84 +84 @@
   this->alreadyVisible = new bool [this->bspFile->numFaces];
 
-  this->outputFraction = 1.0f; //FIXME is this needed?
+  this->outputFraction = 1.0f;
 }
 /*
@@ -862 +862 @@
 
   Vector forwardDir = worldEntity->getAbsDirX();
-  forwardDir.x =8.0*forwardDir.x;
-  forwardDir.y =8.0*forwardDir.y;
-  forwardDir.z =8.0*forwardDir.z;
+  forwardDir = forwardDir * 8.0f;
 
   Vector upDir = worldEntity->getAbsDirY();
   Vector dest = position;
+
   dest.x  += forwardDir.x;
   dest.y  += forwardDir.y;
@@ -881 +880 @@
 
 
-  if(!worldEntity->isA(CL_PLAYABLE)) {
+  if(/*!worldEntity->isA(CL_PLAYABLE)*/ false) {
 
 

branches/bsp_model/src/world_entities/playable.cc

@@ -66 +66 @@
   this->bDead = false;
 
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_MODEL);
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );