Changeset 10719 in orxonox.OLD for branches/presentation/src/world_entities/space_ships

Timestamp:

Jun 18, 2007, 6:02:47 PM (18 years ago)

Author:

nicolasc

Message:

crosshair moves, shot do too, but not exactly where they should

Location:

branches/presentation/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (2 diffs)
• space_ship.h (modified) (1 diff)

branches/presentation/src/world_entities/space_ships/space_ship.cc

@@ -92 +92 @@
                         ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
                         ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
-                        //->addMethod("setCameraSpeed", Executor1<SpaceShip, lua_State*, float>(&SpaceShip::setCameraSpeed))
+                        //->addMethod("setCameraSpeed", Executor1<SpVector(1,0,0)aceShip, lua_State*, float>(&SpaceShip::setCameraSpeed))
                         ->addMethod("pause", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::pauseTrack))
                         ->addMethod("setCameraDist", Executor1<SpaceShip, lua_State*, float>(&SpaceShip::setCameraDistance))
@@ -592 +592 @@
     this->yMouse += event.yRel;
 //     printf("Mouse Coord: %f, %f\n", this->xMouse, this->yMouse);
-    this->weaponMan.getFixedTarget()->setRelCoor(10000, -10 * this->mouseSensitivity * yMouse, 10 * this->mouseSensitivity * xMouse);
-    this->secWeaponMan.getFixedTarget()->setRelCoor(10000, -10 * this->mouseSensitivity * yMouse, 10 * this->mouseSensitivity * xMouse);
+    this->weaponMan.getFixedTarget()->setRelCoor(100000, -100 * this->mouseSensitivity * yMouse, 100 * this->mouseSensitivity * xMouse);
+    this->secWeaponMan.getFixedTarget()->setRelCoor(100000, -100 * this->mouseSensitivity * yMouse, 100 * this->mouseSensitivity * xMouse);
   }
   else if (!(State::getCamera()->getEventHandling()))

branches/presentation/src/world_entities/space_ships/space_ship.h

@@ -75 +75 @@
     inline void loadWeapon(float regen) { this->weaponEnergyRegen = regen; };
 
-    void addWeaponToSlot(int wm, int config, int slot, const std::string& weaponName);
+//     void addWeaponToSlot(int wm, int config, int slot, const std::string& weaponName);
 
     inline PNode* getTravelNode() { return this->travelNode; };