Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12292


Ignore:
Timestamp:
Apr 11, 2019, 2:08:28 PM (3 years ago)
Author:
wiesep
Message:

Rolled back to r12201

Location:
code/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/data/levels/BumpMap.oxw

    r12290 r12292  
    6060    <Model position="0, 12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2.mesh" />
    6161    <Model position="0, -12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
    62 
    6362    -->
    64      
    65     s<MovableEntity position="0,0,40" rotationrate="30" rotationaxis="1,0,1">
    66       <attached>
    67           <Model position="0, 0,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Gravestone.mesh" />
    68       </attached>
    69     </MovableEntity>
    7063
    7164    <MovableEntity position="0,0,40" rotationrate="30" rotationaxis="1,0,1">
  • code/trunk/data/levels/templates/spaceshipHover.oxt

    r12290 r12292  
    2222   rotationThrust    = 25
    2323
    24    jumpBoost = 180
     24   jumpBoost = 90
    2525
    2626   lift = 1;
  • code/trunk/src/modules/hover/Hover.cc

    r12290 r12292  
    5353
    5454        this->setHUDTemplate("HoverHUD");
    55 
    5655    }
    5756
     
    113112        }
    114113        numberOfFlags_ = flags_.size();
    115 
    116114    }
    117115}
  • code/trunk/src/modules/hover/HoverShip.cc

    r12290 r12292  
    3333#include "core/CoreIncludes.h"
    3434#include "core/XMLPort.h"
    35 #include "graphics/Camera.h"
    3635
    3736#include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
     
    4645        enableCollisionCallback();
    4746        isFloor_ = false;
    48         jumpBoost_ = 0;   
     47        jumpBoost_ = 0;
    4948    }
    5049
    5150    void HoverShip::moveFrontBack(const Vector2& value)
    52         { this->steering_.z -= value.x;
    53             Vector3 currentPosition = this->getPosition();
    54             currentPosition.y -= 2*value.y;
    55             this->setPosition(currentPosition);
    56         }
     51        { this->steering_.z -= value.x; }
    5752
    5853    void HoverShip::moveRightLeft(const Vector2& value)
    59         {
    60             this->steering_.x += value.x;
    61             Vector3 currentPosition = this->getPosition();
    62             currentPosition.x -= 2*value.x;
    63             this->setPosition(currentPosition);
    64         }
     54        { this->steering_.x += value.x; }
    6555
    6656    void HoverShip::moveUpDown(const Vector2& value)
    67         {
    68             this->steering_.y += value.x;
    69             this->setPosition(Vector3(0, 0, 0));
    70         }
     57        { this->steering_.y += value.x; }
    7158
    7259    void HoverShip::rotateYaw(const Vector2& value)
     
    8269
    8370        XMLPortParam(HoverShip, "jumpBoost", setJumpBoost, getJumpBoost, xmlelement, mode);
    84     }
    85 
    86     void HoverShip::tick(float dt)
    87     {
    88         SUPER(HoverShip, tick, dt);
    89                 //Execute movement
    90         if (this->hasLocalController())
    91             {
    92              // Camera
    93             Camera* camera = this->getCamera();
    94             if (camera != nullptr)
    95             {
    96                 camera->setPosition(0,1000,0);
    97                 camera->setOrientation(Vector3::UNIT_X, Degree(-90));
    98 
    99             }
    100         }
    10171    }
    10272
  • code/trunk/src/modules/hover/HoverShip.h

    r12290 r12292  
    6969            virtual void boost(bool bBoost) override;
    7070
    71             virtual void tick(float dt) override;
    72 
    7371        private:
    7472            float jumpBoost_;
Note: See TracChangeset for help on using the changeset viewer.