Changeset 1608 for code/trunk/src

Timestamp:

Jun 17, 2008, 3:33:03 PM (16 years ago)

Author:

landauf

Message:

• added a backlight to all SpaceShips, leaving a trail behind (configurable)
• changed some lines in SpaceShipAI, AI seems to be more fair now…
• fixed a bug in Math.cc algorithms to calculate radar positions and AI movement (division by zero and acos of 1.000001)
• added destroy() and destroydelay to ParticleSpawner, so the smoketrail of a destroyed enemy stays visible for some seconds
• added 2 lines to Orxonox.cc to make the length of the backlight-trail independend of the gamespeed

########################
# !!! MEDIA UPDATE !!! #
########################

Location:

code/trunk/src

Files:

• core/BaseObject.h (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (2 diffs)
• orxonox/objects/Backlight.cc (added)
• orxonox/objects/Backlight.h (added)
• orxonox/objects/ParticleSpawner.cc (modified) (3 diffs)
• orxonox/objects/ParticleSpawner.h (modified) (2 diffs)
• orxonox/objects/SpaceShip.cc (modified) (12 diffs)
• orxonox/objects/SpaceShip.h (modified) (3 diffs)
• orxonox/objects/SpaceShipAI.cc (modified) (6 diffs)
• orxonox/tools/Timer.h (modified) (1 diff)
• util/Math.cc (modified) (3 diffs)

code/trunk/src/core/BaseObject.h

@@ -66 +66 @@
 
             /** @brief Sets the state of the objects activity. @param bActive True = active */
-            inline void setActivity(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
+            inline void setActive(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
             /** @brief Returns the state of the objects activity. @return The state of the activity */
             inline bool isActive() const { return this->bActive_; }
@@ -73 +73 @@
 
             /** @brief Sets the state of the objects visibility. @param bVisible True = visible */
-            inline void setVisibility(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
+            inline void setVisible(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
             /** @brief Returns the state of the objects visibility. @return The state of the visibility */
             inline bool isVisible() const { return this->bVisible_; }

code/trunk/src/orxonox/CMakeLists.txt

@@ -20 +20 @@
 
   objects/Ambient.cc
+  objects/Backlight.cc
   objects/Camera.cc
   objects/CameraHandler.cc

code/trunk/src/orxonox/Orxonox.cc

@@ -72 +72 @@
 #include "console/InGameConsole.h"
 #include "objects/Tickable.h"
+#include "objects/Backlight.h"
 #include "tools/ParticleInterface.h"
 
@@ -169 +170 @@
     float change = factor / Orxonox::getSingleton()->getTimeFactor();
     Orxonox::getSingleton()->timefactor_ = factor;
-
     for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
         it->setSpeedFactor(it->getSpeedFactor() * change);
+
+    for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
+        it->setTimeFactor(Orxonox::getSingleton()->getTimeFactor());
   }
 

code/trunk/src/orxonox/objects/ParticleSpawner.cc

@@ -33 +33 @@
 #include "core/Executor.h"
 #include "tools/ParticleInterface.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox
@@ -44 +45 @@
     }
 
-    ParticleSpawner::ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay, const Vector3& direction)
+    ParticleSpawner::ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float startdelay, float destroydelay, const Vector3& direction)
     {
         RegisterObject(ParticleSpawner);
-        this->setParticle(templateName, detaillevel, lifetime, delay, direction);
+        this->setParticle(templateName, detaillevel, lifetime, startdelay, destroydelay, direction);
     }
 
-    void ParticleSpawner::setParticle(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float delay, const Vector3& direction)
+    void ParticleSpawner::setParticle(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime, float startdelay, float destroydelay, const Vector3& direction)
     {
         ExecutorMember<ParticleSpawner>* executor = createExecutor(createFunctor(&ParticleSpawner::createParticleSpawner));
+        this->destroydelay_ = destroydelay;
         executor->setDefaultValues(lifetime);
-        this->timer_.setTimer(delay, false, this, executor);
+        this->timer_.setTimer(startdelay, false, this, executor);
         this->particle_ = new ParticleInterface(templateName, detaillevel);
         this->particle_->addToSceneNode(this->getNode());
@@ -72 +74 @@
         }
     };
+
+    void ParticleSpawner::destroy()
+    {
+        this->setPosition(this->getNode()->getParent()->getPosition());
+        this->getNode()->getParent()->removeChild(this->getNode());
+        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->addChild(this->getNode());
+        if (this->particle_)
+            this->particle_->setEnabled(false);
+        if (!this->timer_.isActive() || this->timer_.getRemainingTime() > this->destroydelay_)
+            this->timer_.setTimer(this->destroydelay_, false, this, createExecutor(createFunctor(&ParticleSpawner::destroyParticleSpawner)));
+    }
 
     void ParticleSpawner::createParticleSpawner(float lifetime)

