Changeset 10369 for code/branches

Timestamp:

Apr 16, 2015, 4:43:55 PM (10 years ago)

Author:

meggiman

Message:

Alle Klassen implementiert um die Waffe abzufeuern. Noch sehr fehlerhaft.

Location:

code/branches/weaponFS15

Files:

• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• src/modules/weapons/WeaponsPrereqs.h (modified) (2 diffs)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/GravityBombMunition.cc (added)
• src/modules/weapons/munitions/GravityBombMunition.h (added)
• src/modules/weapons/projectiles/GravityBomb.cc (modified) (4 diffs)
• src/modules/weapons/projectiles/GravityBomb.h (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBombField.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/GravityBombFire.cc (added)
• src/modules/weapons/weaponmodes/GravityBombFire.h (modified) (1 diff)

code/branches/weaponFS15/data/levels/emptyLevel.oxw

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipEscort.oxt")
@@ -30 +30 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     
   </Scene>

code/branches/weaponFS15/data/levels/includes/weaponSettingsAssff.oxi

@@ -40 +40 @@
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+          <GravityBombFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
         </Weapon>

code/branches/weaponFS15/src/modules/weapons/WeaponsPrereqs.h

@@ -75 +75 @@
     class ReplenishingMunition;
     class RocketMunition;
+    class GravityBombMuntion;
 
     // projectiles
@@ -93 +94 @@
     class RocketFire;
     class SimpleRocketFire;
+    class GravityBombFire;
 }
 

code/branches/weaponFS15/src/modules/weapons/munitions/CMakeLists.txt

@@ -4 +4 @@
   FusionMunition.cc
   RocketMunition.cc
+  GravityBombMunition.cc
 )

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.cc

@@ -6 +6 @@
  */
 #include "GravityBomb.h"
+#include "graphics/Model.h"
 
 
 namespace orxonox{
         RegisterClass(GravityBomb);
-
-        const float GravityBomb::INITIAL_VELOCITY = 20;
-        const float GravityBomb::SLOW_DOWN_RATIO = 2;
 
         GravityBomb::GravityBomb(Context* context):
@@ -24 +22 @@
                         if (GameMode::isMaster())
                         {
-                                //Define movement of the bomb
-                                this->setVelocity(this->getOrientation()*WorldEntity::FRONT*INITIAL_VELOCITY);
-                                this->velocityAtLastTick_=INITIAL_VELOCITY;
-                                this->setAcceleration(this->getOrientation()*WorldEntity::BACK*SLOW_DOWN_RATIO);
-                                this->setCollisionType(WorldEntity::Dynamic);
+                                //Define CollisionType of the bomb
+                                this->velocityAtLastTick_= 1000;
+                                this->setCollisionResponse(false);
+                                this->setCollisionType(WorldEntity::Kinematic);
                                 this->enableCollisionCallback();
 
                                 //Add Collision Shape
                                 SphereCollisionShape* collisionShape = new SphereCollisionShape(context);
-                                collisionShape->setRadius(5.0);
+                                collisionShape->setRadius(1.0);
                                 this->attachCollisionShape(collisionShape);
 
                                 //Create Bomb Model
-
+                    Model* model = new Model(this->getContext());
+                    model->setMeshSource("rocket.mesh"); //Demo Model from SimpleRocket
+                    model->scale(0.7f);
+                    this->attach(model);
 
                         }
@@ -46 +46 @@
         void GravityBomb::tick(float dt)
         {
+                        velocityAtLastTick_=getVelocity().length();
+                        SUPER(GravityBomb,tick,dt);
                         if(velocityAtLastTick_ < this->getVelocity().length())
                         {
+                                orxout(debug_output) << "bomb has stoped moving" <<endl;
                                 setVelocity(Vector3::ZERO);
                                 setAcceleration(Vector3::ZERO);
                                 velocityAtLastTick_=0;
                                 detonate();
+                                orxout(debug_output) << "denoting" <<endl;
                         }
-                        velocityAtLastTick_=getVelocity().length();
+                        else
+                        {
+                                velocityAtLastTick_=getVelocity().length();
+                                orxout(debug_output)<< velocityAtLastTick_ <<endl;
+                                orxout(debug_output) << "acceleration" << getAcceleration().length() <<endl;
+                                destroyCheck();
+                        }
         }
 
         bool GravityBomb::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
         {
-                detonate();
+                orxout(debug_output) << "collides" << endl;
                 processCollision(otherObject, contactPoint,cs);
+                //detonate();
                 return true;
         }
@@ -66 +77 @@
         {
                 GravityBombField* field = new GravityBombField(this->getContext());
+                orxout(debug_output) << "denoting" <<endl;
+                this->destroy();
         }
 }

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h

@@ -66 +66 @@
 
                 private:
-                static const float INITIAL_VELOCITY;
-                static const float SLOW_DOWN_RATIO;
 
                 float velocityAtLastTick_; //Used to check wether the Object is already accelarating in the oposite direction to detect the time to detonate it.

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBombField.cc

@@ -11 +11 @@
         RegisterClass(GravityBombField);
 
-        const float GravityBombField::FORCE_FIELD_LIFETIME = 10;
-        const float GravityBombField::FORCE_SPHERE_START_RADIUS = 50;
-        const float GravityBombField::FORCE_SPHERE_START_STRENGTH = -300;
+        const float GravityBombField::FORCE_FIELD_LIFETIME = 5;
+        const float GravityBombField::FORCE_SPHERE_START_RADIUS = 100;
+        const float GravityBombField::FORCE_SPHERE_START_STRENGTH = -1000;
 
         GravityBombField::GravityBombField(Context* context) : ForceField(context)
         {
+                RegisterObject(GravityBombField);
                 lifetime_=FORCE_FIELD_LIFETIME;
                 setVelocity(FORCE_SPHERE_START_STRENGTH);
@@ -27 +28 @@
         void GravityBombField::tick(float dt)
         {
+                SUPER(GravityBombField,tick,dt);
                 lifetime_-=dt;
                 if(lifetime_ < 0)
@@ -37 +39 @@
         {
                 //Animation
-                //SUPER(GravityBombField,destroy);
+                ForceField::destroy();
         }
 

code/branches/weaponFS15/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -7 +7 @@
   RocketFire.cc
   SimpleRocketFire.cc
+  GravityBombFire.cc
 )

code/branches/weaponFS15/src/modules/weapons/weaponmodes/GravityBombFire.h

@@ -58 +58 @@
         private:
             float speed_; //!< The initial speed of the bomb when it is launched.
+            float slowDownRate_;
     };
 }