Changeset 9158 in orxonox.OLD

Timestamp:

Jul 4, 2006, 5:34:16 PM (18 years ago)

Author:

patrick

Message:

fps player better

Location:

branches/presentation/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• creatures/fps_player.cc (modified) (3 diffs)

branches/presentation/src/world_entities/WorldEntities.am

@@ -29 +29 @@
                 world_entities/weapons/hyperblaster.cc \
                 world_entities/weapons/aim.cc \
+                world_entities/weapons/aiming_system.cc \
                 world_entities/weapons/fps_sniper_rifle.cc \
                 \
@@ -95 +96 @@
                 weapons/targeting_turret.h \
                 weapons/aim.h \
+                weapons/aiming_system.h \
                 weapons/fps_sniper_rifle.h \
                 \

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

@@ -230 +230 @@
       State::getCameraTargetNode()->setRelCoor(10, box->halfLength[1] * f, 0);
 
+      State::getCameraNode()->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));
@@ -253 +256 @@
     attitude-= yMouse;
 
-    if ( attitude > 2.05 )
-      attitude = 2.05;
-
-    else if ( attitude < -1.15 )
-      attitude = -1.15;
+    PRINTF(0)("attitude: %f\n", attitude);
+
+    if ( attitude > 0.32 )
+      attitude = 0.32;
+
+    else if ( attitude < -2.1 )
+      attitude = -2.1;
 
     xMouse = yMouse = 0;
@@ -405 +410 @@
 }
 
+
 void FPSPlayer::respawn( )
 {