Changeset 12128

Timestamp:

Nov 28, 2018, 12:06:14 PM (6 years ago)

Author:

ottka

Message:

Make two levels and more

Location:

code/branches/OrxoKart_HS18

Files:

• data/levels/OrxoKart1.oxw (modified) (3 diffs)
• src/modules/orxokart/OrxoKart.cc (modified) (7 diffs)
• src/modules/orxokart/OrxoKart.h (modified) (2 diffs)
• src/modules/orxokart/OrxoKartTile.cc (modified) (3 diffs)
• src/modules/orxokart/OrxoKartTile.h (modified) (1 diff)
• src/modules/orxokart/TimeHUD.cc (modified) (2 diffs)
• src/modules/orxokart/TimeHUD.h (modified) (2 diffs)

code/branches/OrxoKart_HS18/data/levels/OrxoKart1.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "OrxoKart"
- description = "Level for Minigame OrxoKart"
+ name = "OrxoKart Level 1"
+ description = "Level 1 of Minigame OrxoKart"
  tags = "minigame"
  screenshot = "emptylevel.png"
@@ -20 +20 @@
 --number of tiles
 N = 11
--- or 25
 --scaling factor
 S = 80
+--level
+L = 1
 
 MAP_ORIGIN = "0,0,0"
@@ -48 +49 @@
           numCells="<?lua print(N)?>"
           cellSize="<?lua print(S)?>"
-          level=1
+          level="<?lua print(L)?>"
         />
       </attached> 
 
       <collisionShapes>
+        
+        
         <!-- in case of additional collisionShapes besides the floor -->
       </collisionShapes>

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

@@ -48 +48 @@
 
         this->origin_ = nullptr;
-        this->numberOfFlags_ = 1;
+        this->raceFinished = false;
         this->firstTick_ = true;
 
@@ -108 +108 @@
             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
@@ -114 +120 @@
                     if (int type = levelcodeArray[i*n + j]) {
                         OrxoKartTile* tile = new OrxoKartTile(origin_->getContext());
-                        tile->init((n-1-i)*s, j*s, s, type);
+                        tile->init((n-1-i)*s, j*s, s, 0, type);
                         // tiles.push_back(tile);
                         //++z;
                         if (level == 1) {
                             //map 1 
-                            if ( i == 10 && j == 4 )
+                            if ( i == 9 && j == 4 )
                                 wayPoints.at(0) = tile;
 
-                            if ( i == 0 && j == 0) 
+                            if ( i == 0 && j == 1) 
                                 wayPoints.at(1) = tile;
                             if ( i == 10 && j == 7)
@@ -129 +135 @@
                         else if (level == 2) {
                             //map 2
-                            if ( i == 24 && j == 11 )
+                            if ( i == 23 && j == 11 )
                                 wayPoints.at(0) = tile;
 
-                            if ( i == 0 && j == 0) 
+                            if ( i == 0 && j == 1) 
                                 wayPoints.at(1) = tile;
                             if ( i == 24 && j == 17)
@@ -151 +157 @@
 
         } //firsttick end
-        /*
-        for (std::vector<OrxoKartTile*>::iterator it = tiles.begin(); it != tiles.end(); ++it ) {
-            if ((*it)->getCollided())
-                tiles.erase(it);
-        }
-        if (tiles.empty())
-            numberOfFlags_ = 0;
-        */
+        
         if (wayPointCounter >= 3)
-            numberOfFlags_ = 0;
+            raceFinished = true;
+
         else if (wayPointCounter < 3 && wayPointCounter >= 0 && wayPoints.at(wayPointCounter) != nullptr) {
             if (wayPoints.at(wayPointCounter)->getCollided()) {
@@ -183 +183 @@
                 player->setPosition(Vector3(s*0, 20, s*8));
             if (level == 2)
-                player->setPosition(Vector3(s*0, 20, s*19));
+                player->setPosition(Vector3(s*0, 20, s*18));
             player->setOrientation(Quaternion(1, 0, 0, 0));   // 0, 0, 0
             player->setVelocity(Vector3(0,0,0));
@@ -190 +190 @@
             wayPointCounter = 0;
 
-
-            // flag_->destroyLater();
-           // flags_.erase (flags_.begin()+i);
-            //numberOfFlags_ = 0;
         }
         

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

@@ -55 +55 @@
                 { this->origin_ = origin; }
 
-            inline int getNumberOfFlags() const
-                { return this->numberOfFlags_; }
+            inline int getRaceFinished() const
+                { return this->raceFinished; }
 
         private:
@@ -65 +65 @@
             std::vector<OrxoKartTile*> wayPoints;
             int wayPointCounter = 0;
-            int numberOfFlags_;
+            bool raceFinished;
             bool firstTick_;
 

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

@@ -81 +81 @@
         type of tile. 1 for normal tile, 2 for Start/End tile      
     */
-    void OrxoKartTile::init(int x, int z, int s, int type)
+    void OrxoKartTile::init(int x, int z, int s, float r, int type)
     {
         // floor design according to its type
@@ -93 +93 @@
         model_->setScale3D(Vector3(s*1.0f, 8.0f, s*1.0f));
         model_->setPosition(Vector3(x*1.0f, 0.0f, z*1.0f));
+        model_->pitch(Degree(r));
 
         this->attach(model_);
@@ -101 +102 @@
         cs_->setHalfExtents(Vector3(s/2.0f, 1.0f, s/2.0f));
         cs_->setPosition(Vector3(x*1.0f, -1.0f, z*1.0f));
+        cs_->pitch(Degree(r));
 
         this->attachCollisionShape(cs_);

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

@@ -50 +50 @@
             virtual ~OrxoKartTile();
 
-            void init(int x, int z, int s, int type);
+            void init(int x, int z, int s, float r, int type);
 
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;

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

@@ -32 +32 @@
 
 #include "TimeHUD.h"
+
+#include <iostream>
+#include <fstream>
+#include "Highscore.h"
 
 #include "core/CoreIncludes.h"
@@ -82 +86 @@
         {
             this->setCaption(getTimeString(this->time_));
-            if (this->orxokartGame_->getNumberOfFlags() == 0)
+            if (this->orxokartGame_->getRaceFinished()) {
                 setRunning(false);
+                if (!score_set) {
+                    std::ofstream highscoreFile;
+                    highscoreFile.open("orxokart_highscores.txt", std::ios::app);
+                    highscoreFile << "Name: " << getTimeString(this->time_) << std::endl;
+                    highscoreFile.close();
+                    score_set = true;
+                }
+            }
         }
         

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

@@ -34 +34 @@
 
 #include "OrxoKartPrereqs.h"
+#include <iostream>
+#include <fstream>
 
 #include "tools/interfaces/Tickable.h"
@@ -61 +63 @@
             float time_;
             bool running_;
+            bool score_set = false;
     };
 }