Changeset 12074 for code/branches/OrxoKart_HS18/src/modules

Timestamp:

Nov 7, 2018, 10:14:37 AM (6 years ago)

Author:

ottka

Message:

makefile update

Location:

code/branches/OrxoKart_HS18/src/modules

Files:

• CMakeLists.txt (modified) (1 diff)
• orxokart/CMakeLists.txt (modified) (3 diffs)
• orxokart/OrxoKart.cc (modified) (5 diffs)
• orxokart/OrxoKart.h (modified) (1 diff)
• orxokart/OrxoKartOrigin.cc (modified) (1 diff)
• orxokart/OrxoKartOrigin.h (modified) (2 diffs)
• orxokart/TimeHUD.cc (modified) (4 diffs)
• orxokart/TimeHUD.h (modified) (3 diffs)

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

@@ -50 +50 @@
 ADD_SUBDIRECTORY(flappyorx)
 ADD_SUBDIRECTORY(orxyroad)
+ADD_SUBDIRECTORY(orxokart)

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

@@ -1 @@
-SET_SOURCE_FILES(Hover_SRC_FILES
+SET_SOURCE_FILES(OrxoKart_SRC_FILES
   OrxoKart.cc
   OrxoKartKart.cc
@@ -7 +7 @@
 )
 
-ORXONOX_ADD_LIBRARY(hover
+ORXONOX_ADD_LIBRARY(orxokart
   PLUGIN
   FIND_HEADER_FILES
@@ -14 +14 @@
     objects
     overlays
-  SOURCE_FILES ${Hover_SRC_FILES}
+  SOURCE_FILES ${OrxoKart_SRC_FILES}
 )

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

@@ -47 +47 @@
 
         this->origin_ = nullptr;
-        this->numberOfFlags_ = 1;
+        // this->numberOfFlags_ = 1;
         this->firstTick_ = true;
 
-        this->nullptr
+        this->setHUDTemplate("HoverHUD");
     }
 
@@ -65 +65 @@
             int cellHeight = this->origin_->getCellHeight();
 
-            MazeGenerator generator(numCells);
-            generator.generateMaze();
-            generator.renderMaze();
-            int levelcodeArray[] = {1,1,1,1,1,1,1,1,0,0,0
+            int levelcodeArray[] =  {1,1,1,1,1,1,1,1,0,0,0
                                     ,1,0,0,0,0,0,0,1,1,1,0
                                     ,1,0,1,1,1,1,0,0,0,1,1
@@ -79 +76 @@
                                     ,0,0,0,0,1,0,0,0,0,0,1
                                     ,0,0,0,0,1,1,1,1,1,1,1};
-            //int* levelcode = generator.getLevelcode();
             int* levelcode = levelcodeArray;
 
@@ -106 +102 @@
 
         }//firsttick end
-
+            /*
         // Check if ship collided with one of the flags
         for ( unsigned int i = 0; i < flags_.size(); i++ ){
@@ -114 +110 @@
             }
         }
-        numberOfFlags_ = flags_.size();
+        numberOfFlags_ = flags_.size(); */
         
     }

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

@@ -60 +60 @@
         private:
             WeakPtr<OrxoKartOrigin> origin_;
-            std::vector<OrxoKartFlag*> flags_;
-            int numberOfFlags_;
+            //std::vector<OrxoKartFlag*> flags_;
+            //int numberOfFlags_;
             bool firstTick_;
     };

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

@@ -53 +53 @@
         XMLPortParam(OrxoKartOrigin, "numCells", setNumCells, getNumCells, xmlelement, mode);
         XMLPortParam(OrxoKartOrigin, "cellSize", setCellSize, getCellSize, xmlelement, mode);
-        XMLPortParam(OrxoKartOrigin, "mapMatrix", setMapMatrix, getMapMatrix, xmlelement, mode);
+        XMLPortParam(OrxoKartOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
     }
 

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

@@ -61 +61 @@
                 { return this->cellSize_; }
 
-            inline void setMapMatrix(int mapMatrix)
-                { this->mapMatrix_ = mapMatrix; }
-            inline int getMapMatrix() const
-                { return this->mapMatrix_; }
+            inline void setCellHeight(int cellHeight)
+                { this->cellHeight_ = cellHeight; }
+            inline int getCellHeight() const
+                { return this->cellHeight_; }
 
         private:
@@ -71 +71 @@
             int numCells_;
             int cellSize_;
-            int mapMatrix_;
+            int cellHeight_;
     };
 }

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

@@ -35 +35 @@
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
-#include "Hover.h"
+#include "OrxoKart.h"
 
 namespace orxonox
@@ -47 +47 @@
         this->time_ = 0.0f;
         this->running_ = false;
-        this->hoverGame_ = nullptr;
+        this->orxokartGame_ = nullptr;
         setRunning(true);
     }
@@ -79 +79 @@
             this->time_ += dt;
         }
-        if (this->hoverGame_)
+        if (this->orxokartGame_)
         {
             this->setCaption(getTimeString(this->time_));
-            if (this->hoverGame_->getNumberOfFlags() == 0)
-                setRunning(false);
+            //if (this->orxokartGame_->getNumberOfFlags() == 0)
+              //  setRunning(false);
         }
         
@@ -94 +94 @@
         if (this->getOwner() && this->getOwner()->getGametype())
         {
-            this->hoverGame_ = orxonox_cast<Hover*>(this->getOwner()->getGametype());
+            this->orxokartGame_ = orxonox_cast<OrxoKart*>(this->getOwner()->getGametype());
         }
         else
         {
-            this->hoverGame_ = nullptr;
+            this->orxokartGame_ = nullptr;
         }
     }

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

@@ -33 +33 @@
 #define _TimeHUD_H__
 
-#include "HoverPrereqs.h"
+#include "OrxoKartPrereqs.h"
 
 #include "tools/interfaces/Tickable.h"
@@ -40 +40 @@
 namespace orxonox
 {
-    class _HoverExport TimeHUD : public OverlayText, public Tickable
+    class _OrxoKartExport TimeHUD : public OverlayText, public Tickable
     {
         public:
@@ -58 +58 @@
 
         private:
-            Hover* hoverGame_;
+            OrxoKart* orxokartGame_;
             float time_;
             bool running_;