code/trunk/src/orxonox/objects/ParticleSpawner.h

@@ -41 +41 @@
         public:
             ParticleSpawner();
-            ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime = 0, float delay = 0, const Vector3& direction = Vector3::ZERO);
+            ParticleSpawner(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime = 0, float startdelay = 0, float destroydelay = 0, const Vector3& direction = Vector3::ZERO);
             virtual ~ParticleSpawner();
+            void destroy();
 
-            void setParticle(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime = 0, float delay = 0, const Vector3& direction = Vector3::ZERO);
+            void setParticle(const std::string& templateName, LODParticle::LOD detaillevel, float lifetime = 0, float startdelay = 0, float destroydelay = 0, const Vector3& direction = Vector3::ZERO);
             inline ParticleInterface* getParticleInterface() const
                 { return this->particle_; }
@@ -56 +57 @@
             Timer<ParticleSpawner> timer_;
             ParticleInterface* particle_;
+            float destroydelay_;
     };
 }

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -35 +35 @@
 #include <OgreSceneNode.h>
 
-#include "CameraHandler.h"
 #include "util/Convert.h"
 #include "util/Math.h"
+
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/Debug.h"
+#include "core/XMLPort.h"
+#include "core/ConsoleCommand.h"
+#include "core/input/InputManager.h"
+
+#include "network/Client.h"
+
+#include "hud/HUD.h"
+#include "tools/ParticleInterface.h"
+
 #include "GraphicsEngine.h"
-#include "core/input/InputManager.h"
-#include "tools/ParticleInterface.h"
 #include "RotatingProjectile.h"
 #include "ParticleProjectile.h"
-#include "core/XMLPort.h"
-#include "core/ConsoleCommand.h"
-#include "network/Client.h"
-#include "hud/HUD.h"
+#include "ParticleSpawner.h"
+#include "Backlight.h"
+#include "CameraHandler.h"
 
 namespace orxonox
@@ -101 +107 @@
         this->tt1_ = 0;
         this->tt2_ = 0;
+        this->smoke_ = 0;
+        this->fire_ = 0;
+
+        this->backlight_ = 0;
 
         this->redNode_ = 0;
@@ -143 +153 @@
                 delete this->tt2_;
 
-            if (setMouseEventCallback_)
+            if (this->smoke_)
+                this->smoke_->destroy();
+            if (this->fire_)
+                this->fire_->destroy();
+
+            if (this->backlight_)
+                delete this->backlight_;
+
+            if (this->setMouseEventCallback_)
                 InputManager::removeMouseHandler("SpaceShip");
 
@@ -184 +202 @@
     void SpaceShip::init()
     {
-        // START CREATING THRUSTER
+        // START CREATING THRUSTERS
         this->tt1_ = new ParticleInterface("Orxonox/thruster1", LODParticle::low);
         this->tt1_->createNewEmitter();
@@ -216 +234 @@
         node2c->attachObject(this->leftThrusterFlare_.getBillboardSet());
         node2c->attachObject(this->rightThrusterFlare_.getBillboardSet());
-        // END CREATING THRUSTER
+        // END CREATING THRUSTERS
 
         // START CREATING BLINKING LIGHTS
@@ -234 +252 @@
         // END CREATING BLINKING LIGHTS
 
-        this->smoke_.setParticle("Orxonox/smoke5", LODParticle::normal);
-        this->fire_.setParticle("Orxonox/fire3", LODParticle::normal);
+        // START CREATING ADDITIONAL EFFECTS
+        this->backlight_ = new Backlight(this->maxSpeed_, 0.8);
+        this->attachObject(this->backlight_);
+        this->backlight_->setPosition(-2.35, 0, 0.2);
+        this->backlight_->setColour(this->getProjectileColour());
+
+        this->smoke_ = new ParticleSpawner();
+        this->smoke_->setParticle("Orxonox/smoke5", LODParticle::normal, 0, 0, 3);
         this->attachObject(this->smoke_);
+
+        this->fire_ = new ParticleSpawner();
+        this->fire_->setParticle("Orxonox/fire3", LODParticle::normal, 0, 0, 1);
         this->attachObject(this->fire_);
+        // END CREATING ADDITIONAL EFFECTS
 
         if (this->isExactlyA(Class(SpaceShip)))
@@ -255 +283 @@
             this->chFarNode_->attachObject(this->crosshairFar_.getBillboardSet());
             this->chFarNode_->setScale(0.4, 0.4, 0.4);
+            // END of testing crosshair
         }
 
         createCamera();
-        // END of testing crosshair
     }
 
@@ -280 +308 @@
         this->rightThrusterFlare_.setVisible(this->isVisible());
         this->leftThrusterFlare_.setVisible(this->isVisible());
-        this->smoke_.setVisible(this->isVisible());
-        this->fire_.setVisible(this->isVisible());
+        this->smoke_->setVisible(this->isVisible());
+        this->fire_->setVisible(this->isVisible());
+        this->backlight_->setVisible(this->isVisible());
     }
 
@@ -336 +365 @@
         CameraHandler::getInstance()->requestFocus(cam_);
       }
-
     }
 
@@ -378 +406 @@
     }
 
-    int sgn(float x)
-    {
-        if (x >= 0)
-            return 1;
-        else
-            return -1;
-    }
-
     std::string SpaceShip::whereAmI() {
-        return getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().x)
-        + "  " + getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().y)
-        + "  " + getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().z);
+        return getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().x)
+        + "  " + getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().y)
+        + "  " + getConvertedValue<float, std::string>(SpaceShip::getLocalShip()->getPosition().z);
     }
 
@@ -403 +423 @@
             this->cam_->tick(dt);
 
-        this->smoke_.setVisible(this->isVisible() && this->health_ < 40);
-        this->fire_.setVisible(this->isVisible() && this->health_ < 20);
+        if (this->smoke_)
+            this->smoke_->setVisible(this->isVisible() && this->health_ < 40);
+        if (this->fire_)
+            this->fire_->setVisible(this->isVisible() && this->health_ < 20);
+
+        if (this->backlight_)
+        {   // (there's already fire ||                 we're to slow                 ||                  we're moving backwards                  )
+            if (this->health_ < 20   || this->getVelocity().squaredLength() < 150*150 || this->getVelocity().dotProduct(this->getInitialDir()) < 0)
+                this->backlight_->setActive(false);
+            else
+                this->backlight_->setActive(true);
+        }
 
         if (this->redNode_ && this->greenNode_)
@@ -521 +551 @@
         }
 
-        if( myShip_ )
-        {
-          COUT(5) << "steering our ship: " << objectID << std::endl;
-          this->acceleration_.x = 0;
-          this->acceleration_.y = 0;
-          this->momentum_ = 0;
-          this->mouseXRotation_ = Radian(0);
-          this->mouseYRotation_ = Radian(0);
-        }/*else
-          COUT(4) << "not steering ship: " << objectID << " our ship: " << network::Client::getSingleton()->getShipID() << std::endl;*/
-
-          this->bLMousePressed_ = false;
+        COUT(5) << "steering our ship: " << objectID << std::endl;
+        this->acceleration_.x = 0;
+        this->acceleration_.y = 0;
+        this->momentum_ = 0;
+        this->mouseXRotation_ = Radian(0);
+        this->mouseYRotation_ = Radian(0);
+        this->bLMousePressed_ = false;
     }
 

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -37 +37 @@
 #include "Model.h"
 #include "tools/BillboardSet.h"
-#include "ParticleSpawner.h"
 
 namespace orxonox
@@ -145 +144 @@
             BillboardSet rightThrusterFlare_;
 
+            Backlight* backlight_;
+
             BillboardSet redBillboard_;
             BillboardSet greenBillboard_;
@@ -151 +152 @@
             float blinkTime_;
 
-            ParticleSpawner smoke_;
-            ParticleSpawner fire_;
+            ParticleSpawner* smoke_;
+            ParticleSpawner* fire_;
 
             BillboardSet crosshairNear_;

code/trunk/src/orxonox/objects/SpaceShipAI.cc

@@ -102 +102 @@
             newenemy->XMLPort(xmlelement, XMLPort::LoadObject);
 
-            ParticleSpawner* spawneffect = new ParticleSpawner("Orxonox/fairytwirl", LODParticle::normal, 2.0, 0.0, newenemy->getOrth());
+            ParticleSpawner* spawneffect = new ParticleSpawner("Orxonox/fairytwirl", LODParticle::normal, 2.0, 0, 0, newenemy->getOrth());
             spawneffect->setPosition(newenemy->getPosition() - newenemy->getOrth() * 50);
             spawneffect->create();
@@ -131 +131 @@
         // search enemy
         random = rnd(maxrand);
-        if (random < 20 && (!this->target_))
+        if (random < 15 && (!this->target_))
             this->searchNewTarget();
 
@@ -146 +146 @@
         // fly somewhere
         random = rnd(maxrand);
-        if (random < 40 && (!this->bHasTargetPosition_ && !this->target_))
+        if (random < 50 && (!this->bHasTargetPosition_ && !this->target_))
             this->searchNewTargetPosition();
 
