[Orxonox-commit 7358] r11975 - in code/branches/OrxyRoad_FS18: data/levels data/levels/templates src/modules/orxyroad
sehirsch at orxonox.net
sehirsch at orxonox.net
Thu May 17 16:10:30 CEST 2018
Author: sehirsch
Date: 2018-05-17 16:10:30 +0200 (Thu, 17 May 2018)
New Revision: 11975
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:
Added more traffic objects
Modified: code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw
===================================================================
--- code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw 2018-05-17 14:04:14 UTC (rev 11974)
+++ code/branches/OrxyRoad_FS18/data/levels/OrxyRoad.oxw 2018-05-17 14:10:30 UTC (rev 11975)
@@ -48,25 +48,7 @@
<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" />
- </attached>
-
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="1,1,1" />
- </collisionShapes>
-
- </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 14:04:14 UTC (rev 11974)
+++ code/branches/OrxyRoad_FS18/data/levels/templates/OrxyRoadPattern.oxt 2018-05-17 14:10:30 UTC (rev 11975)
@@ -92,34 +92,49 @@
-<Template name=spacecruiser>
+<Template name=spaceshuttle>
- <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" roll=90 pitch=-90 collisionType=dynamic mass=1 friction=0.01 >
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" roll=0 pitch=0 collisionType=dynamic mass=1 friction=0.01 >
<attached>
- <Model position="0,0,0" mesh="spacecruiser.mesh" scale="10" />
+ <Model position="0,0,0" mesh="Transporterspaceship.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 />
+ <BoxCollisionShape position=" 0, 0, 20" halfExtents=" 37, 25, 80" />
+ <BoxCollisionShape position=" 0, 21, 20" halfExtents=" 37, 21, 80" />
+ <BoxCollisionShape position=" 0, 40, 110" halfExtents=" 20, 10, 40" />
+ <BoxCollisionShape position=" 0, 45, 170" halfExtents=" 33, 25, 20" />
+ <BoxCollisionShape position=" -60, 33, 0" halfExtents=" 24, 16, 120" />
+ <BoxCollisionShape position=" 60, 33, 0" halfExtents=" 24, 16, 120" />
+ <BoxCollisionShape position=" 0, 10, -90" halfExtents=" 30, 25, 30" />
+ <BoxCollisionShape position=" 0, -3, -145" halfExtents=" 20, 20, 30" />
+ </collisionShapes>
+ </OrxyRoadCube>
- scale="10"
+</Template>
+
+
+<Template name=asteroid1>
+
+ <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>
-<Template name=asteroid>
+
+
+<Template name=asteroid2>
<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" />
+ <Model position="0,0,0" mesh="ast2.mesh" scale="50" />
</attached>
<collisionShapes>
<SphereCollisionShape radius="30" />
@@ -130,3 +145,18 @@
+<Template name=satellite>
+
+ <OrxyRoadCube position="0,0,0" direction="0,0,0" scale="1" collisionType=dynamic mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" yaw="90" pitch="-90" roll="0" scale="30" mesh="satellite.mesh" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="30,30,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 14:04:14 UTC (rev 11974)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoad.cc 2018-05-17 14:10:30 UTC (rev 11975)
@@ -116,16 +116,16 @@
{
case 0 :
if(templateType >=1){
- cube->addTemplate("asteroid");//default
+ cube->addTemplate("asteroid1");//default
}else {
- cube->addTemplate("asteroid");//default
+ cube->addTemplate("satellite");//default
}
break;
case 1:
if(templateType >=1){
- cube->addTemplate("asteroid");//spaceship1
+ cube->addTemplate("spaceshuttle");//spaceship1
}else {
- cube->addTemplate("spacecruiser");//spaceship2
+ cube->addTemplate("spaceshuttle");//spaceship2
}
@@ -132,9 +132,9 @@
break;
case 2:
if(templateType >=1){
- cube->addTemplate("asteroid");//satellite
+ cube->addTemplate("satellite");//satellite
}else {
- cube->addTemplate("spacecruiser");//satellite
+ cube->addTemplate("satellite");//satellite
}
@@ -141,9 +141,9 @@
break;
case 3:
if(templateType >=1){
- cube->addTemplate("asteroid");//asteroid
+ cube->addTemplate("asteroid1");//asteroid
}else {
- cube->addTemplate("spacecruiser");//asteroid
+ cube->addTemplate("asteroid2");//asteroid
}
More information about the Orxonox-commit
mailing list