Changeset 9744 for code

Timestamp:

Nov 4, 2013, 3:58:01 PM (11 years ago)

Author:

zifloria

Message:

Added everything I modified and a few funky things

Location:

code/branches/invaders

Files:

• data/levels/_temp.oxw (added)
• data/levels/includes/invaderWeapon.oxi (added)
• data/levels/templates/.shipmodels (added)
• data/levels/templates/spaceshipInvader.oxt (modified) (1 diff)
• src/modules/invader/CMakeLists.txt (modified) (2 diffs)
• src/modules/invader/InvaderPrereqs.h (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (4 diffs)
• src/modules/invader/InvaderShip.h (modified) (2 diffs)
• src/modules/invader/InvaderWeapon.cc (added)
• src/modules/invader/InvaderWeapon.h (added)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (2 diffs)

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

@@ -57 +57 @@
     </collisionShapes>
 <?lua
-  include("../includes/weaponSettingsEscort.oxi")
+  include("../includes/invaderWeapon.oxi")
 ?>
   </InvaderShip>

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

@@ -4 +4 @@
   InvaderCenterPoint.cc
   InvaderShip.cc
+  InvaderWeapon.cc
 END_BUILD_UNIT
 )
@@ -13 +14 @@
     orxonox
     overlays
+    weapons
   SOURCE_FILES ${Invader_SRC_FILES}
 )

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

@@ -71 +71 @@
     class InvaderCenterPoint;
     class InvaderShip;
+    class InvaderWeapon;
 }
 

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

@@ -50 +50 @@
 
         speed = 500;
+        isFireing = false;
         damping = 10;
+
     }
 
     void InvaderShip::tick(float dt)
     {
-        // If the bat is controlled (but not over the network).
+        // if (camera == NULL)
+        //     camera = this->getCamera();
+        // if (camera != NULL)
+        //     camera->setPosition(Vector3(0, 0, 0) + this->getWorldPosition());
+
         if (this->hasLocalController())
         {
@@ -69 +75 @@
             ControllableEntity::fire(0);
 
+
+        // camera->setOrientation(Vector3::UNIT_X, Degree(0));
+
+
         SUPER(InvaderShip, tick, dt);
     }
@@ -74 +84 @@
     void InvaderShip::moveFrontBack(const Vector2& value)
     {
-        orxout(internal_error) << "move backfront" << value.x << value.y << endl;
+        // orxout(internal_error) << "move backfront" << value.x << value.y << endl;
         //velocity.y = value.y * speed * 10;
         lastTimeFront = 0;
@@ -82 +92 @@
     void InvaderShip::moveRightLeft(const Vector2& value)
     {
-        orxout(internal_error) << "right left front" << value.x << value.y << endl;
+        // orxout(internal_error) << "right left front" << value.x << value.y << endl;
         lastTimeLeft = 0;
         desiredVelocity.x = value.x * speed;

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

@@ -38 +38 @@
 
 #include "worldentities/pawns/SpaceShip.h"
+#include "graphics/Camera.h"
 
 namespace orxonox
@@ -59 +60 @@
             virtual void rotateRoll(const Vector2& value){};
         private:
+            Camera* camera;
             bool isFireing;
             float speed, damping;

code/branches/invaders/src/modules/weapons/weaponmodes/HsW01.h

@@ -59 +59 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-        private:
+        protected:
             /**
             @brief Set the mesh.
@@ -109 +109 @@
                 { return this->delay_; }
 
-            void shot();
+            virtual void shot();
             void muzzleflash();