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

[emustafa at orxonox.net]

Author: emustafa
Date: 2019-02-22 16:46:06 +0100 (Fri, 22 Feb 2019)
New Revision: 12192

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/CMakeLists.txt
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc
   code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc
Log:
shroom removed, KartController removed

Modified: code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt
===================================================================
--- code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2019-02-21 14:46:15 UTC (rev 12191)
+++ code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt	2019-02-22 15:46:06 UTC (rev 12192)
@@ -25,14 +25,14 @@
    stallSpeed = 500;
 
    boostPower            = 10
-   boostPowerRate        = 1
-   boostRate             = 5
-   boostCooldownDuration = 10
+   boostPowerRate        = 1000
+   boostRate             = 1
+   boostCooldownDuration = 1
 
    collisionType     = "dynamic"
    mass              = 2000
    linearDamping     = 0.5
-   angularDamping    = 0.999
+   angularDamping    = 0.99999
   >
     <engines>
       <MultiStateEngine position=" 0, 0, 0" template=spaceshipengine />

Modified: code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt
===================================================================
--- code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt	2019-02-21 14:46:15 UTC (rev 12191)
+++ code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt	2019-02-22 15:46:06 UTC (rev 12192)
@@ -17,3 +17,4 @@
 Name: 0:33:17s
 Name: 0:31:46s
 Name: 0:25:40s
+Name: 1:27:11s

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt	2019-02-21 14:46:15 UTC (rev 12191)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt	2019-02-22 15:46:06 UTC (rev 12192)
@@ -6,7 +6,6 @@
   OrxoKartFlag.cc
   ShroomHUD.cc
   TimeHUD.cc
-  KartController.cc
 )
 
 ORXONOX_ADD_LIBRARY(orxokart

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2019-02-21 14:46:15 UTC (rev 12191)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc	2019-02-22 15:46:06 UTC (rev 12192)
@@ -58,7 +58,6 @@
     void OrxoKart::tick(float dt)
     { 
         SUPER(OrxoKart, tick, dt);
-
         if(this->firstTick_ && this->origin_)
         {
             this->firstTick_ = false;
@@ -143,11 +142,9 @@
             OrxoKartFlag* flag = new OrxoKartFlag(origin_->getContext());
             flag->init(n, s);
             flag_ = flag;
-            
 
+             
 
-            
-
         } //firsttick end
         
         if (wayPointCounter >= 3)
@@ -183,12 +180,11 @@
             player->setAcceleration(Vector3(0,0,0));
             flag_->setCollided(false); 
             wayPointCounter = 0;
+
+            
+
         }
 
-        if (player && player->isBoosting()) {
-        	//orxout() << "Boosting" << endl;
-        	if(!numberOfShrooms) numberOfShrooms--;
-        }
         
     }
 }

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc	2019-02-21 14:46:15 UTC (rev 12191)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc	2019-02-22 15:46:06 UTC (rev 12192)
@@ -85,13 +85,7 @@
     */
     void OrxoKartFlag::init(int n, int s)
     {
-        model_ = new Model(this->getContext());
-        model_->setMeshSource("OrxoKartMushroom.mesh");
-        model_->setScale3D(Vector3(s, s, s));
-        model_->setPosition(Vector3(s*n*0.5f,-0.0f, s*n*0.5f));
 
-        this->attach(model_);
-
         cs_ = new BoxCollisionShape(this->getContext());
         cs_->setHalfExtents(Vector3(s*n, 1, s*n));
         cs_->setPosition(Vector3(s*n*0.5f,-60.0f, s*n*0.5f));

Modified: code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc
===================================================================
--- code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc	2019-02-21 14:46:15 UTC (rev 12191)
+++ code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc	2019-02-22 15:46:06 UTC (rev 12192)
@@ -32,15 +32,10 @@
 #include "OrxoKartKart.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "KartController.h"
 namespace orxonox
 {
     RegisterClass(OrxoKartKart);
 
-    void ControllableEntity::rotateYaw(const Vector2& value)
-    {
-        orxout() << "TEST CONTROLlER" << endl;
-    }
 
     OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)
     {