Changeset 12168 for code/branches

Timestamp:

Dec 7, 2018, 4:40:29 PM (6 years ago)

Author:

emustafa

Message:

still on controlls

Location:

code/branches/OrxoKart_HS18

Files:

• data/levels/templates/OrxoKartKart.oxt (modified) (3 diffs)
• data/tcl/orxokart_highscores.txt (modified) (1 diff)
• src/modules/orxokart/KartController.h (modified) (1 diff)
• src/modules/orxokart/OrxoKart.cc (modified) (2 diffs)
• src/modules/orxokart/OrxoKartKart.cc (modified) (2 diffs)

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

@@ -31 +31 @@
 
    collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.2
-   angularDamping    = 0.9999999
+   mass              = 2000
+   linearDamping     = 0.5
+   angularDamping    = 0.999
   >
     <engines>
@@ -40 +40 @@
     <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>
@@ -57 +55 @@
       <ExplosionPart mesh="explosionparts/pirate_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     </explosion>
-
-<?lua
-  include("../includes/weaponSettingsHover.oxi")
-?>
   </SpaceShip>
 </Template>

code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt

@@ -14 +14 @@
 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

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

@@ -34 +34 @@
 
 #include "OrxoKartPrereqs.h"
-
 #include "controllers/HumanController.h"
 

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

@@ -163 +163 @@
         }
         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)
@@ -187 +187 @@
 
         if (player && player->isBoosting()) {
-                orxout() << "Boosting" << endl;
+                //orxout() << "Boosting" << endl;
                 if(!numberOfShrooms) numberOfShrooms--;
         }

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"
-
+#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();
     }
 
@@ -66 +67 @@
     void OrxoKartKart::rotateYaw(const Vector2& value)
         {
+            
             this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);  
         }