[Orxonox-commit 5457] r10120 - in code/branches/weaponupdateHS14/data/levels: . templates
flsueess at orxonox.net
flsueess at orxonox.net
Wed Nov 12 16:04:45 CET 2014
Author: flsueess
Date: 2014-11-12 16:04:45 +0100 (Wed, 12 Nov 2014)
New Revision: 10120
Modified:
code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt
Log:
verschiedene Anpassungen
Modified: code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
===================================================================
--- code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw 2014-11-12 15:04:44 UTC (rev 10119)
+++ code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw 2014-11-12 15:04:45 UTC (rev 10120)
@@ -100,6 +100,7 @@
</collisionShapes>
</StaticEntity>
+
<!-- Docking I -->
<Dock position="2830,20,50" roll=0 yaw=0 >
<animations>
@@ -120,14 +121,14 @@
</events>
<attached>
- <!-- Trigger for docking with billboard -->
+ <!-- Trigger for docking with billboard -->
<Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
<DistanceTrigger position="0,0,0" distance="200" target="Pawn"
beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
/>
- <!-- Trigger for undocking with billboard -->
+ <!-- Trigger for undocking with billboard -->
<Billboard position="-2800,-20055,-700" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 />
<DistanceTrigger position="-2800,-20055,-700" distance="150" target="Pawn"
@@ -137,9 +138,11 @@
</Dock>
+
<!-- FPS Player as destination of the dock -->
- <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "172,-20000,-676" >
+ <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "500,-20000,0" >
+ <!--"500,-20000,0"-->
<attached>
<DistanceTriggerBeacon name="bcnDestroyer" />
<DockingTarget name="fistperson" />
@@ -257,25 +260,24 @@
Complex spacestations can be placed very far away from the spaceship so it is rendered at low resolution while the player uses the space ship.
-->
-<StaticEntity position="2800,-500,0" direction="0,0,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
-<attached>
-<Model position="0,0,0" mesh="cube.mesh" scale3D="50,50,50" />
+<!-- Hilfsobjekte fuer Koordinatensystem -->
-</attached>
-</StaticEntity>
-
<Model position="0,0,0" mesh="cube_red.mesh" scale3D="10000,10,10" />
<Model position="0,0,0" mesh="cube_green.mesh" scale3D="10,10000,10" />
<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10000" />
+<Model position="0,-100,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="-100,0,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="0,0,-100" mesh="cube_orange.mesh" scale3D="15,15,15" />
+
<Model position="0,-20000,0" mesh="cube_red.mesh" scale3D="10000,10,10" />
<Model position="0,-20000,0" mesh="cube_green.mesh" scale3D="10,10000,10" />
<Model position="0,-20000,0" mesh="cube.mesh" scale3D="10,10,10000" />
-<Model position="0,-20010,0" mesh="cube_blue.mesh" scale3D="11,11,11" />
-<Model position="-10,-20000,0" mesh="cube_blue.mesh" scale3D="11,11,11" />
-<Model position="0,-20000,-10" mesh="cube_blue.mesh" scale3D="11,11,11" />
+<Model position="0,-20100,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="-100,-20000,0" mesh="cube_orange.mesh" scale3D="15,15,15" />
+<Model position="0,-20000,-100" mesh="cube_orange.mesh" scale3D="15,15,15" />
<StaticEntity position="0,-20000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
@@ -283,7 +285,9 @@
<attached>
<Model template = "ss_flag_room" position="750,-16,703.5" />
- <Model template = "ss_tube" position="0,0,0" />
+ <!--<Model template = "ss_tube" position="0,0,0" />-->
+ <Model template = "ss_tube" position="500,0,0" />
+ <Model template = "ss_curve" position="0,0,0" yaw=0 />
<!-- <Model position="0,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
@@ -304,20 +308,24 @@
<Model position="300,50,0" roll=180 pitch=20 mesh="ss_chair.mesh" scale3D="20,20,20" />
<Model position="1000,50,0" roll=180 mesh="ss_wall.mesh" scale3D="20,20,20" />
<Model position="-830,20,0" roll=180 mesh="ss_flag_aean.mesh" scale3D="40,40,40" />
--->
- <!--Model mesh="cube.mesh" mass=10 position="0,-100,0" scale3D="5000,0.5,1000" yaw=0 />
+-->
+
+<!-- <Model mesh="cube.mesh" mass=10 position="0,-100,0" scale3D="5000,0.5,1000" yaw=0 />
<Model mesh="cube.mesh" mass=10 position="0,100,0" scale3D="2000,0.5,1000" yaw=0 />
<!--Model mesh="cube.mesh" mass=10 position="0,0,100" scale3D="5000,100,0.5" yaw=0 />
- <Model mesh="cube.mesh" mass=10 position="0,0,-100" scale3D="5000,100,0.5" yaw=0 /-->
+ <Model mesh="cube.mesh" mass=10 position="0,0,-100" scale3D="5000,100,0.5" yaw=0 />
</attached>
<collisionShapes>
- <!--BoxCollisionShape position="0,-100,0" halfExtents="5000,0,100" /-->
+ <BoxCollisionShape position="0,-100,0" halfExtents="5000,0,1000"/>
<BoxCollisionShape position="0,100,0" halfExtents="2000,0,1000" />
- <!--BoxCollisionShape position="0,0,100" halfExtents="5000,100,0" />
- <BoxCollisionShape position="0,0,-100" halfExtents="5000,100,0" /-->
+ <BoxCollisionShape position="0,0,100" halfExtents="5000,100,0" />
+ <BoxCollisionShape position="0,0,-100" halfExtents="5000,100,0" />
</collisionShapes>
+-->
+ </attached>
</StaticEntity>
+
<!--
-->
@@ -330,7 +338,7 @@
<!-- Homogenous gravitationfield to simulate local gravity (activating the normal gravity will affect the spaceship terribly) -->
-<ForceField position="0,-20000,0" mode="homogen" diameter="3000" forcedirection = "0,-500,0" />
+<ForceField position="0,-20200,0" mode="homogen" diameter="5000" forcedirection = "0,-500,0" />
Modified: code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt
===================================================================
--- code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt 2014-11-12 15:04:44 UTC (rev 10119)
+++ code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt 2014-11-12 15:04:45 UTC (rev 10120)
@@ -8,7 +8,7 @@
</Template>
-
+<!-- Spacestation Element Tube -->
<Template name=ss_tube>
<MovableEntity position="0,0,0">
@@ -16,12 +16,13 @@
<Model position="0,0,0" scale3D="100,100,100" mesh="ss_tube.mesh" />
+
</attached>
<collisionShapes>
- <BoxCollisionShape position="0,0,50" halfExtents="300,300,0" />
- <BoxCollisionShape position="0,0,-50" halfExtents="300,300,0" />
- <BoxCollisionShape position="-150,-50,-50" halfExtents="12, 2, 20" />
- <BoxCollisionShape position="-150,-50,-50" halfExtents="6, 2, 18" />
+ <BoxCollisionShape position="0,0,100" halfExtents="250,100,0" /> <!--Wand links-->
+ <BoxCollisionShape position="0,0,-100" halfExtents="250,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="0,-100,0" halfExtents="250,0,100" /> <!--Decke-->
+ <BoxCollisionShape position="0,100,0" halfExtents="250,0,100" /> <!--Boden-->
</collisionShapes>
@@ -31,20 +32,22 @@
</Template>
-
+<!-- Spacestation Element Curve -->
<Template name=ss_curve>
<MovableEntity position="0,0,0">
<attached>
+ <Model position="-325,-100,125" mesh="cube_red.mesh" scale3D="225,1,225" />
<Model position="0,0,0" yaw=0 scale3D="100,100,100" mesh="ss_curve.mesh" />
</attached>
<collisionShapes>
- <BoxCollisionShape position="50,0,0" halfExtents="8,10,10" />
- <BoxCollisionShape position="0,0,22" halfExtents="18, 2, 10" />
- <BoxCollisionShape position="0,0,9" halfExtents="12, 2, 20" />
- <BoxCollisionShape position="0,0,-18" halfExtents="6, 2, 18" />
+ <BoxCollisionShape position="-300,0,-100" halfExtents="150,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-100,0,100" halfExtents="150,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-200,0,100" yaw=45 halfExtents="150,100,0" /> <!--Wand rechts-->
+ <BoxCollisionShape position="-325,-100,125" halfExtents="225,0,225" /> <!--Boden-->
+ <BoxCollisionShape position="-325,100,125" halfExtents="250,0,100" /> <!--Decke-->
</collisionShapes>
@@ -54,7 +57,7 @@
</Template>
-
+<!-- Spacestation Element Crossing -->
<Template name=ss_tube_x>
<MovableEntity position="0,0,0">
@@ -77,7 +80,7 @@
</Template>
-
+<!-- Spacestation Element Flagroom -->
<Template name=ss_flag_room>
<MovableEntity position="0,0,0">
@@ -100,7 +103,7 @@
</Template>
-
+<!-- Spacestation Element Machine -->
<Template name=ss_machine>
<MovableEntity position="0,0,0">
@@ -123,7 +126,7 @@
</Template>
-
+<!-- Spacestation Element Table-->
<Template name=ss_table>
<MovableEntity position="0,0,0">
@@ -146,7 +149,7 @@
</Template>
-
+<!-- Spacestation Element Table (cracked) -->
<Template name=ss_table_cracked>
<MovableEntity position="0,0,0">
@@ -169,7 +172,7 @@
</Template>
-
+<!-- Spacestation Element Cylinder -->
<Template name=ss_cylinder>
<MovableEntity position="0,0,0">
@@ -192,7 +195,7 @@
</Template>
-
+<!-- Spacestation Element Chair -->
<Template name=ss_chair>
<MovableEntity position="0,0,0">
@@ -215,7 +218,7 @@
</Template>
-
+<!-- Spacestation Element Wall -->
<Template name=ss_wall>
<MovableEntity position="0,0,0">
@@ -238,7 +241,7 @@
</Template>
-
+<!-- Spacestation Element Flag -->
<Template name=ss_flag_aean>
<MovableEntity position="0,0,0">
More information about the Orxonox-commit
mailing list