Changeset 9828 for code/branches/invaders

Timestamp:

Nov 25, 2013, 5:35:30 PM (11 years ago)

Author:

zifloria

Message:

HUD + take damage

Location:

code/branches/invaders

Files:

• data/levels/Invaders.oxw (modified) (3 diffs)
• data/levels/templates/enemyInvader.oxt (modified) (1 diff)
• data/levels/templates/spaceshipInvader.oxt (modified) (1 diff)
• data/overlays/InvaderHUD.oxo (added)
• src/modules/invader/CMakeLists.txt (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (2 diffs)
• src/modules/invader/Invader.h (modified) (1 diff)
• src/modules/invader/InvaderEnemy.cc (modified) (2 diffs)
• src/modules/invader/InvaderEnemy.h (modified) (1 diff)
• src/modules/invader/InvaderHUDinfo.cc (added)
• src/modules/invader/InvaderHUDinfo.h (added)
• src/modules/invader/InvaderPrereqs.h (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (4 diffs)
• src/modules/invader/InvaderShip.h (modified) (2 diffs)

code/branches/invaders/data/levels/Invaders.oxw

@@ -5 +5 @@
  screenshot = "emptylevel.png"
 />
-
+<!-- include("HUDTemplates3.oxo") -->
 <?lua
   include("stats.oxo")
-  include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
 ?>
@@ -17 +16 @@
   include("templates/spaceshipInvader.oxt")
   include("templates/enemyInvader.oxt")
+  include("overlays/InvaderHUD.oxo")
 ?>
 
@@ -61 +61 @@
 
     <MovableEntity
-      position = "<?lua print(math.random()* 30000 - 1000) ?>,-1000,<?lua print(math.random() * 4000 - 2000) ?>"
+      position = "<?lua print(math.random()* 40000 + 1000) ?>,-1000,<?lua print(math.random() * 4000 - 2000) ?>"
       collisionType = dynamic
       linearDamping = 0.8

code/branches/invaders/data/levels/templates/enemyInvader.oxt

@@ -34 +34 @@
 
    collisionType     = "dynamic"
-   mass              = 5
+   mass              = 0.00001
    linearDamping     = 0
    angularDamping    = 0

code/branches/invaders/data/levels/templates/spaceshipInvader.oxt

@@ -34 +34 @@
 
    collisionType     = "dynamic"
-   mass              = 80
+   mass              = 4200000
    linearDamping     = 0.7
    angularDamping    = 0.9999999
+
+    collisiondamage = 100
+    enablecollisiondamage = true
   >
     <engines>

code/branches/invaders/src/modules/invader/CMakeLists.txt

@@ -6 +6 @@
   InvaderEnemy.cc
   InvaderWeapon.cc
+  InvaderHUDinfo.cc
 END_BUILD_UNIT
 )

code/branches/invaders/src/modules/invader/Invader.cc

@@ -62 +62 @@
         this->console_addEnemy = createConsoleCommand( "spawnEnemy", createExecutor( createFunctor(&Invader::spawnEnemy, this) ) );
         //this->context = context;
+        this->setHUDTemplate("InvaderHUD");
 
         enemySpawnTimer.setTimer(2.0f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
@@ -83 +84 @@
         newPawn->addTemplate("enemyinvader");
 
-        newPawn->setPosition(player->getPosition() + Vector3(1000, 0, 0));
+        newPawn->setPosition(player->getPosition() + Vector3(1000, 0, 0)); // BUG: 
     }
 

code/branches/invaders/src/modules/invader/Invader.h

@@ -62 +62 @@
             void setCenterpoint(InvaderCenterPoint* center)
             { this->center_ = center; }
+
+            int getLives(){return this->lives;}
+            int getLevel(){return this->level;}
+            int getPoints(){return this->point;}
         private:
             WeakPtr<InvaderCenterPoint> center_;
-            InvaderShip * player;
+            WeakPtr<InvaderShip> player;
 
             ConsoleCommand* console_addEnemy;
-
             Timer enemySpawnTimer;
             //Context* context;
+            int lives;
+            int level;
+            int point;
     };
 }

code/branches/invaders/src/modules/invader/InvaderEnemy.cc

@@ -43 +43 @@
     {
         RegisterObject(InvaderEnemy);
+        enableCollisionCallback();
     }
 
@@ -49 +50 @@
         SUPER(InvaderEnemy, tick, dt);
     }
+
+    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        orxout() << "sadsadasfasf" << endl;
+        removeHealth(2000);
+        setVelocity(Vector3(0,0,1000));
+        return false;
+    }
 }

code/branches/invaders/src/modules/invader/InvaderEnemy.h

@@ -48 +48 @@
 
             virtual void tick(float dt);
+            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
 
         private:

code/branches/invaders/src/modules/invader/InvaderPrereqs.h

@@ -73 +73 @@
     class InvaderEnemy;
     class InvaderWeapon;
+    class InvaderHUDinfo;
 }
 

code/branches/invaders/src/modules/invader/InvaderShip.cc

@@ -70 +70 @@
         {
             float dist_y = velocity.y * dt;
+            float dist_x = velocity.x * dt;
             if(dist_y + posforeward > -42*3 && dist_y + posforeward < 42*6)
                 posforeward += dist_y;
             else
                 velocity.y = 0;
+            if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
+                velocity.x = 0;
             // this->setVelocity(Vector3(1000 + velocity.y, 0, velocity.x));
             pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
@@ -93 +96 @@
 
         // bring back on track!
-        if (pos.z > 42*2.5)
-            pos.z = 42*2.5;
-        else if (pos.z < -42*3)
-            pos.z = -42*3;
+        // if (pos.z > 42*2.5)
+        //     pos.z = 42*2.5;
+        // else if (pos.z < -42*3)
+        //     pos.z = -42*3;
         if(pos.y != 0)
             pos.y = 0;
-        // if (camera != NULL)
-        // {
-        //     float x = camera->getWorldPosition().x;
-        //     if (pos.x > x + 20)
-        //         pos.x = x + 20;
-        //     else if (pos.x < x - 20)
-        //         pos.x = x - 20;
-        // }
-        // if (abs(posforeward) < 20)
             
 
@@ -114 +108 @@
 
         // Level up!
-        if (pos.x > 30000)
+        if (pos.x > 42000)
         {
             updateLevel();
-            setPosition(Vector3(0, 0, 0)); // pos - Vector3(30000, 0, 0)
+            setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
         }
 
@@ -144 +138 @@
         isFireing = bBoost;
     }
+    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
+
+        WeakPtr<InvaderEnemy> enemy = orxonox_cast<InvaderEnemy*>(otherObject);
+        if (enemy != NULL && lastEnemy != enemy)
+        {
+            lastEnemy = enemy;
+            orxout() << "Enemy!!!! " << endl;
+            removeHealth(20);
+            if (getHealth() <= 0)
+            {
+                orxout() << "DIED!!!! " << endl;
+            }
+            return false;
+        }
+        return false;
+        // SUPER(InvaderShip, collidesAgainst, otherObject, contactPoint);
+    }
 }

code/branches/invaders/src/modules/invader/InvaderShip.h

@@ -63 +63 @@
 
             // *InvaderShip getShip(){return this;}
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
         private:
             Camera* camera;
@@ -74 +75 @@
             } velocity, desiredVelocity;
 
+            WeakPtr<InvaderEnemy> lastEnemy;
+
     };
 }