Changeset 9194 in orxonox.OLD

Timestamp:

Jul 5, 2006, 8:14:40 AM (18 years ago)

Author:

patrick

Message:

less debug and better init

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (2 diffs)
• weapons/aiming_system.cc (modified) (1 diff)

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

@@ -233 +233 @@
     this->initWeapon = true;
 
+    State::getCameraNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
+
+    this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
+    this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+    this->getWeaponManager().getFixedTarget()->setParentMode(PNODE_ROTATE_AND_MOVE);
+
+
+    this->aimingSystem->toList(OM_GROUP_01);
+    this->aimingSystem->setParent(&this->cameraNode);
+    this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
+
+
     AABB* box = this->getModelAABB();
     if( box != NULL)
@@ -240 +252 @@
       State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * f, 0);
 
-      State::getCameraNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
-      this->cameraNode.setParentMode(PNODE_ROTATE_AND_MOVE);
-      this->getWeaponManager().getParentNode()->setParentMode(PNODE_ROTATE_AND_MOVE);
-
-
       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_GROUP_01);
-      this->aimingSystem->setParent(&this->cameraNode);
-      this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
     }
   }

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

@@ -116 +116 @@
   {
     PRINTF(0)("real hit: %s\n", killer->getClassName());
-
     this->selectionList.push_back(killer);
   }
-  PRINTF(0)("no hit: %s\n", killer->getClassName());
 }