Changeset 10306 in orxonox.OLD for branches

Timestamp:

Jan 23, 2007, 9:32:51 PM (18 years ago)

Author:

muellmic

Message:

the percentage of the width of the screen, that the player can use for his movement can now correctly been handled by the spaceship, also within the script. the value is called 'actionWidthPercentage' btw. (yeah i know the name is horrible ). anyway it also changes the width of the hud-sidebars. its still a bit buggy tough, how it places the hud-elements with a too-small sidebar. i have to find a new solution for this.

Location:

branches/playability/src/world_entities/space_ships

Files:

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

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

@@ -371 +371 @@
   this->travelDistancePlus = Vector2D(0,0);
   this->isTravelDistanceInit = false;
-  this->actionWidthPercentage = 0.7;
+  this->actionWidthPercentage = 1;
 
   this->cameraSpeed = 40;
@@ -579 +579 @@
   {
     this->updateTravelDistance();
-    this->isTravelDistanceInit = true;
+    //this->isTravelDistanceInit = true;
   }
 
@@ -1142 +1142 @@
 void SpaceShip::updateTravelDistance()
 {
-  float x = 1.25*fabsf(State::getCamera()->getAbsCoor().y) * tan(State::getCamera()->getFovy()*M_PI /360.0);
-  float y = x / State::getCamera()->getAspectRatio();
+  float x = 1.25 * this->actionWidthPercentage * fabsf(State::getCamera()->getAbsCoor().y) * tan(State::getCamera()->getFovy()*M_PI /360.0);
+  float y = x / State::getCamera()->getAspectRatio() / this->actionWidthPercentage;
   //State::getCamera()->setAbsCoor(-5, 1000, 0);
 
 
   //State::getCamera()->getAbsCoor().print();
-  printf("CameraRelCoorY: %f \n", State::getCamera()->getRelCoor().y);
-
-  printf("x: %f, y: %f \n", x, y);
+  //printf("CameraRelCoorY: %f \n", State::getCamera()->getRelCoor().y);
+
+  //printf("x: %f, y: %f \n", x, y);
   this->travelDistancePlus = Vector2D(y, x);
   this->travelDistanceMinus = Vector2D(-y, -x);
 
-  //this->isTravelDistanceInit = true;
-}
+  State::getPlayer()->hud().setOverlayPercentage(100-int(100*this->actionWidthPercentage));
+  PRINTF(0)("TravelDistance has been updated\n");
+  this->isTravelDistanceInit = true;
+}
+
+void SpaceShip::setActionWidthPercentage(int i) 
+{
+  if (i>100) i=100;
+  if (i<0) i=0;
+  this->actionWidthPercentage = i/100.0;
+  //State::getPlayer()->hud().setOverlayPercentage(100-i);
+  //updateTravelDistance();
+  this->isTravelDistanceInit = false;
+};

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

@@ -81 +81 @@
     virtual void enterPlaymode(Playable::Playmode playmode);
     void setPlaymodeXML(const std::string& playmode); //recieves the playmode from a string (useful for script implementation)
-    inline void setActionWidthPercentage(float f) {this->actionWidthPercentage = f; updateTravelDistance();};
+    void setActionWidthPercentage(int i);
     void updateTravelDistance();
     virtual void movement (float dt);