Changeset 7018 for code/branches

Timestamp:

May 30, 2010, 3:19:49 PM (14 years ago)

Author:

scheusso

Message:

merged rocket2 branch back into presentation3 branch

Location:

code/branches/presentation3

Files:

• data/levels/tutorial.oxw (modified) (1 diff)
• data/particle/simplerocketfire.particle (copied) (copied from code/branches/rocket2/data/particle/simplerocketfire.particle)
• src/modules/weapons/RocketController.cc (modified) (6 diffs)
• src/modules/weapons/RocketController.h (modified) (3 diffs)
• src/modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.cc (modified) (6 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (modified) (7 diffs)
• src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) (2 diffs)
• src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) (1 diff)
• src/orxonox/controllers/AIController.cc (modified) (1 prop)

code/branches/presentation3/data/levels/tutorial.oxw

@@ -14 +14 @@
   >
 
-    <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
-      <attached>
-        <Model scale="1" mesh="drone.mesh"/>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
-      </collisionShapes>
-    </Drone>
+  
+  
+  
+<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
+  <attached>
+    <Model scale="1" mesh="drone.mesh"/>
+  </attached>
+  <collisionShapes>
+    <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
+  </collisionShapes>
+</Drone>
 
     <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">

code/branches/presentation3/src/modules/weapons/RocketController.cc

@@ -1 +1 @@
 /*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *     Gabriel Nadler, Originalfile: Oli Scheuss
- *   Co-authors:
- *      ...
- *
- */
+*   ORXONOX - the hottest 3D action shooter ever to exist
+*                    > www.orxonox.net <
+*
+*
+*   License notice:
+*
+*   This program is free software; you can redistribute it and/or
+*   modify it under the terms of the GNU General Public License
+*   as published by the Free Software Foundation; either version 2
+*   of the License, or (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software
+*   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*
+*   Author:
+*     Gabriel Nadler, Originalfile: Oli Scheuss
+*   Co-authors:
+*      ...
+*
+*/
 
 #include "RocketController.h"
@@ -39 +39 @@
     /**
     @brief
-        Constructor.
+    Constructor.
     */
     RocketController::RocketController(BaseObject* creator) : Controller(creator)
@@ -46 +46 @@
         COUT(5)<< "RocketController constructed\n";
 
-        
-        this->rocket = new SimpleRocket(this);
-        this->rocket->setController(this);
-        this->setControllableEntity(dynamic_cast<ControllableEntity*> (rocket));
-        this->haha=0;
+
+        this->rocket_ = new SimpleRocket(this);
+        this->rocket_->setController(this);
+        this->setControllableEntity(dynamic_cast<ControllableEntity*> (this->rocket_));
+        this->counter_=0;
     }
 
