Changeset 10512 in orxonox.OLD for trunk/src/world_entities

Timestamp:

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

Author:

bknecht

Message:

some changes so the vertical scroller will work better

Location:

trunk/src/world_entities

Files:

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

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);