Changeset 9192 in orxonox.OLD

Timestamp:

Jul 5, 2006, 8:05:48 AM (18 years ago)

Author:

patrick

Message:

aiming works almost

Location:

branches/presentation/src

Files:

• story_entities/multi_player_world.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/environments/building.cc (modified) (1 diff)
• world_entities/weapons/aiming_system.cc (modified) (2 diffs)

branches/presentation/src/story_entities/multi_player_world.cc

@@ -107 +107 @@
     this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
-    this->dataTank->objectManager->getObjectList(OM_GROUP_00));
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
-    this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS));
 
 

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

@@ -248 +248 @@
       this->getWeaponManager().setSlotPosition(1, Vector(5.0, box->halfLength[1] * f, 0.0));
 
-      this->aimingSystem->toList(OM_LIST(this->getOMListNumber() + 1) /*OM_GROUP_01*/);
+      this->aimingSystem->toList(OM_GROUP_01);
       this->aimingSystem->setParent(&this->cameraNode);
       this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);

branches/presentation/src/world_entities/environments/building.cc

@@ -32 +32 @@
 {
   this->setClassID(CL_BUILDING, "Building");
-  this->toList(OM_GROUP_01);
+  this->toList(OM_ENVIRON_NOTICK);
 
   if (root != NULL)

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

@@ -101 +101 @@
   }
 
-
+  PRINTF(0)("entity: %s\n", nearestEntity->getClassName());
     return nearestEntity;
 }
@@ -114 +114 @@
 {
   if( this->owner != killer)
+  {
+    PRINTF(0)("real hit: %s\n", killer->getClassName());
+
     this->selectionList.push_back(killer);
+  }
+  PRINTF(0)("no hit: %s\n", killer->getClassName());
 }