Changeset 9189 in orxonox.OLD

Timestamp:

Jul 5, 2006, 7:36:59 AM (18 years ago)

Author:

patrick

Message:

aiming system regrouping and reparenting

Location:

branches/presentation/src/world_entities

Files:

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

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

@@ -245 +245 @@
       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_LIST(this->getOMListNumber() + 1) /*OM_GROUP_01*/);
+      this->aimingSystem->setParent(this->cameraNode);
+      this->aimingSystem->setParentMode(PNODE_ROTATE_AND_MOVE);
     }
   }

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

@@ -65 +65 @@
   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
-  this->range = 30.0f;
+  this->range = 1000.0f;
   this->sideLength = 2.0f;