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

Timestamp:

Jan 31, 2007, 1:27:36 AM (18 years ago)

Author:

bknecht

Message:

explosions and such

Location:

trunk/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (4 diffs)
• space_ship.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -93 +93 @@
                         //->addMethod("setCameraSpeed", Executor1<SpaceShip, lua_State*, float>(&SpaceShip::setCameraSpeed))
                         ->addMethod("pause", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::pauseTrack))
+                        ->addMethod("setCameraDist", Executor1<SpaceShip, lua_State*, float>(&SpaceShip::setCameraDistance))
                        );
 
@@ -616 +617 @@
   {
     this->bRight = event.bPressed;
+    printf("ShipCoors: %f , %f, %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
   }
   else if( event.type == KeyMapper::PEV_FORWARD)
   {
     this->bForward = event.bPressed; //this->shiftCoor(0,.1,0);
+
   }
   else if( event.type == KeyMapper::PEV_BACKWARD)
@@ -1141 +1144 @@
 void SpaceShip::setCameraDistance(float dist)
 {
-  State::getCamera()->setViewTopDistance(dist);
+     
+  CameraMan* cm = State::getCameraman();
+  Camera* c = cm->getCurrentCam();
+  c->setViewTopDistance(dist);
+  
+  if (this->hasPlayer())
+    this->isTravelDistanceInit = false;
 }
 
 void SpaceShip::setCameraFovy(float fovy)
 {
-  State::getCamera()->setViewTopFovy(fovy);
+     
+  CameraMan* cm = State::getCameraman();
+  Camera* c = cm->getCurrentCam();
+  c->setViewTopFovy(fovy);
+  
+  if (this->hasPlayer())
+    this->isTravelDistanceInit = false;
 }
 
@@ -1153 +1168 @@
      CameraMan* cm = State::getCameraman();
      Camera* c = cm->getCurrentCam();
-
-
+     
+     
   float x = 1.25 * this->actionWidthPercentage * fabsf(c->getAbsCoor().y) * tan(c->getFovy()*M_PI /360.0);
   float y = x / c->getAspectRatio() / this->actionWidthPercentage;

trunk/src/world_entities/space_ships/space_ship.h

@@ -92 +92 @@
 
     virtual void hit(float damage, WorldEntity* killer);
+    
+    void                  setCameraDistance(float dist);
 
   private:
@@ -188 +190 @@
     float                 cameraSpeed;
 
-    void                  setCameraDistance(float dist);
+
     void                  setCameraFovy(float fovy);