[Orxonox-commit 7353] r11970 - in code/branches/OrxyRoad_FS18: data/levels data/levels/templates src/modules/orxyroad

[sehirsch at orxonox.net]

Author: sehirsch
Date: 2018-05-17 14:48:18 +0200 (Thu, 17 May 2018)
New Revision: 11970

Modified:
   code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
   code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt
   code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
Log:
Updated traffic objects, changed scenery

Modified: code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw	2018-05-17 12:45:14 UTC (rev 11969)
+++ code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw	2018-05-17 12:48:18 UTC (rev 11970)
@@ -29,7 +29,7 @@
 
   <Scene
     ambientlight = "1.0, 1.0, 1.0"
-    skybox       = "Orxonox/skyBoxClouds"
+    skybox       = "Orxonox/Starbox"
     negativeWorldRange = "-100000, -100000, -100000"
     positiveWorldRange = " 100000,  100000,  100000"
   >
@@ -49,6 +49,8 @@
 
     <OrxyRoadCenterPoint name=invadercenter />
   
+  <!--
+
   <StaticEntity position="0,-50,0" direction="0,0,0"   scale="1" collisionType=static mass=1 friction=0.01 >
       <attached>
         <Model position="0,0,0" mesh="plane.mesh" scale3D="100000,0,100000" />
@@ -60,11 +62,11 @@
 
   </StaticEntity>
     
+  -->
     
     
     
     
-    
   </Scene>
 </Level>
 

Modified: code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt	2018-05-17 12:45:14 UTC (rev 11969)
+++ code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt	2018-05-17 12:48:18 UTC (rev 11970)
@@ -88,4 +88,45 @@
       </collisionShapes>
 	</OrxyRoadCube>
 
-</Template>
\ No newline at end of file
+</Template>
+
+
+
+<Template name=spacecruiser>
+
+	<OrxyRoadCube position="0,0,0" direction="0,0,0"   scale="1" roll=90 pitch=-90  collisionType=dynamic mass=1 friction=0.01 >
+      <attached>
+        <Model position="0,0,0" 		mesh="spacecruiser.mesh" 		scale="10" 	/>
+		
+      </attached>
+      <collisionShapes>
+      <BoxCollisionShape position="0,-5,2"     halfExtents="38,6,62" />
+      <BoxCollisionShape position="0,5,2"      halfExtents="20,6,40" />
+      <BoxCollisionShape position="-16,-10,-2" halfExtents="15,5,57" roll=-14 pitch=3.5 />
+      <BoxCollisionShape position="16,-10,-2"  halfExtents="15,5,57" roll=14  pitch=3.5 />
+      <BoxCollisionShape position="19,3.5,2"   halfExtents="18,5,52" roll=-21 />
+      <BoxCollisionShape position="-19,4.5,2"  halfExtents="18,5,52" roll=21  />
+      <BoxCollisionShape position="0,4,-59"    halfExtents="18,1,16" pitch=-30 />
+
+      scale="10"
+
+    </collisionShapes>
+	</OrxyRoadCube>
+
+</Template>
+
+<Template name=asteroid>
+	
+	<OrxyRoadCube position="0,0,0" direction="0,0,0"   scale="1" collisionType=dynamic mass=1 friction=0.01 >
+	<attached>
+      <Model position="0,0,0" 		mesh="ast1.mesh" 		scale="50" 	/>
+    </attached>
+    <collisionShapes>
+      <SphereCollisionShape radius="30" />
+    </collisionShapes>
+	</OrxyRoadCube>
+
+</Template>
+
+
+

Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-05-17 12:45:14 UTC (rev 11969)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc	2018-05-17 12:48:18 UTC (rev 11970)
@@ -107,16 +107,16 @@
                         cubeList.push_back(cube);
                         switch(type)
                         {
-                        case 0 : cube->addTemplate("SingleOrxyRoadCube");//default
+                        case 0 : cube->addTemplate("asteroid");//default
                         break;
                         case 1:
                         
-                        cube->addTemplate("SingleOrxyRoadCube");//spaceship
+                        cube->addTemplate("spacecruiser");//spaceship
 
                         break;
-                        case 2: cube->addTemplate("SingleOrxyRoadCube");//satellite
+                        case 2: cube->addTemplate("spacecruiser");//satellite
                         break;
-                        case 3: cube->addTemplate("SingleOrxyRoadCube");//asteroid
+                        case 3: cube->addTemplate("asteroid");//asteroid
 
                         }