[Orxonox-commit 7565] r12168 - in code/branches/OrxoKart_HS18: data/levels/templates data/tcl src/modules/orxokart

[emustafa at orxonox.net]

Author: emustafa
Date: 2018-12-07 16:40:29 +0100 (Fri, 07 Dec 2018)
New Revision: 12168

Modified:
   code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
   code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt
   code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc
Log:
still on controlls

Modified: code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2018-12-07 15:33:47 UTC (rev 12167)
+++ code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2018-12-07 15:40:29 UTC (rev 12168)
@@ -30,9 +30,9 @@
    boostCooldownDuration = 10
 
    collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.2
-   angularDamping    = 0.9999999
+   mass              = 2000
+   linearDamping     = 0.5
+   angularDamping    = 0.999
   >
     <engines>
       <MultiStateEngine position=" 0, 0, 0" template=spaceshipengine />
@@ -39,9 +39,7 @@
     </engines>
     <attached>
       <Model position="0,0,-20" mesh="hovership_body.mesh" scale="5" yaw=180/>	
-      <Model position="0,0,-20" mesh="hovership_engine.mesh" scale="5" yaw=180/>	
-      <Model position="0,0,-20" mesh="hovership_gun.mesh" scale="5" yaw=180/>	
-      
+      <Model position="0,0,-20" mesh="hovership_engine.mesh" scale="5" yaw=180/>	      
     </attached>
     <collisionShapes>
       <BoxCollisionShape position="0,-2 ,7" halfExtents="7, 4 ,30" />
@@ -56,10 +54,6 @@
       <ExplosionPart mesh="explosionparts/pirate_part_3.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
       <ExplosionPart mesh="explosionparts/pirate_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     </explosion>
-
-<?lua
-  include("../includes/weaponSettingsHover.oxi")
-?>
   </SpaceShip>
 </Template>
  

Modified: code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt
===================================================================
--- code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt	2018-12-07 15:33:47 UTC (rev 12167)
+++ code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt	2018-12-07 15:40:29 UTC (rev 12168)
@@ -13,4 +13,7 @@
 Name: 0:22:15s
 Name: 0:21:87s
 Name: 0:50:45s
-Name: 0:26:64s
+Name: 0:27:45s
+Name: 0:33:17s
+Name: 0:31:46s
+Name: 0:25:40s

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h	2018-12-07 15:33:47 UTC (rev 12167)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h	2018-12-07 15:40:29 UTC (rev 12168)
@@ -33,7 +33,6 @@
 #define _KartController_H__
 
 #include "OrxoKartPrereqs.h"
-
 #include "controllers/HumanController.h"
 
 namespace orxonox

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2018-12-07 15:33:47 UTC (rev 12167)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2018-12-07 15:40:29 UTC (rev 12168)
@@ -162,17 +162,17 @@
             }
         }
         else {
-            orxout() << " Should not happen, look in OrxoKart.cc";
+            //orxout() << " Should not happen, look in OrxoKart.cc";
         }
 
 
 
-        	orxout() << numberOfShrooms << endl;
+        	//orxout() << numberOfShrooms << endl;
 
 
         // Check if ship collided with the flag, flag is the bottom that is responsible for the game to detect the spaceship falling.
         if(flag_->getCollided()){
-        	orxout() << numberOfShrooms << endl;
+        	//orxout() << numberOfShrooms << endl;
             player = flag_->getObjectofCollision();
             if (level == 1)
                 player->setPosition(Vector3(s*0, 20, s*8.5));
@@ -186,7 +186,7 @@
         }
 
         if (player && player->isBoosting()) {
-        	orxout() << "Boosting" << endl;
+        	//orxout() << "Boosting" << endl;
         	if(!numberOfShrooms) numberOfShrooms--;
         }
         

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc	2018-12-07 15:33:47 UTC (rev 12167)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc	2018-12-07 15:40:29 UTC (rev 12168)
@@ -32,18 +32,19 @@
 #include "OrxoKartKart.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
-#include "controllers/HumanController.h"
-
+#include "KartController.h"
 namespace orxonox
 {
     RegisterClass(OrxoKartKart);
 
+    void ControllableEntity::rotateYaw(const Vector2& value)
+    {
+        orxout() << "TEST CONTROLlER" << endl;
+    }
+
     OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)
     {
-
         RegisterObject(OrxoKartKart);
-        enableCollisionCallback();
     }
 
     void OrxoKartKart::moveFrontBack(const Vector2& value)
@@ -65,6 +66,7 @@
 
     void OrxoKartKart::rotateYaw(const Vector2& value)
         {
+            
             this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);  
         }