@@ -56 +56 @@
     /**
     @brief
-        The controlling happens here. This method defines what the controller has to do each tick.
+    The controlling happens here. This method defines what the controller has to do each tick.
     @param dt
-        The duration of the tick.
+    The duration of the tick.
     */
     void RocketController::tick(float dt)
     {
-        haha++;
+        counter_++;
 
-        //if (haha<30)this->rocket->setVelocity(rocket->getVelocity()*1.03);
-        if (this->target_) {
+        if (this->target_ && this->rocket_->hasFuel()) {
             this->setTargetPosition();
             this->moveToTargetPosition();
         }
-        if (haha>500) rocket->setDestroy();;
-
+        
+        
     }
 
@@ -81 +80 @@
     void RocketController::setTargetPosition()
     {
-        //this->targetPosition_=this->target_->getWorldPosition();
-        this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
+        this->targetPosition_=this->target_->getWorldPosition(); //don't really note a difference in the rocket behaviour xD
+        //this->targetPosition_ = getPredictedPosition(this->getControllableEntity()->getWorldPosition(),this->getControllableEntity()->getVelocity().length() , this->target_->getWorldPosition(), this->target_->getVelocity());
     }
     void RocketController::moveToTargetPosition()
@@ -100 +99 @@
         if (!this->getControllableEntity())
             return;
-        //float dx = target.x-this->getControllableEntity()->getPosition().x;
-        //float dy = target.y-this->getControllableEntity()->getPosition().y;
-        COUT(4)<<"\n diff: ";
-        COUT(4)<<target-this->getControllableEntity()->getPosition() << endl;
-        //COUT(0)<<"\n 2D view: ";
-        /* COUT(0)<<this->getControllableEntity()->getPosition().x;
-        COUT(0)<<" ";
-        COUT(0)<<this->getControllableEntity()->getPosition().y;
-        COUT(0)<<" ";
-        COUT(0)<<this->getControllableEntity()->getPosition().z;
-        COUT(0)<<"\n";*/
         Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
-        //float distance = (target - this->getControllableEntity()->getPosition()).length();
-        //Vector3D diff =target-this->rocket->getPosition();
-        COUT(4) << "viewdirection: "<< coord << endl;
-        //COUT(0)<<"  ";
-        //COUT(0)<<coord.y;
-        this->getControllableEntity()->rotateYaw(-0.8f*sgn(coord.x)*coord.x*coord.x);
-        this->getControllableEntity()->rotatePitch(0.8f*sgn(coord.y)*coord.y*coord.y);
-//         this->getControllableEntity()->rotateYaw(10);
-//         this->getControllableEntity()->rotatePitch(0);
-        //this->getControllableEntity()->rotatePitch(rotation.getPitch().valueRadians());
-        //this->getControllableEntity()->rotateYaw(rotation.getYaw().valueRadians());
-        //this->getControllableEntity()->moveUpDown(coord.y);
-        //this->getControllableEntity()->moveRightLeft(coord.x);
-        //this->getControllableEntity()->rotatePitch(coord);
-   //     if (this->target_ || distance > 10)
-   //     {
-   //         // Multiply with 0.8 to make them a bit slower
-            //this->getControllableEntity()->rotateYaw(coord.x );
-   //         this->getControllableEntity()->rotatePitch(coord.y);
-   //     }
+        float distance = (target - this->getControllableEntity()->getWorldPosition()).length();
+
+
+        if (distance > 1000&&this->getControllableEntity()->getVelocity().squaredLength()<160000) 
+            this->getControllableEntity()->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
+        if (distance <1000) this->rocket_->setAcceleration(0,0,0);
+        
+        this->getControllableEntity()->rotateYaw(-sgn(coord.x)*coord.x*coord.x);
+        this->getControllableEntity()->rotatePitch(sgn(coord.y)*coord.y*coord.y);
     }
 

code/branches/presentation3/src/modules/weapons/RocketController.h

