Changeset 10498 in orxonox.OLD for trunk/src

Timestamp:

Jan 30, 2007, 11:10:09 AM (18 years ago)

Author:

bknecht

Message:

use pauseCamera in scripts to pause the track of the camera. this works also with pause on NPCs and spaceships with tracks

Location:

trunk/src

Files:

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

trunk/src/util/track/track.cc

@@ -142 +142 @@
      this->mode = newMode;
 }
+
+/**
+ * Sets the bool if the track runs (false) or not (true)
+ */
+void Track::pauseTrack(bool stop)
+{
+     this->pause = stop;
+}
+
 
 /**
@@ -250 +259 @@
        {
           float newDt = dt * ratio;
+          if(this->pause)
+            newDt = 0;
           this->localTime = oldTime += newDt;
        }

trunk/src/util/track/track.h

@@ -27 +27 @@
    void setSpeed(float speed);
    void setMode(int newMode);
+   void pauseTrack(bool stop);
 
    //void finalize();
@@ -55 +56 @@
    PNode*               trackNode;              //!< The node that is slave to the Track. This node will be moved while update the Track, and must NOT move itself.
    int                  mode;                   //!< Defines the behaviour of the Track.
+   bool                 pause;                  //!< Defines if the track runs (false) or not (true)
 };
 

trunk/src/world_entities/cameraman.cc

@@ -48 +48 @@
                         ->addMethod("setRelCoor", Executor4<CameraMan, lua_State*,const std::string&,float,float,float>(&CameraMan::setRelCameraCoor))
                         ->addMethod("setRelCoorSoft", Executor5<CameraMan, lua_State*,const std::string&,float,float,float,float>(&CameraMan::setRelCameraCoorSoft))
+                        ->addMethod("pauseCamera", Executor2<CameraMan, lua_State*, const std::string&, bool>(&CameraMan::pauseCamera))
                        );
 
@@ -134 +135 @@
      dynamic_cast<Camera*>(newCam)->setRelCoorSoft(x,y,z,bias);
      dynamic_cast<Camera*>(newCam)->target->setRelCoorSoft(0,0,0,bias);
+}
+
+void CameraMan::pauseCamera(const std::string& camName, bool stop)
+{
+     BaseObject* newCam = ObjectListBase::getBaseObject("Camera", camName);
+     dynamic_cast<Camera*>(newCam)->pauseTrack(stop);
 }
 

trunk/src/world_entities/cameraman.h

@@ -58 +58 @@
     void setRelCameraCoorSoft(const std::string& cameraName, float x, float y, float z, float bias);
     //void setViewMode(const std::string& camName, const std::string& viewMode);
+    void pauseCamera(const std::string& camName, bool stop);
     
     void changeSpeed(float speed);

trunk/src/world_entities/npcs/npc.cc

@@ -52 +52 @@
                         ->addMethod("setAbsDir", Executor4<PNode, lua_State*,float,float,float,float>(&PNode::setAbsDir))
                         ->addMethod("fire", Executor0<NPC, lua_State*>(&NPC::fire))
-
+                        ->addMethod("pause", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::pauseTrack))
                        );
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -91 +91 @@
                         ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
                         //->addMethod("setCameraSpeed", Executor1<SpaceShip, lua_State*, float>(&SpaceShip::setCameraSpeed))
+                        ->addMethod("pause", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::pauseTrack))
                        );
 

trunk/src/world_entities/world_entity.cc

@@ -198 +198 @@
 }
 
+void WorldEntity::pauseTrack(bool stop)
+{
+     if(this->entityTrack)
+       this->entityTrack->pauseTrack(stop);
+}
+
 
 /**

trunk/src/world_entities/world_entity.h

@@ -176 +176 @@
   ;  ///FIXME
   void debugEntity() const;
+  
+  void pauseTrack(bool stop);
 
 
@@ -192 +194 @@
   void updateHealthWidget();
   void addTrack(const TiXmlElement* root);
+