Changeset 12090 for code/branches

Timestamp:

Nov 7, 2018, 11:52:40 AM (6 years ago)

Author:

ottka

Message:

clean up of module

Location:

code/branches/OrxoKart_HS18

Files:

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

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

@@ -13 +13 @@
 
 <?lua
-  --include("templates/spaceshipPirate.oxt")
   include("templates/OrxoKartKart.oxt")
   include("overlays/OrxoKartHUD.oxo")
@@ -19 +18 @@
 
 <?lua
-MAZE_NUM_CELLS = 10
-MAZE_CELL_SIZE = 100
-MAZE_CELL_HEIGHT = 30
-MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
 --number of tiles
 N = 11
@@ -48 +43 @@
     <StaticEntity position="0,0,0" collisionType="static">
       <attached>
-        <!-- Walls and flags (physics and design)-->
-        <!--
-        <HoverOrigin
-        -->
+        <!-- Floor Physique and Design -->
         <OrxoKartOrigin
-
           numCells="<?lua print(N)?>"
           cellSize="<?lua print(S)?>"
-          cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
         />
-        
+      </attached> 
 
-        <!-- floor design -->
-        <!--
-        <Model
-          position="<?lua print((N-1)*S/2)?>,0,<?lua print((N-1)*S/2)?>"
-
-          scale3D="<?lua print(S)?>,8,<?lua print(S)?>"
-          mesh="teststrecke.mesh"
-        />
-      -->
-        
-      </attached> 
       <collisionShapes>
-        <!-- roof physics -->
-        <!--
-        <BoxCollisionShape
-          position="<?lua print(MAZE_SIZE/2)?>,<?lua print(MAZE_CELL_HEIGHT+1)?>,<?lua print(MAZE_SIZE/2)?>"
-          halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
-        />
-      -->
-        <!-- floor physics -->
-
-
-
-
-
-
-
-
-        <!--
-        <BoxCollisionShape
-          position="<?lua print((N-1)*S/2)?>,-1,<?lua print((N-1)*S/2)?>"
-          halfExtents="<?lua print(S*N/2)?>,1,<?lua print(S*N/2)?>"
-        />  
-
-      -->
+        <!-- in case of additional collisionShapes besides the floor -->
       </collisionShapes>
 
     </StaticEntity>
-
     <Light
       type=directional

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

@@ -63 +63 @@
             int n = this->origin_->getNumCells();
             int s = this->origin_->getCellSize();
-            int cellHeight = this->origin_->getCellHeight();
 
             int levelcodeArray[] =  {1,1,1,1,1,1,1,1,0,0,0
@@ -76 +75 @@
                                     ,0,0,0,0,1,0,0,0,0,0,1
                                     ,0,0,0,0,1,1,1,2,1,1,1};
-            int* levelcode = levelcodeArray;
 
 

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, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
     }
 

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

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

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

@@ -73 +73 @@
         Initializes a OrxoKartTile
     @param x
-        x-Coordinate of the Square that the Wall is attached to, 0-9, Origin is Bottom left
+        x-Coordinate of the center of the Tile
     @param y
-        y-Coordinate of the Square that the Wall is attached to, 0-9, Origin is Bottom left
-    @param cellSize
-        The size of a cell
-    @param cellHeight
-        The height of a cell
-    @param orientation
-            Wall on the right side (1) or on top (2) of this square, 0-1        
+        z-Coordinate of the center of the Tile
+    @param s
+        scaling factor of the map
+    @param type
+        type of tile. 1 for normal tile, 2 for Start/End tile      
     */
     void OrxoKartTile::init(int x, int z, int s, int type)
     {
+        // floor design according to its type
         model_ = new Model(this->getContext());
         if (type == 1) {
@@ -97 +96 @@
         this->attach(model_);
 
+
+        //floor physics
         cs_ = new BoxCollisionShape(this->getContext());
         cs_->setHalfExtents(Vector3(s/2.0f, 1.0f, s/2.0f));
@@ -102 +103 @@
 
         this->attachCollisionShape(cs_);
-
-        /*
-
-        int xSize_, zSize_, xPos_, zPos_;
-
-        if(orientation == 1){
-            xSize_ = cellSize/2;
-            zSize_ = 2;
-            zPos_ = x*cellSize;
-            xPos_ = y*cellSize-cellSize/2;
-        }
-        else{
-            xSize_ = 2;
-            zSize_ = cellSize/2;
-            zPos_ = x*cellSize-cellSize/2;
-            xPos_ = y*cellSize;
-        }
-
-
-        model_ = new Model(this->getContext());
-        model_->setMeshSource("CuboidBody.mesh");
-        model_->setScale3D(Vector3(xSize_*1.0f, cellHeight*1.0f, zSize_*1.0f));
-        model_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
-
-        this->attach(model_);
-
-        cs_ = new BoxCollisionShape(this->getContext());
-        cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*1.0f, zSize_*1.0f));
-        cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
-
-        this->attachCollisionShape(cs_);
-        */
     }
 }