Changeset 9183 in orxonox.OLD for branches

Timestamp:

Jul 5, 2006, 6:19:44 AM (18 years ago)

Author:

patrick

Message:

more aiming system work

Location:

branches/presentation/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -113 +113 @@
 
 
-  PRINTF(0)("half length %f, %f, %f", this->bvElement->halfLength[0], this->bvElement->halfLength[1], this->bvElement->halfLength[2]);
+  PRINTF(0)("half length %f, %f, %f\n", this->bvElement->halfLength[0], this->bvElement->halfLength[1], this->bvElement->halfLength[2]);
   PRINTF(0)("center:\n");
   this->bvElement->center.debug();
+
   this->flag = true;
 }

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -140 +140 @@
 
   this->getWeaponManager().setParentNode(&this->cameraNode);
+  this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
 

branches/presentation/src/world_entities/world_entity.h

@@ -75 +75 @@
 /** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
-  inline void setOBBTree(OBBTree* tree) { if( this->obbTree != NULL) this->obbTree = (BVTree*)tree; }
+  inline void setOBBTree(OBBTree* tree) { /*if( this->obbTree != NULL) delete this->obbTree;*/ this->obbTree = (BVTree*)tree; }
   void drawBVTree(int depth, int drawMode) const;
   inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}