Changeset 10291 in orxonox.OLD

Timestamp:

Jan 18, 2007, 12:08:19 AM (17 years ago)

Author:

muellmic

Message:

traveldistance calculated dynamically now, but calculations aren't correct yet.

Location:

branches/playability/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/camera.h (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (11 diffs)
• world_entities/space_ships/space_ship.h (modified) (2 diffs)

branches/playability/src/util/hud.cc

@@ -407 +407 @@
   std::list<OrxGui::GLGuiEnergyWidgetVertical*>::iterator weaponWidget;
   Vector2D pos = Vector2D(overlayWidth + this->rightRect->getAbsCoor2D().x, 0.5*this->resY);
-  PRINTF(0)("Cur Pos: %f,%f\n",pos.x,pos.y);
+  //PRINTF(0)("Cur Pos: %f,%f\n",pos.x,pos.y);
   // out of reasons i can't get behind, this version is segfaulting when calling getSizeX2D or getSizeY2D. the other
   // element2D- related function works tough.. :s

branches/playability/src/world_entities/camera.cc

@@ -170 +170 @@
       this->fovy= viewTopFovy;
       this->toFovy = viewTopFovy;
-      this->setRelCoorSoft(Vector(-0.05, this->viewTopDistance , 0), 0.5);
+      this->setRelCoor(Vector(-0.05, this->viewTopDistance , 0));
       this->target->setRelCoor(0,0,0);
     }

branches/playability/src/world_entities/camera.h

@@ -44 +44 @@
 
   void setAspectRatio(float aspectRatio);
+  inline float getAspectRatio() {return this->aspectRatio;};
+
   void setClipRegion(float nearClip, float farClip);
 
@@ -52 +54 @@
     this->toFovy = fovy;
   };
+
+  inline float getFovy() {return this->fovy;};
   /** @param fovy new field of view factor (in degrees) to iterate to */
   void setToFovy(float toFovy) { this->toFovy = toFovy; };

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

@@ -65 +65 @@
 
 #include "track/track.h"
+#include "math.h"
 
 
@@ -349 +350 @@
 
   //this->airFriction = 0.5f;
-  this->travelDistancePlus = Vector2D(38.0, 43.0);
-  this->travelDistanceMinus = Vector2D(-38.0, -43.0);
+  //this->travelDistancePlus = Vector2D(38.0, 43.0);
+  //this->travelDistanceMinus = Vector2D(-38.0, -43.0);
+  this->travelDistancePlus = Vector2D(0,0);
+  this->travelDistancePlus = Vector2D(0,0);
+  this->isTravelDistanceInit = false;
+  this->actionWidthPercentage = 0.7;
+
   this->cameraSpeed = 40;
   this->cameraLook = 0.0f;
@@ -397 +403 @@
   LoadParam(root, "cameraDistance", this, SpaceShip, setCameraDistance);
   LoadParam(root, "cameraFovy", this, SpaceShip, setCameraFovy);
+  LoadParam(root, "actionWidthPercentage", this, SpaceShip, setActionWidthPercentage);
 
   State::getCamera()->setViewMode(Camera::ViewTop);
@@ -553 +560 @@
   this->trailR->tick(time);
 
+  if (!this->isTravelDistanceInit)
+  {
+    this->updateTravelDistance();
+    this->isTravelDistanceInit = true;
+  }
+
   //orient the spaceship in direction of the mouse
   /*
@@ -578 +591 @@
     this->bLeft = event.bPressed;
   else if( event.type == KeyMapper::PEV_RIGHT)
+  {
     this->bRight = event.bPressed;
+    printf("ShipCoorX: %f \n", this->getRelCoor().x);
+  }
   else if( event.type == KeyMapper::PEV_FORWARD)
+  {
     this->bForward = event.bPressed; //this->shiftCoor(0,.1,0);
+    
+  }
   else if( event.type == KeyMapper::PEV_BACKWARD)
     this->bBackward = event.bPressed; //this->shiftCoor(0,-.1,0);
@@ -823 +842 @@
         this->travelNode->setAbsCoor(this->getAbsCoor());
         this->travelNode->updateNode(0.01f);
+        this->isTravelDistanceInit = false;
 
         this->setParent(this->travelNode);
@@ -844 +864 @@
         State::getCamera()->setParentMode(PNODE_MOVEMENT);
 
+        //this->updateTravelDistance();
+
         this->debugNode(1);
         this->travelNode->debugNode(1);
@@ -865 +887 @@
   float airCoeff = 2.5;
   float pi = 3.14;
- 
 
   switch(this->getPlaymode())
@@ -915 +936 @@
       if( this->bForward )
       {
+        //printf("ShipCoorX: %f \n", this->getRelCoor().x);
         if(this->getRelCoor().x < this->travelDistancePlus.x)
         {
@@ -973 +995 @@
       if( this->bRight)
       {
+        //printf("ShipCoorZ: %f \n", this->getRelCoor().z);
         if(this->getRelCoor().z < this->travelDistancePlus.y)
         {
@@ -1096 +1119 @@
   State::getCamera()->setViewTopFovy(fovy);
 }
+
+void SpaceShip::updateTravelDistance()
+{
+  float x = fabsf(State::getCamera()->getAbsCoor().y) * tan(State::getCamera()->getFovy()*M_PI /360.0);
+  float y = x / State::getCamera()->getAspectRatio();
+  //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);
+  this->travelDistancePlus = Vector2D(x, y);
+  this->travelDistanceMinus = Vector2D(-x, -y);
+
+  //this->isTravelDistanceInit = true;
+}

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

@@ -78 +78 @@
     virtual void damage(float pDamage, float eDamage);  //!< pDamage physical damage, eDamage electronic damage
 
-    //included by Michel: ((
+    //included by Michel: 
     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 updateTravelDistance();
     virtual void movement (float dt);
 
-    //))
+    //
 
     void nextWeaponConfig();
@@ -175 +177 @@
     Vector2D              travelDistancePlus;     //!< Travel-Distance away from the TravelNode
     Vector2D              travelDistanceMinus;
+    bool                  isTravelDistanceInit;
+
+    float                 actionWidthPercentage;
 
 // Camera