Changeset 12089 for code/branches/OrxoKart_HS18/src

Timestamp:

Nov 7, 2018, 11:42:26 AM (6 years ago)

Author:

ottka

Message:

implement module

Location:

code/branches/OrxoKart_HS18/src/modules/orxokart

Files:

• OrxoKart.cc (modified) (2 diffs)
• OrxoKartTile.cc (modified) (2 diffs)
• OrxoKartTile.h (modified) (1 diff)

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

@@ -61 +61 @@
             this->firstTick_ = false;
 
-            int numCells = this->origin_->getNumCells();
-            int cellSize = this->origin_->getCellSize();
+            int n = this->origin_->getNumCells();
+            int s = this->origin_->getCellSize();
             int cellHeight = this->origin_->getCellHeight();
 
@@ -75 +75 @@
                                     ,1,1,1,1,1,0,0,0,1,1,1
                                     ,0,0,0,0,1,0,0,0,0,0,1
-                                    ,0,0,0,0,1,1,1,1,1,1,1};
+                                    ,0,0,0,0,1,1,1,2,1,1,1};
             int* levelcode = levelcodeArray;
 
-            //Outer Walls
-            for(int i = 0; i<numCells; i++){
-                (new OrxoKartTile(origin_->getContext()))->init(0,        i+1,      cellSize, cellHeight, 1);
-                (new OrxoKartTile(origin_->getContext()))->init(numCells, i+1,      cellSize, cellHeight, 1);
-                (new OrxoKartTile(origin_->getContext()))->init(i+1,      0,        cellSize, cellHeight, 2);
-                (new OrxoKartTile(origin_->getContext()))->init(i+1,      numCells, cellSize, cellHeight, 2);
-            }
 
-            //Generate inner Walls according to levelcode
-            for(int y=0; y<numCells; y++){
-                for(int x=0; x<numCells; x++){
-                    switch(levelcode[ y * numCells + x ]){
-                        case 1: (new OrxoKartTile(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                                break;
-                        case 3: (new OrxoKartTile(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                        case 2: (new OrxoKartTile(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
-                        default: break;
-                    }
+            //Generate floor according to levelcode
+            for(int i=0; i<n; i++){
+                for(int j=0; j<n; j++){
+                    if (int type = levelcodeArray[i*n + j])
+                    (new OrxoKartTile(origin_->getContext()))->init((n-1-i)*s, j*s, s, type);
                 }   
             }

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

@@ -83 +83 @@
             Wall on the right side (1) or on top (2) of this square, 0-1        
     */
-    void OrxoKartTile::init(int x, int y, int cellSize, int cellHeight, int orientation)
+    void OrxoKartTile::init(int x, int z, int s, int type)
     {
+        model_ = new Model(this->getContext());
+        if (type == 1) {
+           model_->setMeshSource("OrxoKartStreckenabschnitt.mesh"); 
+        }
+        else if (type == 2 ) {
+            model_->setMeshSource("OrxoKartStreckenabschnittZiel.mesh");
+        }
+        model_->setScale3D(Vector3(s*1.0f, 8.0f, s*1.0f));
+        model_->setPosition(Vector3(x*1.0f, 0.0f, z*1.0f));
+
+        this->attach(model_);
+
+        cs_ = new BoxCollisionShape(this->getContext());
+        cs_->setHalfExtents(Vector3(s/2.0f, 1.0f, s/2.0f));
+        cs_->setPosition(Vector3(x*1.0f, -1.0f, z*1.0f));
+
+        this->attachCollisionShape(cs_);
+
+        /*
+
         int xSize_, zSize_, xPos_, zPos_;
 
@@ -113 +133 @@
 
         this->attachCollisionShape(cs_);
+        */
     }
 }

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

@@ -49 +49 @@
             virtual ~OrxoKartTile();
 
-            void init(int x, int y, int cellSize, int cellHeight, int orientation);
+            void init(int x, int z, int s, int type);
 
         private: