Changeset 9168 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 8:27:13 PM (18 years ago)

Author:

patrick

Message:

aiming sys

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (3 diffs)
• weapons/aiming_system.cc (modified) (8 diffs)
• weapons/aiming_system.h (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)

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

@@ -145 +145 @@
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
 
-  this->aimingSystem = new AimingSystem();
+  this->aimingSystem = new AimingSystem(this);
   this->addChild(this->aimingSystem);
-  this->aimingSystem->toList(OM_LIST(this->getOMListNumber() + 1));
+
 
 
@@ -242 +242 @@
       this->getWeaponManager().setSlotPosition(0, Vector(1.5, box->halfLength[1] * f - 0.7, 1.1));
       this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
+
+      this->aimingSystem->toList(/*OM_LIST(this->getOMListNumber() + 1)*/ OM_GROUP_00);
     }
   }
@@ -266 +268 @@
     }
   }
+
+  WorldEntity* target = this->aimingSystem->getNearestTarget();
+  if( target != NULL)
+  {
+    PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
+  }
+
 
 

branches/presentation/src/world_entities/weapons/aiming_system.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Benjamin Grauer
+   main-programmer: Patrick Boenzli
    co-programmer: ...
 */
@@ -23 +23 @@
 
 #include "aabb.h"
+#include "obb_tree.h"
 
 #include <vector>
@@ -33 +34 @@
  * standart constructor
  */
-AimingSystem::AimingSystem (const TiXmlElement* root)
+AimingSystem::AimingSystem (WorldEntity* entity)
 {
   this->init();
-
-
-  if (root)
-    this->loadParams(root);
 }
 
@@ -59 +56 @@
 
   this->loadModel("models/guns/targeting_system_body.obj");
-}
 
-
-void AimingSystem::loadParams(const TiXmlElement* root)
-{
-  PNode::loadParams(root);
-
-//   LoadParam(root, "texture", this, AimingSystem, setTexture)
-//       .describe("the texture-file to load onto the AimingSystem");
-//
-//   LoadParam(root, "size", this, AimingSystem, setSize)
-//       .describe("the size of the AimingSystem in Pixels");
-//
-//   LoadParam(root, "rotation-speed", this, AimingSystem, setRotationSpeed)
-//       .describe("the Speed with which the AimingSystem should rotate");
+  // registering default reactions:
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 }
 
@@ -89 +74 @@
     return this->selectionList.back();
 
-  WorldEntity* nearestEntity     = this->selectionList.back();
+  WorldEntity* nearestEntity     = NULL;
   float        distance          = 0.0f;
   float        smalestDistance   = this->range * 5.0f;
@@ -104 +89 @@
   }
 
-  return nearestEntity;
+  if( nearestEntity != this->owner)
+    return nearestEntity;
+  else return NULL;
 }
 
@@ -127 +114 @@
 {
 
-  this->selectionList.clear();
+//   this->selectionList.clear();
 }
 
@@ -136 +123 @@
 void AimingSystem::draw() const
 {
-//   if( this->getModelAABB() != NULL)
-//     this->getModelAABB()->drawBV(0, 1);
+  WorldEntity::draw();
+
+  if( this->getOBBTree () != NULL)
+    this->getOBBTree()->drawBV(0, 1);
 }

branches/presentation/src/world_entities/weapons/aiming_system.h

@@ -22 +22 @@
 
  public:
-  AimingSystem(const TiXmlElement* root = NULL);
+  AimingSystem(WorldEntity* owner = NULL);
   virtual ~AimingSystem();
 
   void init();
-  virtual void loadParams(const TiXmlElement* root);
-
-
-  inline void selectTarget(PNode* target) { this->setParent(target); };
-  inline PNode* getTarget(PNode* target) { return this->getParent(); };
 
   WorldEntity* getNearestTarget();
-
 
   void setRange(float range){this->range = range;};
@@ -47 +41 @@
    std::vector<WorldEntity*>   selectionList;        //!< the selections
 
+   WorldEntity*                owner;                //!< the owner of the targeting system
 
 };

branches/presentation/src/world_entities/world_entity.cc

@@ -85 +85 @@
 
   this->toList(OM_NULL);
-  
+
   registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName" ) );
   modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
   scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
   list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
-  
+
   health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health" ) );
   healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth" ) );
@@ -742 +742 @@
   this->decreaseHealth(damage);
 
-  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+  PRINTF(5)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)
@@ -838 +838 @@
     this->toList( (OM_LIST)list_write );
   }
-  
+
   if ( std::find( id.begin(), id.end(), health_handle ) != id.end() )
   {
     this->setHealth( health_write );
   }
-  
+
   if ( std::find( id.begin(), id.end(), healthMax_handle ) != id.end() )
   {