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

Timestamp:

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

Author:

nicolasc

Message:

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

Location:

branches/presentation/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (2 diffs)
• space_ships/space_ship.h (modified) (1 diff)
• weapons/disruptor.cc (modified) (1 diff)
• weapons/nadion_laser.cc (modified) (1 diff)
• weapons/rf_cannon.cc (modified) (1 diff)
• weapons/weapon_manager.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; };

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

@@ -153 +153 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
+  Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
+
+//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
+  pj->setVelocity(this->getAbsDir().apply(tmp.getNormalized())*130 + VECTOR_RAND(1));
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-  pj->setAbsDir(this->getAbsDir());
+//   pj->setAbsDir(this->getAbsDir());
   pj->activate();
 

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

@@ -142 +142 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*160);
+  Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
+
+  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(tmp.getNormalized())*160);
 
   pj->setAbsCoor(this->getEmissionPoint());
-  pj->setAbsDir(this->getAbsDir());
+//   pj->setAbsDir(this->getAbsDir());
   pj->activate();
 

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

@@ -135 +135 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*190);
+//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*190);
+  Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
+
+  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(tmp.getNormalized())*190);
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-  pj->setAbsDir(this->getAbsDir());
-//   pj->setAbsDir(Quaternion(0, dynamic_cast<WeaponManager*>(this->getParent())->getFixedTarget()->getAbsCoor() - this->getParent()->getAbsCoor()));
-//   pj->setAbsDir(dynamic_cast<WeaponManager*>(this->getParent())->getFixedTarget()->getAbsDir());
+//   pj->setAbsDir(this->getAbsDir());
+
   pj->activate();
 

branches/presentation/src/world_entities/weapons/weapon_manager.h

@@ -86 +86 @@
 
     inline void addWeaponToSlot(int config, int slot, const std::string& weaponName){
-      this->addWeapon( Weapon::createWeapon( weaponName ), config, slot); };
+      this->addWeapon( Weapon::createWeapon( weaponName ), config, slot); this->configs[config][slot]->setDefaultTarget(this->getFixedTarget()); };