Changeset 12292 for code/trunk

Timestamp:

Apr 11, 2019, 2:08:28 PM (6 years ago)

Author:

wiesep

Message:

Rolled back to r12201

Location:

code/trunk

Files:

• data/levels/BumpMap.oxw (modified) (1 diff)
• data/levels/templates/spaceshipHover.oxt (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (2 diffs)
• src/modules/hover/HoverShip.cc (modified) (3 diffs)
• src/modules/hover/HoverShip.h (modified) (1 diff)

code/trunk/data/levels/BumpMap.oxw

@@ -60 +60 @@
     <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">

code/trunk/data/levels/templates/spaceshipHover.oxt

@@ -22 +22 @@
    rotationThrust    = 25
 
-   jumpBoost = 180
+   jumpBoost = 90
 
    lift = 1;

code/trunk/src/modules/hover/Hover.cc

@@ -53 +53 @@
 
         this->setHUDTemplate("HoverHUD");
-
     }
 
@@ -113 +112 @@
         }
         numberOfFlags_ = flags_.size();
-
     }
 }

code/trunk/src/modules/hover/HoverShip.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "graphics/Camera.h"
 
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
@@ -46 +45 @@
         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)
@@ -82 +69 @@
 
         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));
-
-            }
-        }
     }
 

code/trunk/src/modules/hover/HoverShip.h

@@ -69 +69 @@
             virtual void boost(bool bBoost) override;
 
-            virtual void tick(float dt) override;
-
         private:
             float jumpBoost_;