Changeset 12144 for code/branches/OrxoKart_HS18/src

Timestamp:

Dec 5, 2018, 10:48:32 AM (6 years ago)

Author:

ottka

Message:

New HUDs and Start

Location:

code/branches/OrxoKart_HS18/src/modules/orxokart

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxoKart.cc (modified) (2 diffs)
• OrxoKart.h (modified) (2 diffs)
• OrxoKartPrereqs.h (modified) (1 diff)
• OrxoKartTile.cc (modified) (3 diffs)
• OrxoKartTile.h (modified) (1 diff)
• ShroomHUD.cc (added)
• ShroomHUD.h (added)

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

@@ -5 +5 @@
   OrxoKartOrigin.cc
   OrxoKartFlag.cc
+  ShroomHUD.cc
   TimeHUD.cc
 )

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

@@ -50 +50 @@
         this->raceFinished = false;
         this->firstTick_ = true;
+        this->numberOfShrooms = 3;
 
         this->setHUDTemplate("OrxoKartHUD");
@@ -181 +182 @@
             OrxoKartKart* player = flag_->getObjectofCollision();
             if (level == 1)
-                player->setPosition(Vector3(s*0, 20, s*8));
+                player->setPosition(Vector3(s*0, 20, s*8.5));
             if (level == 2)
-                player->setPosition(Vector3(s*0, 20, s*18));
+                player->setPosition(Vector3(s*0, 20, s*18.5));
             player->setOrientation(Quaternion(1, 0, 0, 0));   // 0, 0, 0
             player->setVelocity(Vector3(0,0,0));

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

@@ -57 +57 @@
             inline int getRaceFinished() const
                 { return this->raceFinished; }
+            inline int getNumberOfShrooms() const
+                { return this->numberOfShrooms; }   
 
         private:
@@ -68 +70 @@
             bool firstTick_;
 
+            int numberOfShrooms;
+
             int s;
             int n;

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

@@ -74 +74 @@
     class OrxoKartTile;
     class TimeHUD;
+    class ShroomHUD;
 }
 

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

@@ -48 +48 @@
         this->model_ = nullptr;
         this->cs_ = nullptr;
+        this->arc = nullptr;
 
         this->enableCollisionCallback();
@@ -66 +67 @@
             if (this->cs_)
                 this->cs_->destroy();
+            if (this->arc) 
+                this->arc->destroy();
         }
     }
@@ -90 +93 @@
         else if (type == 2 ) {
             model_->setMeshSource("OrxoKartStreckenabschnittZiel.mesh");
+
+            arc = new Model(this->getContext());
+            arc->setMeshSource("OrxoKartStartTor.mesh");
+            arc->setPosition(Vector3(x*1.0f, -1.0f, z*1.0f));
+            arc->setScale3D(Vector3(s*1.0f/10, s*1.0f/10, s*1.0f/10));
+            arc->yaw(Degree(-90));
+            this->attach(arc);
         }
         model_->setScale3D(Vector3(s*1.0f, 8.0f, s*1.0f));

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

@@ -65 +65 @@
         private:
             Model* model_;
+            Model* arc;
             BoxCollisionShape* cs_;
             bool collided_;