Changeset 12147

Timestamp:

Dec 5, 2018, 11:25:23 AM (6 years ago)

Author:

emustafa

Message:

controlls tweaks

Location:

code/branches/OrxoKart_HS18

Files:

• data/levels/includes/weaponSettingsHover.oxi (modified) (2 diffs)
• data/levels/templates/OrxoKartKart.oxt (modified) (4 diffs)
• src/modules/orxokart/CMakeLists.txt (modified) (1 diff)
• src/modules/orxokart/KartController.cc (added)
• src/modules/orxokart/KartController.h (added)
• src/modules/orxokart/OrxoKartKart.cc (modified) (4 diffs)
• src/modules/orxokart/OrxoKartKart.h (modified) (2 diffs)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)

code/branches/OrxoKart_HS18/data/levels/includes/weaponSettingsHover.oxi

@@ -7 +7 @@
   <WeaponSet firemode=1 />
 </weaponsets>
-<weaponpacks>
+<!--<weaponpacks>
   <WeaponPack>
     <links>
@@ -25 +25 @@
     </links>
   </WeaponPack>
-</weaponpacks>  
+</weaponpacks> --> 
 <munition>
   <IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>

code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt

@@ -3 +3 @@
   <SpaceShip
    hudtemplate            = spaceshiporxokarthud
-   camerapositiontemplate = spaceshiphovercameras
+   camerapositiontemplate = spaceshipcameras
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
@@ -22 +22 @@
    auxilaryThrust    = 300
    rotationThrust    = 50
-
-   jumpBoost = 30
-
    lift = 1;
    stallSpeed = 500;
 
    boostPower            = 30
-   boostPowerRate        = 1
+   boostPowerRate        = 100
    boostRate             = 5
    boostCooldownDuration = 10
@@ -39 +36 @@
   >
     <engines>
-      <MultiStateEngine position=" 0, 0, 0" template=spaceshiphoverengine />
+      <MultiStateEngine position=" 0, 0, 0" template=spaceshipengine />
     </engines>
     <attached>
@@ -66 +63 @@
   </SpaceShip>
 </Template>
-
-<Template name=spaceshiphovercameras defaults=0>
+ 
+<Template name=spaceshipcameras defaults=0>
   <SpaceShip>
     <camerapositions>
-      <CameraPosition position="0,8, 5" drag=true mouselook=true />
-      <CameraPosition position="0,8,5" yaw="180" drag=true mouselook=true />
+      <CameraPosition position="0,8, 5" drag=True mouselook=False />
+      <CameraPosition position="0,8,5" yaw="180" drag=True mouselook=False />
     </camerapositions>
   </SpaceShip>
 </Template>
 
-<Template name=spaceshiphoverengine baseclass=Engine>
+<Template name=spaceshipengine baseclass=Engine>
   <MultiStateEngine
    boostfactor    = 2
 
-   speedfront     = 200
+   speedfront     = 300
    speedback      =  40
    speedleftright =  40
    speedupdown    =  40
 
-   accelerationfront     = 500
-   accelerationbrake     = 500
+   accelerationfront     = 300
+   accelerationbrake     = 50
    accelerationback      =  125
-   accelerationleftright =  125
+   accelerationleftright =  0
    accelerationupdown    =  125
   >

code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt

@@ -7 +7 @@
   ShroomHUD.cc
   TimeHUD.cc
+  KartController.cc
 )
 

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
+#include "controllers/HumanController.h"
 
 namespace orxonox
@@ -42 +42 @@
     OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)
     {
+
         RegisterObject(OrxoKartKart);
         enableCollisionCallback();
-        isFloor_ = false;
-        jumpBoost_ = 0;
     }
 
     void OrxoKartKart::moveFrontBack(const Vector2& value)
         { 
-            this->steering_.z -= value.x; 
-            orxout() << "mFB" << endl;
+            this->steering_.z -= value.x;
+            
         }
 
     void OrxoKartKart::moveRightLeft(const Vector2& value)
-        { 
+        {   
             this->rotateYaw(value);
-            orxout() << "mRL" << endl;
         }
 
@@ -63 +61 @@
         { 
             this->steering_.y += value.x; 
-            orxout() << "mUD" << endl;
+            
         }
 
     void OrxoKartKart::rotateYaw(const Vector2& value)
         {
-            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
-            //orxout() << value;
-            Pawn::rotateYaw(value);
+            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);  
         }
 
     void OrxoKartKart::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(OrxoKartKart, XMLPort, xmlelement, mode);
+        {
+            SUPER(OrxoKartKart, XMLPort, xmlelement, mode);
+            
+        }
 
-        XMLPortParam(OrxoKartKart, "jumpBoost", setJumpBoost, getJumpBoost, xmlelement, mode);
-    }
 
     /**
@@ -94 +90 @@
     void OrxoKartKart::rotateRoll(const Vector2& value) { }
 
-    /**
-    @brief
-        Checks if the ship is touching the floor. The ship can only jump if there is contact with someting beneath it.
-    */
-    bool OrxoKartKart::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
-    {
-        SpaceShip::collidesAgainst(otherObject, cs, contactPoint);
-        //SUPER(OrxoKartKart, collidesAgainst, otherObject, cs, contactPoint);
 
-        if (contactPoint.m_normalWorldOnB.y() > 0.6
-            && this->getVelocity().y < 1) {
-            this->isFloor_ = true;
-        } else {
-            this->isFloor_ = false;
-        }
-
-        return false;
-    }
-
-    /**
-    @brief
-        Makes the ship jump
-    @param bBoost
-    */
-    void OrxoKartKart::boost(bool bBoost) {
-        if (bBoost && this->isFloor_)
-        {
-            this->setVelocity(
-                this->getVelocity().x,
-                jumpBoost_,
-                this->getVelocity().z
-                );
-            this->isFloor_ = false;
-        }
-    }
 }

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.h

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            /// sets this ships jumpBoost
-            inline void setJumpBoost(float jumpBoost)
-                { this->jumpBoost_ = jumpBoost; }
-            /// returns this ships jumpBoost
-            inline float getJumpBoost() const
-                { return this->jumpBoost_; }
-
             virtual void moveFrontBack(const Vector2& value) override;
 
@@ -64 +57 @@
 
             virtual void rotateRoll(const Vector2& value) override;
-
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
-
-            virtual void boost(bool bBoost) override;
-
-        private:
-            float jumpBoost_;
-            bool isFloor_;
     };
 }

code/branches/OrxoKart_HS18/src/orxonox/controllers/CMakeLists.txt

@@ -21 +21 @@
   ArrowController.cc;
   AutonomousDroneController.cc;
-        
 )