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

Timestamp:

Apr 29, 2007, 6:51:28 PM (18 years ago)

Author:

bknecht

Message:

improvements by landauf on bsp, rotor and wireframe (does build, should work)

Location:

trunk/src/world_entities

Files:

• environments/rotor.cc (modified) (2 diffs)
• npcs/mover.cc (modified) (2 diffs)
• npcs/mover.h (modified) (2 diffs)

trunk/src/world_entities/environments/rotor.cc

@@ -56 +56 @@
 void Rotor::initRotation(float x, float y, float z)
 {
+     this->updateNode(0.001);
      this->mainDir = this->getAbsDir();
      this->rotation = Vector(x,y,z);
@@ -71 +72 @@
 
 
-     this->setAbsDir(/*this->mainDir**/Quaternion(rotation.x*this->totalTime, Vector(1,0,0)) *
+     this->setAbsDir(this->mainDir*Quaternion(rotation.x*this->totalTime, Vector(1,0,0)) *
                     Quaternion(rotation.y*this->totalTime, Vector(0,1,0)) *
                     Quaternion(rotation.z*this->totalTime, Vector(0,0,1)));

trunk/src/world_entities/npcs/mover.cc

@@ -82 +82 @@
         .describe("sets the action time of the door")
         .defaultValues(1.0);
+    LoadParam(root, "stay-open-time", this, Mover, setStayOpenTime)
+        .describe("sets the time, the door must stay open")
+        .defaultValues(0.0);
     LoadParam(root, "opening-sound", this, Mover, setOpeningSoundFile)
         .describe("Sets the file of the opening sound source");
@@ -146 +149 @@
                 this->soundSource_moving.stop();
         }
+        this->openTime = 0;
     }
     else if (this->state == Open)
     {
-        if (!this->checkPlayerInActionRadius())
-        {
-            this->state = Closing;
-            if (this->soundBuffer_closing.loaded())
-                this->soundSource_starting.play(this->soundBuffer_closing);
-            if (this->soundBuffer_moving.loaded())
-                this->soundSource_moving.play(this->soundBuffer_moving, 1.0, true);
+        this->openTime += dt;
+        if (this->openTime >= this->stayOpenTime)
+        {
+            if (!this->checkPlayerInActionRadius())
+            {
+                this->state = Closing;
+                if (this->soundBuffer_closing.loaded())
+                    this->soundSource_starting.play(this->soundBuffer_closing);
+                if (this->soundBuffer_moving.loaded())
+                    this->soundSource_moving.play(this->soundBuffer_moving, 1.0, true);
+            }
         }
     }

trunk/src/world_entities/npcs/mover.h

@@ -35 +35 @@
         void setActionRadius(float radius) { this->actionRadius = radius; }
         void setActionTime(float time) { this->actionTime = time; }
+        void setStayOpenTime(float time) { this->stayOpenTime = time; }
         void setOpeningSoundFile(const std::string& fileName);
         void setOpenedSoundFile(const std::string& fileName);
@@ -62 +63 @@
         float                       actionTime;                 //!< the action-time
         int                         state;                      //!< the state of the mover
+        float                       stayOpenTime;               //!< waiting time while opened
+        float                       openTime;                   //!< time since opened
 };