Changeset 10512 in orxonox.OLD

Timestamp:

Jan 30, 2007, 8:01:19 PM (17 years ago)

Author:

bknecht

Message:

some changes so the vertical scroller will work better

Location:

trunk/src

Files:

• util/track/track.cc (modified) (3 diffs)
• world_entities/npcs/npc.cc (modified) (2 diffs)
• world_entities/npcs/npc.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

trunk/src/util/track/track.cc

@@ -233 +233 @@
 //         }
 //     }
-   if (this->trackNode)
-     {
+   if (this->trackNode && !this->pause)
+   {
        // tmp save
         float oldTime = this->localTime;
@@ -240 +240 @@
         if(this->mode == 0)
         {
-              if(this->localTime < this->duration)
+              // PRINTF(0)("localTime %f and duration %f", this->localTime, this->duration);
+              if(this->localTime + dt < this->duration)
                 this->localTime += dt;
         }
@@ -250 +251 @@
         }
 
-       Vector tmp = this->calcPos();
-
-
-       Vector dV = tmp - this->trackNode->getAbsCoor();
-       float dx = speed * dt;
-       float ratio = dx / dV.len();
-
-       if( dt > 0.0f)
+       if(oldTime != this->localTime)
        {
-          float newDt = dt * ratio;
-          if(this->pause)
-            newDt = 0;
-          this->localTime = oldTime += newDt;
+           Vector tmp = this->calcPos();
+    
+    
+           Vector dV = tmp - this->trackNode->getAbsCoor();
+           float dx = speed * dt;
+           float ratio = dx / dV.len();
+    
+           if( dt > 0.0f)
+           {
+              float newDt = dt * ratio;
+              this->localTime = oldTime + newDt;
+           }
+           tmp = this->calcPos();
+    
+           Vector v(0.0, 1.0, 0.0);
+           Quaternion quat = Quaternion(this->calcDir(), v);
+           Quaternion q(-PI/2, v);
+           quat = quat * q;
+    
+           // move trackNode of the track
+           this->trackNode->shiftCoor(tmp - this->trackNode->getAbsCoor());
+           // set direction and roll angle of trackNode
+           this->trackNode->setAbsDir(quat);
        }
-       tmp = this->calcPos();
-
-       Vector v(0.0, 1.0, 0.0);
-       Quaternion quat = Quaternion(this->calcDir(), v);
-       Quaternion q(-PI/2, v);
-       quat = quat * q;
-
-       // move trackNode of the track
-       this->trackNode->shiftCoor(tmp - this->trackNode->getAbsCoor());
-       // set direction and roll angle of trackNode
-       this->trackNode->setAbsDir(quat);
-     }
+    }
 }
 

trunk/src/world_entities/npcs/npc.cc

@@ -65 +65 @@
                         ->addMethod("fire", Executor0<NPC, lua_State*>(&NPC::fire))
                         ->addMethod("pause", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::pauseTrack))
+                        ->addMethod("setAI", Executor1<NPC, lua_State*, bool>(&NPC::setAI))
                         ->addMethod("setVisibility", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::setVisibility))
                        );
@@ -234 +235 @@
 //   LoadParamXML(root, "Weapons", this, NPC, addWeapons)
 //   .describe("creates and adds weapons");
+}
+
+void NPC::setAI(bool activate)
+{
+     if(activate) AIEngine::getInstance()->addAI(teamNumber,swarmNumber,(WorldEntity*)this,maxSpeed,attackDistance);
+     else AIEngine::getInstance()->removeAI(teamNumber,swarmNumber,(WorldEntity*)this);
 }
 

trunk/src/world_entities/npcs/npc.h

@@ -33 +33 @@
   inline int getTeam()  { return teamNumber; }
   inline void fire(){ this->bFire=true;}
-
+  void setAI(bool activate);
   inline void enableAI(int flag) { this->bAIEnabled = (bool)flag; }
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -60 +60 @@
 #include "player.h"
 #include "camera.h"
+#include "cameraman.h"
 
 
@@ -1148 +1149 @@
 void SpaceShip::updateTravelDistance()
 {
-  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;
+     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;
   //State::getCamera()->setAbsCoor(-5, 1000, 0);