Changeset 11970

Timestamp:

May 17, 2018, 2:48:18 PM (7 years ago)

Author:

sehirsch

Message:

Updated traffic objects, changed scenery

Location:

code/branches/OrxyRoad_FS18

Files:

• data/levels/OrxyRoad.oxw (modified) (3 diffs)
• data/levels/templates/OrxyRoadPattern.oxt (modified) (1 diff)
• src/modules/orxyroad/OrxyRoad.cc (modified) (1 diff)

code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw

@@ -30 +30 @@
   <Scene
     ambientlight = "1.0, 1.0, 1.0"
-    skybox       = "Orxonox/skyBoxClouds"
+    skybox       = "Orxonox/Starbox"
     negativeWorldRange = "-100000, -100000, -100000"
     positiveWorldRange = " 100000,  100000,  100000"
@@ -50 +50 @@
     <OrxyRoadCenterPoint name=invadercenter />
   
+  <!--
+
   <StaticEntity position="0,-50,0" direction="0,0,0"   scale="1" collisionType=static mass=1 friction=0.01 >
       <attached>
@@ -61 +63 @@
   </StaticEntity>
     
-    
+  -->
     
     

code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt

@@ -90 +90 @@
 
 </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>
+
+
+

code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc

@@ -108 +108 @@
                         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
 
                         }