[Orxonox-commit 7699] r12292 - in code/trunk: data/levels data/levels/templates src/modules/hover

[wiesep at orxonox.net]

Author: wiesep
Date: 2019-04-11 14:08:28 +0200 (Thu, 11 Apr 2019)
New Revision: 12292

Modified:
   code/trunk/data/levels/BumpMap.oxw
   code/trunk/data/levels/templates/spaceshipHover.oxt
   code/trunk/src/modules/hover/Hover.cc
   code/trunk/src/modules/hover/HoverShip.cc
   code/trunk/src/modules/hover/HoverShip.h
Log:
Rolled back to r12201

Modified: code/trunk/data/levels/BumpMap.oxw
===================================================================
--- code/trunk/data/levels/BumpMap.oxw	2019-04-11 12:06:24 UTC (rev 12291)
+++ code/trunk/data/levels/BumpMap.oxw	2019-04-11 12:08:28 UTC (rev 12292)
@@ -59,14 +59,7 @@
     <Model position="0, 0,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="Cube_Lava_Normal.mesh" />
     <Model position="0, 12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2.mesh" />
     <Model position="0, -12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
-
     -->
-     
-    s<MovableEntity position="0,0,40" rotationrate="30" rotationaxis="1,0,1">
-      <attached>
-          <Model position="0, 0,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Gravestone.mesh" />
-      </attached>
-    </MovableEntity>
 
     <MovableEntity position="0,0,40" rotationrate="30" rotationaxis="1,0,1">
       <attached>

Modified: code/trunk/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipHover.oxt	2019-04-11 12:06:24 UTC (rev 12291)
+++ code/trunk/data/levels/templates/spaceshipHover.oxt	2019-04-11 12:08:28 UTC (rev 12292)
@@ -21,7 +21,7 @@
    auxilaryThrust    = 30
    rotationThrust    = 25
 
-   jumpBoost = 180
+   jumpBoost = 90
 
    lift = 1;
    stallSpeed = 220;

Modified: code/trunk/src/modules/hover/Hover.cc
===================================================================
--- code/trunk/src/modules/hover/Hover.cc	2019-04-11 12:06:24 UTC (rev 12291)
+++ code/trunk/src/modules/hover/Hover.cc	2019-04-11 12:08:28 UTC (rev 12292)
@@ -52,7 +52,6 @@
         this->firstTick_ = true;
 
         this->setHUDTemplate("HoverHUD");
-
     }
 
     void Hover::tick(float dt)
@@ -112,6 +111,5 @@
             }
         }
         numberOfFlags_ = flags_.size();
-
     }
 }

Modified: code/trunk/src/modules/hover/HoverShip.cc
===================================================================
--- code/trunk/src/modules/hover/HoverShip.cc	2019-04-11 12:06:24 UTC (rev 12291)
+++ code/trunk/src/modules/hover/HoverShip.cc	2019-04-11 12:08:28 UTC (rev 12292)
@@ -32,7 +32,6 @@
 #include "HoverShip.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "graphics/Camera.h"
 
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
@@ -45,29 +44,17 @@
         RegisterObject(HoverShip);
         enableCollisionCallback();
         isFloor_ = false;
-        jumpBoost_ = 0;    
+        jumpBoost_ = 0;
     }
 
     void HoverShip::moveFrontBack(const Vector2& value)
-        { this->steering_.z -= value.x; 
-            Vector3 currentPosition = this->getPosition();
-            currentPosition.y -= 2*value.y;
-            this->setPosition(currentPosition);
-        }
+        { this->steering_.z -= value.x; }
 
     void HoverShip::moveRightLeft(const Vector2& value)
-        { 
-            this->steering_.x += value.x; 
-            Vector3 currentPosition = this->getPosition();
-            currentPosition.x -= 2*value.x;
-            this->setPosition(currentPosition);
-        }
+        { this->steering_.x += value.x; }
 
     void HoverShip::moveUpDown(const Vector2& value)
-        { 
-            this->steering_.y += value.x; 
-            this->setPosition(Vector3(0, 0, 0));
-        }
+        { this->steering_.y += value.x; }
 
     void HoverShip::rotateYaw(const Vector2& value)
     {
@@ -83,23 +70,6 @@
         XMLPortParam(HoverShip, "jumpBoost", setJumpBoost, getJumpBoost, xmlelement, mode);
     }
 
-    void HoverShip::tick(float dt)
-    {
-        SUPER(HoverShip, tick, dt);
-                //Execute movement
-        if (this->hasLocalController())
-            {
-             // Camera
-            Camera* camera = this->getCamera();
-            if (camera != nullptr)
-            {
-                camera->setPosition(0,1000,0);
-                camera->setOrientation(Vector3::UNIT_X, Degree(-90));
-
-            }
-        }
-    }
-
     /**
     @brief
         Removed, does nothing.

Modified: code/trunk/src/modules/hover/HoverShip.h
===================================================================
--- code/trunk/src/modules/hover/HoverShip.h	2019-04-11 12:06:24 UTC (rev 12291)
+++ code/trunk/src/modules/hover/HoverShip.h	2019-04-11 12:08:28 UTC (rev 12292)
@@ -68,8 +68,6 @@
 
             virtual void boost(bool bBoost) override;
 
-            virtual void tick(float dt) override;
-
         private:
             float jumpBoost_;
             bool isFloor_;