@@ -201 +201 @@
         Vector3 ringdirection = Vector3(rnd(), rnd(), rnd());
         ringdirection.normalise();
-        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", LODParticle::normal, 3.0, 0.5, ringdirection);
-        explosion->setPosition(this->getPosition());
-        explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
-        explosion->setScale(4);
-        explosion->create();
-        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", LODParticle::high, 3.0, 0.5, ringdirection);
+        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", LODParticle::normal, 3.0, 0.5, 0, ringdirection);
+        explosion->setPosition(this->getPosition());
+        explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
+        explosion->setScale(4);
+        explosion->create();
+        explosion = new ParticleSpawner("Orxonox/BigExplosion1part3", LODParticle::high, 3.0, 0.5, 0, ringdirection);
         explosion->setPosition(this->getPosition());
         explosion->getParticleInterface()->setKeepParticlesInLocalSpace(true);
@@ -235 +235 @@
     {
         Vector2 coord = get2DViewdirection(this->getPosition(), this->getDir(), this->getOrth(), this->targetPosition_);
-        this->setMoveYaw(0.8 * sgn(coord.x));
-        this->setMovePitch(0.8 * sgn(coord.y));
-
-        if ((this->targetPosition_ - this->getPosition()).length() > 500)
+
+        float distance = (this->targetPosition_ - this->getPosition()).length();
+        if (this->target_ || distance > 50)
+        {
+            // Multiply with 0.8 to make them a bit slower
+            this->setMoveYaw(0.8 * sgn(coord.x) * coord.x*coord.x);
+            this->setMovePitch(0.8 * sgn(coord.y) * coord.y*coord.y);
+        }
+
+        if (this->target_ && distance < 1000 && this->getVelocity().squaredLength() > this->target_->getVelocity().squaredLength())
+            this->setMoveLongitudinal(-0.5); // They don't brake with full power to give the player a chance
+        else if (!this->target_ && distance <= this->getVelocity().length() / (2 * this->getTransAcc()))
+            this->setMoveLongitudinal(-1.0);
+        else
             this->setMoveLongitudinal(0.8);
-
-        if (this->isCloseAtTarget(300) && this->target_)
-        {
-            if (this->getVelocity().length() > this->target_->getVelocity().length())
-                this->setMoveLongitudinal(-0.5);
-        }
     }
 
@@ -306 +310 @@
     void SpaceShipAI::shipDied(SpaceShipAI* ship)
     {
-        this->forgetTarget();
-        this->searchNewTargetPosition();
+        if (ship == this->target_)
+        {
+            this->forgetTarget();
+            this->searchNewTargetPosition();
+        }
     }
 }

code/trunk/src/orxonox/tools/Timer.h

@@ -95 +95 @@
             inline bool isActive() const
                 { return this->bActive_; }
+            /** @brief Returns the remaining time until the Timer calls the function. @return The remaining time */
+            inline float getRemainingTime() const
+                { return this->time_; }
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)

code/trunk/src/util/Math.cc

@@ -75 +75 @@
 {
     orxonox::Vector3 distance = otherposition - myposition;
-    return acos(mydirection.dotProduct(distance) / distance.length());
+    float distancelength = distance.length();
+    if (distancelength == 0)
+        return 0;
+    else
+        return acos(clamp<float>(mydirection.dotProduct(distance) / distancelength, -1, 1));
 }
 
@@ -84 +88 @@
     // project difference vector on our plane
     orxonox::Vector3 projection = Ogre::Plane(mydirection, myposition).projectVector(distance);
-    float angle = acos(myorthonormal.dotProduct(projection) / projection.length());
+
+    float projectionlength = projection.length();
+    if (projectionlength == 0) return orxonox::Vector2(0, 0);
+    float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
 
     if ((mydirection.crossProduct(myorthonormal)).dotProduct(distance) > 0)
@@ -98 +105 @@
     // project difference vector on our plane
     orxonox::Vector3 projection = Ogre::Plane(mydirection, myposition).projectVector(distance);
-    float angle = acos(myorthonormal.dotProduct(projection) / projection.length());
-    float radius = acos(mydirection.dotProduct(distance) / distance.length()) / Ogre::Math::PI;
+
+    float projectionlength = projection.length();
+    if (projectionlength == 0) return orxonox::Vector2(0, 0);
+    float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
+
+    float distancelength = distance.length();
+    if (distancelength == 0) return orxonox::Vector2(0, 0);
+    float radius = acos(clamp<float>(mydirection.dotProduct(distance) / distancelength, -1, 1)) / Ogre::Math::PI;
 
     if ((mydirection.crossProduct(myorthonormal)).dotProduct(distance) > 0)