Changeset 12156 for code/branches

Timestamp:

Dec 5, 2018, 12:34:31 PM (6 years ago)

Author:

ottka

Message:

new commit

Location:

code/branches/OrxoKart_HS18/src/modules/orxokart

Files:

• OrxoKart.cc (modified) (4 diffs)
• OrxoKartFlag.cc (modified) (2 diffs)

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

@@ -51 +51 @@
         this->firstTick_ = true;
         this->numberOfShrooms = 3;
+        this->player = nullptr;
 
         this->setHUDTemplate("OrxoKartHUD");
@@ -105 +106 @@
                             0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,1,1,1,0,1,1,1};
 
-
-
             int *levelcodeArray =  level==1 ? map_1 : map_2;
-
-
-
-            //OrxoKartTile* tile = new OrxoKartTile(origin_->getContext());
-            //tile->init(0*s, 4*s, s, 20, 2);
-
-
             // int z = 0;
             //Generate floor according to levelcode
@@ -176 +168 @@
 
 
+                orxout() << numberOfShrooms << endl;
 
 
-        // Check if ship collided with the flag
+        // 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;
             player = flag_->getObjectofCollision();
             if (level == 1)
@@ -190 +184 @@
             flag_->setCollided(false); 
             wayPointCounter = 0;
+        }
 
+        if (player && player->isBoosting()) {
+                orxout() << "Boosting" << endl;
+                if(!numberOfShrooms) numberOfShrooms--;
         }
         

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

@@ -86 +86 @@
     void OrxoKartFlag::init(int n, int s)
     {
-        /*model_ = new Model(this->getContext());
-        model_->setMeshSource("OrxoKartStreckenabschnitt.mesh");
-        model_->setScale3D(Vector3(s*n*2, 1, s*n*2));
-        model_->setPosition(Vector3(s*n*0.5f,-60.0f, s*n*0.5f));
+        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_);*/
+        this->attach(model_);
 
         cs_ = new BoxCollisionShape(this->getContext());
@@ -98 +98 @@
 
         this->attachCollisionShape(cs_);
+
+
     }