Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9183 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 5, 2006, 6:19:44 AM (18 years ago)
Author:
patrick
Message:

more aiming system work

Location:
branches/presentation/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/lib/collision_detection/obb_tree_node.cc

    r9174 r9183  
    113113
    114114
    115   PRINTF(0)("half length %f, %f, %f", this->bvElement->halfLength[0], this->bvElement->halfLength[1], this->bvElement->halfLength[2]);
     115  PRINTF(0)("half length %f, %f, %f\n", this->bvElement->halfLength[0], this->bvElement->halfLength[1], this->bvElement->halfLength[2]);
    116116  PRINTF(0)("center:\n");
    117117  this->bvElement->center.debug();
     118
    118119  this->flag = true;
    119120}
  • branches/presentation/src/world_entities/creatures/fps_player.cc

    r9172 r9183  
    140140
    141141  this->getWeaponManager().setParentNode(&this->cameraNode);
     142  this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
    142143  this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
    143144
  • branches/presentation/src/world_entities/world_entity.h

    r9178 r9183  
    7575/** @returns a reference to the obb tree of this worldentity */
    7676  inline BVTree* getOBBTree() const { return this->obbTree; };
    77   inline void setOBBTree(OBBTree* tree) { if( this->obbTree != NULL) this->obbTree = (BVTree*)tree; }
     77  inline void setOBBTree(OBBTree* tree) { /*if( this->obbTree != NULL) delete this->obbTree;*/ this->obbTree = (BVTree*)tree; }
    7878  void drawBVTree(int depth, int drawMode) const;
    7979  inline AABB* getModelAABB() const { return (this->aabbNode)?this->aabbNode->getAABB():NULL;}
Note: See TracChangeset for help on using the changeset viewer.