Changeset 11514

Timestamp:

Oct 30, 2017, 2:33:33 PM (6 years ago)

Author:

merholzl

Message:

final XMLPort things. Changes in spaceshipFlappyOrx

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/FlappyOrx.oxw (modified) (1 diff)
• data/levels/templates/spaceshipFlappyOrx.oxt (modified) (1 diff)
• src/modules/flappyorx/FlappyOrx.cc (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (3 diffs)
• src/modules/flappyorx/FlappyOrxShip.h (modified) (1 diff)

code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

@@ -92 +92 @@
       end
     ?>
-    
-    
   </Scene>
 </Level>

code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt

@@ -40 +40 @@
     collisiondamage = 100
     enablecollisiondamage = true
+
+    speed = 100
+    UpwardThrust = 200
+    gravity = 18
   >
     <engines>

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc

@@ -101 +101 @@
         if (player == nullptr)
         {
-            for (FlappyOrxShip* ship : ObjectList<FlappyOrxShip>())
+            for (FlappyOrxShip* ship : ObjectList<FlappyOrxShip>()) {
                 player = ship;
+            }
         }
         return player;

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

@@ -49 +49 @@
         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())
         {
@@ -72 +76 @@
             }
 
-            
             pos += Vector3(speed + velocity.x, 0, velocity.y) * dt;
             
@@ -100 +103 @@
             
         }
-
-
-        SUPER(FlappyOrxShip, tick, dt);
     }
 

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h

@@ -62 +62 @@
             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: