[Orxonox-commit 6893] r11514 - in code/branches/FlappyOrx_HS17: data/levels data/levels/templates src/modules/flappyorx

[merholzl at orxonox.net]

Author: merholzl
Date: 2017-10-30 14:33:33 +0100 (Mon, 30 Oct 2017)
New Revision: 11514

Modified:
   code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
   code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h
Log:
final XMLPort things. Changes in spaceshipFlappyOrx

Modified: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-10-30 12:50:50 UTC (rev 11513)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	2017-10-30 13:33:33 UTC (rev 11514)
@@ -91,8 +91,6 @@
     <?lua
       end
     ?>
-    
-    
   </Scene>
 </Level>
 

Modified: code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	2017-10-30 12:50:50 UTC (rev 11513)
+++ code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	2017-10-30 13:33:33 UTC (rev 11514)
@@ -39,6 +39,10 @@
 
     collisiondamage = 100
     enablecollisiondamage = true
+
+    speed = 100
+    UpwardThrust = 200
+    gravity = 18
   >
     <engines>
       <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipFlappyOrxengine />

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-10-30 12:50:50 UTC (rev 11513)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-10-30 13:33:33 UTC (rev 11514)
@@ -100,8 +100,9 @@
     {
         if (player == nullptr)
         {
-            for (FlappyOrxShip* ship : ObjectList<FlappyOrxShip>())
+            for (FlappyOrxShip* ship : ObjectList<FlappyOrxShip>()) {
                 player = ship;
+            }
         }
         return player;
     }

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-10-30 12:50:50 UTC (rev 11513)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc	2017-10-30 13:33:33 UTC (rev 11514)
@@ -48,19 +48,23 @@
     {
         RegisterObject(FlappyOrxShip);
 
-        UpwardThrust = 250;
-        speed = 50;
-        gravity = 20;
-         void AutonomousDrone::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+        this->UpwardThrust = 1;
+        this->speed = 1;orxout() << "constr speed set: " << 1 << endl;
+        this->gravity = 1;
+        
+    }
+    void FlappyOrxShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
         {   
-            SUPER(AutonomousDrone, XMLPort, xmlelement, mode);
+            SUPER(FlappyOrxShip, XMLPort, xmlelement, mode);
             XMLPortParam(FlappyOrxShip, "speed", setSpeed, getSpeed, xmlelement, mode);
             XMLPortParam(FlappyOrxShip, "UpwardThrust", setUpwardThrust, getUpwardThrust, xmlelement, mode);
             XMLPortParam(FlappyOrxShip, "gravity", setGravity, getGravity, xmlelement, mode);
-        }
     }
+
     void FlappyOrxShip::tick(float dt)
-    {  //Execute movement
+    {
+        SUPER(FlappyOrxShip, tick, dt);
+        //Execute movement
         if (this->hasLocalController())
         {
             
@@ -71,7 +75,6 @@
                 velocity.y = -UpwardThrust;
             }
 
-            
             pos += Vector3(speed + velocity.x, 0, velocity.y) * dt;
             
             if(pos.z < -150 || pos.z > 150){
@@ -99,9 +102,6 @@
             setOrientation(Vector3::UNIT_Y, Degree(270));
             
         }
-
-
-        SUPER(FlappyOrxShip, tick, dt);
     }
 
     void FlappyOrxShip::updateLevel()

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h	2017-10-30 12:50:50 UTC (rev 11513)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h	2017-10-30 13:33:33 UTC (rev 11514)
@@ -61,18 +61,19 @@
             //return to main menu if game has ended.
             virtual void rotateRoll(const Vector2& value) override;
             inline void setSpeed( float speed )
-                { this->speed = speed; }
-            inline void getSpeed( )
+                { orxout() << "speed set: " << speed << endl; this->speed = speed; }
+            inline float getSpeed( )
                 { return this->speed; }
             inline void setGravity( float gravity )
                 { this->gravity = gravity; }
-            inline void getGravity()
+            inline float getGravity()
                 { return this->gravity; }
-            inline void setSpeed( float UpwardThrust )
+            inline void setUpwardThrust( float UpwardThrust )
                 { this->UpwardThrust = UpwardThrust; }
-            inline void getSpeed()
+            inline float getUpwardThrust()
                 { return this->UpwardThrust; }
             virtual void updateLevel();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
         protected:
             virtual void death() override;