@@ -41 +41 @@
     /**
     @brief
-        Controller for the Drone of the PPS tutorial.
+        Controller for the Rocket (targetseeking)
     @author
         Gabriel Nadler, Originalfile: Oli Scheuss
@@ -52 +52 @@
             
             virtual void tick(float dt);
-                        SimpleRocket* getRocket(){return this->rocket;};
+                        SimpleRocket* getRocket(){return this->rocket_;};
                         void setTarget(WorldEntity* target);
         protected:
@@ -60 +60 @@
 
         private:
-                        SimpleRocket* rocket;
+                        SimpleRocket* rocket_;
                         Vector3 targetPosition_;
                         WeakPtr<PlayerInfo> player_;
-                                                int haha;
+                                                
                         WeakPtr<WorldEntity> target_;
+            int counter_;
 
 

code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc

@@ -87 +87 @@
             this->defSndWpnEngine_->setLooping(true);
             this->defSndWpnEngine_->setSource("sounds/Rocket_engine.ogg");
+            this->defSndWpnEngine_->setVolume(100);
             this->attach(defSndWpnEngine_);
 
@@ -92 +93 @@
             this->defSndWpnLaunch_->setLooping(false);
             this->defSndWpnLaunch_->setSource("sounds/Rocket_launch.ogg");
+            this->defSndWpnLaunch_->setVolume(100);
             this->attach(defSndWpnLaunch_);
         }

code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -58 +58 @@
         this->localAngularVelocity_ = 0;
         this->bDestroy_ = false;
-        this->lifetime_ = 100;
+        this->lifetime_ = 120;
+        this->setMass(15);
         COUT(4) << "simplerocket constructed\n";
-
+        this->maxLife_=90;
 
         if (GameMode::isMaster())
        {
-           this->setCollisionType(WorldEntity::Kinematic);
-            this->setVelocity(0,0,100);
+            this->setCollisionType(WorldEntity::Kinematic);
+            this->fuel_=true;
 
             Model* model = new Model(this);
@@ -72 +73 @@
             this->attach(model);
 
-            ParticleEmitter* fire = new ParticleEmitter(this);
-            this->attach(fire);
-            fire->setOrientation(this->getOrientation());
-            fire->setSource("Orxonox/rocketfire2");
-
+            this->fire_ = new ParticleEmitter(this);
+            this->attach(this->fire_);
+           
+            this->fire_->setOrientation(this->getOrientation());
+            this->fire_->setSource("Orxonox/simplerocketfire");
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -83 +84 @@
             // TODO: fix the orientation and size of this collision shape to match the rocket
             ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
-            collisionShape->setRadius(3);
+            collisionShape->setOrientation(this->getOrientation());
+            collisionShape->setRadius(1.5f);
             collisionShape->setHeight(5);
             this->attachCollisionShape(collisionShape);
-
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
         }
 
     }
-    
+   
+
+
+
     void SimpleRocket::tick(float dt)
     {
+
         SUPER(SimpleRocket, tick, dt);
+        if (this->getVelocity().squaredLength() >130000) this->maxLife_-=dt; //if Velocity bigger than about 360, uses a lot more "fuel" :)
+        
 
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
@@ -100 +107 @@
             this->localAngularVelocity_ = 0;
 
+            
+            if (this->fuel_) {
+                if (this->destroyTimer_.getRemainingTime()<  this->lifetime_-this->maxLife_ ) 
+                    this->fuel_=false;
+            } else this->disableFire();
+
             if( this->bDestroy_ )
                 this->destroy();
-        
+                
+    }
+
+    void SimpleRocket::disableFire(){
+        this->setAcceleration(0,0,0);        
+        this->fire_->detachFromParent();
+
     }
 
@@ -134 +153 @@
         this->player_ = this->owner_->getPlayer();
     }
+
 
 
@@ -185 +205 @@
     }
     
-    void SimpleRocket::setDestroy()
-    {
-        this->bDestroy_=true;
-        CCOUT(4)<<"trying to destroy";
-    }
 
     void SimpleRocket::fired(unsigned int firemode)

code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h

@@ -34 +34 @@
 #include "tools/Timer.h"
 #include "worldentities/ControllableEntity.h"
+#include "graphics/ParticleSpawner.h"
 
 namespace orxonox
@@ -56 +57 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             void destroyObject();
+
+            void disableFire();
 
             virtual void moveFrontBack(const Vector2& value){}
@@ -96 +99 @@
             */
             inline void rotatePitch(float value)
-            {   COUT(0)<<"rotated rocket yaw";
+            {   
                                 this->rotatePitch(Vector2(value, 0)); }
             /**
@@ -104 +107 @@
             inline void rotateRoll(float value)
             { 
-                                COUT(0)<<"rotated rocket roll";
                                 this->rotateRoll(Vector2(value, 0)); }
 
@@ -110 +112 @@
             inline Pawn* getOwner() const
                 { return this->owner_; }
+            inline bool hasFuel()
+            { return this->fuel_;}
+
+            inline void fuelRefill()
+            {this->fuel_=true;}
 
             inline void setDamage(float damage)
@@ -123 +130 @@
             float damage_;
             bool bDestroy_;
+            bool fuel_;
 
 
@@ -128 +136 @@
             Timer destroyTimer_;
             float lifetime_;
+            float maxLife_;
+
+            ParticleEmitter* fire_;
+
+
+
 
     };

code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -46 +46 @@
         RegisterObject(SimpleRocketFire);
 
-        this->reloadTime_ = 0.20f;
+        this->reloadTime_ = 4;
         this->bParallelReload_ = false;
         this->damage_ = 100;
-        this->speed_ = 100;
+        this->speed_ = 300;
 
         this->setMunitionName("LaserMunition");
@@ -64 +64 @@
         SimpleRocket* rocket = con->getRocket();
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
-//      rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setOrientation(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getWorldOrientation());
-        Vector3 pos = this->getMuzzlePosition();
-        rocket->setPosition(pos);
-//      rocket->setAcceleration(20*rocket->getOrientation() * WorldEntity::FRONT);
+        rocket->setPosition(this->getMuzzlePosition());
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
         rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         rocket->setDamage(this->damage_);
         WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
-        if (pawnn)
-        {
-            con->setTarget(pawnn);
-        }
+        if (pawnn) con->setTarget(pawnn);
     }
 }

code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h

@@ -40 +40 @@
             SimpleRocketFire(BaseObject* creator);
             virtual ~SimpleRocketFire();
-
+            void deactivateFire();
             virtual void fire();
 
         private:
             float speed_;
+
     };
 }