[Orxonox-commit 6129] r10787 - in code/branches/hoverHS15: data/levels src/modules/hover

[meierman at orxonox.net]

Author: meierman
Date: 2015-11-09 15:54:40 +0100 (Mon, 09 Nov 2015)
New Revision: 10787

Modified:
   code/branches/hoverHS15/data/levels/Hover.oxw
   code/branches/hoverHS15/src/modules/hover/Hover.cc
   code/branches/hoverHS15/src/modules/hover/HoverWall.cc
Log:
programm wall placement works

Modified: code/branches/hoverHS15/data/levels/Hover.oxw
===================================================================
--- code/branches/hoverHS15/data/levels/Hover.oxw	2015-11-09 14:51:17 UTC (rev 10786)
+++ code/branches/hoverHS15/data/levels/Hover.oxw	2015-11-09 14:54:40 UTC (rev 10787)
@@ -28,7 +28,7 @@
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
-    gravity      = "0, -35, 0"
+    gravity      = "0, -40, 0"
   >
  
 
@@ -61,7 +61,7 @@
   </StaticEntity>
 
 
-    <MovableEntity>
+    <MovableEntity position="0,0,0">
       <attached>
         <HoverOrigin>
 

Modified: code/branches/hoverHS15/src/modules/hover/Hover.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/Hover.cc	2015-11-09 14:51:17 UTC (rev 10786)
+++ code/branches/hoverHS15/src/modules/hover/Hover.cc	2015-11-09 14:54:40 UTC (rev 10787)
@@ -40,6 +40,21 @@
 namespace orxonox
 {
     bool firstTick = true;
+    int levelcode[10][10] =
+        {
+        { 0,0,0,0,0,0,0,0,0,0 }, // row 0
+        { 1,0,0,0,0,0,0,0,0,0 }, // row 0
+        { 1,0,0,0,0,0,0,0,0,0 }, // row 0
+        { 1,1,3,0,1,3,0,0,0,0 }, // row 0
+        { 1,0,3,2,3,2,0,0,0,0 }, // row 0
+        { 1,0,1,0,1,0,0,0,0,0 }, // row 0
+        { 1,2,2,0,0,0,0,0,0,0 }, // row 0
+        { 1,0,0,0,0,0,0,0,0,0 },  // row 0
+        { 1,0,0,0,0,0,0,0,1,0 },// row 1
+        { 1,0,0,0,0,0,0,1,2,0 } // row 2
+        };
+
+
     RegisterUnloadableClass(Hover);
 
     Hover::Hover(Context* context) : Gametype(context)
@@ -55,11 +70,33 @@
     {
         SUPER(Hover, tick, dt);
 
+
+
+
         if(firstTick)
         {
             firstTick = false;
-            new HoverWall(origin_->getContext(), 1, 2, 1);
-            new HoverWall(origin_->getContext(), 2, 6, 1);
+
+            for(int y=0; y<10; y++){
+                for(int x=0; x<10; x++){
+
+                    switch(levelcode[y][x]){
+                        case 1: new HoverWall(origin_->getContext(), x+1, 10-y, 1);
+                                break;
+                        case 3: new HoverWall(origin_->getContext(), x+1, 10-y, 1);
+                        case 2: new HoverWall(origin_->getContext(), x+1, 10-y, 0);
+                        default: break;
+                    }
+
+
+                    
+                }   
+            }
+
+
+            
+            //new HoverWall(origin_->getContext(), 1, 1, 1);
+            //new HoverWall(origin_->getContext(), 1, 1, 0);
         }      
 
 

Modified: code/branches/hoverHS15/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverWall.cc	2015-11-09 14:51:17 UTC (rev 10786)
+++ code/branches/hoverHS15/src/modules/hover/HoverWall.cc	2015-11-09 14:54:40 UTC (rev 10787)
@@ -62,14 +62,14 @@
         if(orientation == 1){
             xSize_ = 50;
             zSize_ = 2;
-            xPos_ = x*100;
-            zPos_ = y*100-50;
+            zPos_ = x*100;
+            xPos_ = y*100 -50;
         }
         else{
             xSize_ = 2;
             zSize_ = 50;
-            xPos_ = x*100-50;
-            zPos_ = y*100;
+            zPos_ = x*100-50;
+            xPos_ = y*100;
         }