Changeset 10618 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Apr 4, 2007, 12:13:53 PM (18 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/world_entities/space_ships/human_scout.cc (deleted)
• src/world_entities/space_ships/human_scout.h (deleted)
• src/world_entities/space_ships/space_ship.cc (modified) (8 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/world_entities/space_ships/space_ship.cc

@@ -27 +27 @@
 #include "weapons/heavy_blaster.h"
 #include "weapons/swarm_launcher.h"
-#include "weapons/spike_launcher.h"
 #include "weapons/spike_thrower.h"
 #include "weapons/acid_launcher.h"
@@ -50 +49 @@
 #include "shared_network_data.h"
 
-#include "power_ups/weapon_power_up.h"
-#include "power_ups/param_power_up.h"
+#include "items/power_ups/weapon_power_up.h"
+#include "items/power_ups/param_power_up.h"
 
 #include "graphics_engine.h"
@@ -59 +58 @@
 #include "state.h"
 #include "player.h"
-#include "camera.h"
-#include "cameraman.h"
+#include "tools/camera.h"
+#include "tools/cameraman.h"
 
 
@@ -67 +66 @@
 
 #include "track/track.h"
-#include "math.h"
 
 
@@ -616 +614 @@
   {
     this->bRight = event.bPressed;
-    printf("ShipCoors: %f , %f, %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
+//     printf("ShipCoors: %f , %f, %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
   }
   else if( event.type == KeyMapper::PEV_FORWARD)
@@ -1143 +1141 @@
 void SpaceShip::setCameraDistance(float dist)
 {
-
-  CameraMan* cm = State::getCameraman();
-  Camera* c = cm->getCurrentCam();
+  Camera* c = State::getCamera();
   c->setViewTopDistance(dist);
 
@@ -1155 +1151 @@
 {
 
-  CameraMan* cm = State::getCameraman();
-  Camera* c = cm->getCurrentCam();
+  Camera* c = State::getCamera();
   c->setViewTopFovy(fovy);
 
@@ -1165 +1160 @@
 void SpaceShip::updateTravelDistance()
 {
-     CameraMan* cm = State::getCameraman();
-     Camera* c = cm->getCurrentCam();
-
+
+  Camera* c = State::getCamera();
 
   float x = 1.25 * this->actionWidthPercentage * fabsf(c->getAbsCoor().y) * tan(c->getFovy()*M_PI /360.0);

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs