Index: code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
===================================================================
--- code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw	(revision 10168)
+++ code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw	(revision 10169)
@@ -1,3 +1,4 @@
-<!--  -->
+<!--FPS mode level
+	autor: Florian Süess-->
 <LevelInfo
  name = "FPS Level HS14"
@@ -102,89 +103,80 @@
 
 
-<!-- Docking  I -->
-    <Dock position="2830,20,50" roll=0 yaw=0 >
-        <animations>
-            <MoveToDockingTarget target="fistperson" />
-        </animations>
-        <effects>
-            <DockToShip target="fistperson" />
-        </effects>
-        <events>
-            <execute>
-                <EventListener event="dockMe" />
-            </execute>
-
-<!--	<undocking>
-		<EventListener event="undockMe" />
-	    </undocking> -->
-	
-        </events>
-        <attached>
-
-	<!-- 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  -->
-	
-	    <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"
-                beaconMode="identify" targetname="bcnDestroyer" name="undockMe"
-            />
-        </attached>
-
-    </Dock>
-    
-
-<!-- FPS Player as destination of the dock -->
-<!-- My position after docking -->
-
-    <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "500,-20000,0"  >
-	<!--"500,-20000,0"-->
-      <attached>
-        <DistanceTriggerBeacon name="bcnDestroyer" />
-        <DockingTarget name="fistperson" />
-      </attached>
-    </FpsPlayer>
-
-
-
-
-<!-- Docking  II -->
-    <Dock position="-840,-20055,1.8" roll=0 yaw=0 >
-        <animations>
-            <MoveToDockingTarget target="spaceShip" />
-        </animations>
-        <effects>
-            <DockToShip target="spaceShip" />
-        </effects>
-        <events>
-            <execute>
-                <EventListener event="dockMe" />
-            </execute>
-
-	    <undocking>
-		<EventListener event="undockMe" />
-	    </undocking>
-	
-        </events>
-        <attached>
-        
-	<!-- Trigger for docking with billboard -->
-            <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
-            <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
-                beaconMode="exclude" targetname="bcnSpaceShip" name="dockMe"
-            />
-	<!-- Trigger for undocking with billboard -->
-	    <Billboard position="4140,20055,-295" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
-	    <DistanceTrigger position="4140,20055,-295" distance="300" target="Pawn"
-                beaconMode="identify" targetname="bcnSpaceShip" name="undockMe"
-            />
-        </attached>
-
-    </Dock>
+	<!-- Docking I -->
+	    <Dock position="2830,20,50" roll=0 yaw=0 >
+	        <animations>
+	            <MoveToDockingTarget target="fistperson" />
+	        </animations>
+	        <effects>
+	            <DockToShip target="fistperson" />
+	        </effects>
+	        <events>
+	            <execute>
+	                <EventListener event="dockMe" />
+	            </execute>
+
+		    <undocking>
+			<EventListener event="undockMe" />
+		    </undocking>
+		
+	        </events>
+	        <attached>
+		<!-- 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 -->
+		    <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"
+	                beaconMode="identify" targetname="bcnDestroyer" name="undockMe"
+	            />
+	        </attached>
+
+	    </Dock>
+	    
+	<!-- FPS Player as destination of the dock -->
+	<!-- My position after docking -->
+	    <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "1330,-20016,0" >
+	      <attached>
+	        <DistanceTriggerBeacon name="bcnDestroyer" />
+	        <DockingTarget name="fistperson" />
+	      </attached>
+	    </FpsPlayer>
+
+
+
+
+	<!-- Docking  II -->
+	    <Dock position="160,-20055,-700" roll=0 yaw=0 >
+	        <animations>
+	            <MoveToDockingTarget target="spaceShip" />
+	        </animations>
+	        <effects>
+	            <DockToShip target="spaceShip" />
+	        </effects>
+	        <events>
+	            <execute>
+	                <EventListener event="dockMe" />
+	            </execute>
+
+		    <undocking>
+			<EventListener event="undockMe" />
+		    </undocking>
+		
+	        </events>
+	        <attached>
+		<!-- Trigger for docking with billboard -->
+	            <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
+	            <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
+	                beaconMode="exclude" targetname="bcnSpaceShip" name="dockMe"
+	            />
+		<!-- Trigger for undocking with billboard -->
+		    <Billboard position="4140,20055,-295" material="Flares/ringflare2" colour="0.3,0.4,0.5" scale=1 />
+		    <DistanceTrigger position="4140,20055,-295" distance="300" target="Pawn"
+	                beaconMode="identify" targetname="bcnSpaceShip" name="undockMe"
+	            />
+	        </attached>	
+	 </Dock>
 
  <!-- Enemy ships -->
@@ -265,5 +257,14 @@
 <!-- Hilfsobjekte fuer Koordinatensystem -->
 
-<Model position="0,0,0" mesh="cube_red.mesh" scale3D="10000,10,10" />
+<!-- The axis from the coordinatesystem are "red,green,yellow" and the orange boxe shows the negative direction.
+	 But atention, each element is different! A few of them are already rotatet with yaw, roll and pitch:
+	 -> "pitch" is a rotation around "red" in the "yellow, green" plain.
+	 -> "yaw" is a rotation around "green" in the "red, yellow" plain.
+	 -> "roll" is a rotation around "yellow" in the "green,red" plain.
+	 this chanches their negativ/positiv direction of the axis.
+	 -->
+			
+
+<!--<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" />
@@ -279,7 +280,8 @@
 <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" />
-
-
+<Model position="0,-20000,-100" mesh="cube_orange.mesh" scale3D="15,15,15" /> -->
+
+
+<!-- Spacestation elements merged -->
 <StaticEntity position="0,-20000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90> 
      
@@ -288,64 +290,26 @@
 	<Model template	= "ss_flag_room" position="750,-16,0"	yaw=180 />
 	
-	<Model template	= "ss_machine" position="1545,190,370"	yaw=32 	pitch=180 />
-	<Model template	= "ss_flag_aean" position="1330,16,0"	pitch=180 />
-	
-	<Model template	= "ss_tube"	 	position="500,0,0" />
-	<Model template	= "ss_curve" 	position="-200,0,0" yaw=180 />
-	<Model template	= "ss_tube_x" 	position="-200,0,600" />
-
-<!--<Model template	= "ss_curve" 	position="-200,0,0" yaw=180 />
-	<Model template	= "ss_curve" 	position="-10,0,700" yaw=0 />
-	<Model template	= "ss_tube"		position="-700,0,700" />
-	<Model template	= "ss_tube_x"	position="1200,0,0" />-->
-	
-	
-	
- <!--   <Model position="0,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
-	<Model position="500,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
-	<Model position="1200,0,0" mesh="ss_tube_x.mesh" scale3D="100,100,100" />
-	<Model position="1900,0,0" mesh="ss_curve.mesh" scale3D="100,100,100" />
-	<Model position="1200,0,703.5" mesh="ss_curve.mesh" scale3D="100,100,100" />
-	<Model position="1805.0,0,-800" mesh="ss_curve.mesh" scale3D="100,100,100" yaw=90 />
-	<Model position="1010.0,0,-700.0" mesh="ss_curve.mesh" scale3D="100,100,100" yaw=-180 />
-	
-	
-	<Model position="750,-16,703.5" pitch=-90 mesh="ss_flag_room.mesh" scale3D="100,100,100" />
-	<Model position="-250,-16,0" pitch=-90 mesh="ss_flag_room.mesh" scale3D="100,100,100" />
-	<Model position="1200,100,-100" roll=180 mesh="ss_machine.mesh" scale3D="0.15,0.15,0.15" />
-	<Model position="-100,100,0" roll=180 mesh="ss_table.mesh" scale3D="25,25,25" />
-	<Model position="-300,100,0" roll=180 mesh="ss_table_cracked.mesh" scale3D="25,25,25" />
-	<Model position="600,75,0" roll=180 mesh="ss_cylinder.mesh" scale3D="25,25,25" />
-	<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="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 />
-      </attached>
-      <collisionShapes>
-        <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" />
-      </collisionShapes>
--->
+	<Model template	= "ss_machine"	 position="1545,190,370"	yaw=32 	pitch=180 />
+	<Model template	= "ss_flag_aean" position="1330,16,0"		pitch=180 />
+	<Model template	= "ss_chair" 	 position="1700,145,0" />
+	
+	<Model template	= "ss_tube"	 	 position="500,0,0" />
+	<Model template	= "ss_table" 	 position="650,100,0" />
+	<Model template	= "ss_cylinder"	 position="0,75,0" />
+	
+	<Model template	= "ss_curve" 	 position="-200,0,0" 	yaw=180 />
+	<Model template	= "ss_tube_x" 	 position="-10,0,700" />
+	 
+	<Model template	= "ss_curve" 	 position="-905,0,700" 	yaw=180 />
+	<Model template	= "ss_curve" 	 position="-810,0,1500" yaw=270/>
+	<Model template	= "ss_curve" 	 position="-10,0,1405" 	yaw=0 />
+	 
+	<Model template	= "ss_wall"  		  	yaw=0	position="250,20,700" />
+	<Model template	= "ss_table_cracked" 	yaw=0	position="-110,100,700" />
+
+		
  </attached>
   </StaticEntity>
-
-
-<!--       
-
--->
-
-
-  <!--Model position="2820,-20,-160" yaw="90" pitch="-90" roll="0" scale="10" mesh="ss_tube.mesh" />
-  <Model position="2820,-20,-210" yaw="90" pitch="-90" roll="0" scale="10" mesh="ss_tube.mesh" />
-  <Model position="2820,-20,-280" yaw="90" pitch="-90" roll="0" scale="10" mesh="ss_curve.mesh" />
-  <Model position="2820,-100,-270.5" yaw="0" pitch="180" roll="90" scale="10" mesh="ss_curve.mesh" /-->
-  
+	
    
 <!-- Homogenous gravitationfield to simulate local gravity (activating the normal gravity will affect the spaceship terribly) -->
Index: code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt
===================================================================
--- code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt	(revision 10168)
+++ code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt	(revision 10169)
@@ -1,2 +1,6 @@
+<!--Templates of spacestation elements with alle their collisionshapes,
+	for creating a spacestation very easy.
+	Autor: Florian Süess
+	Test Level: FPS_Level_HS14 	-->	
 <Template name=spacestation_elements>
 	<SpaceStation
@@ -4,7 +8,19 @@
 	curvedTubetemplate		= ss_curve
 	crossingTubetemplate	= ss_tube_x
+	wall					= ss_wall
+	flagg					= ss_flag_aean
 	>
 	</SpaceStation>
 </Template>
+	
+	
+<!-- to place the different collisionshapes, I used some help boxes and an help coordinate system.
+	 The axis from the coordinatesystem are "red,green,yellow" and the orange boxe shows the negative direction.
+	 But atention, each element is different! A few of them are already rotatet with yaw, roll and pitch:
+	 -> "pitch" is a rotation around "red" in the "yellow, green" plain.
+	 -> "yaw" is a rotation around "green" in the "red, yellow" plain.
+	 -> "roll" is a rotation around "yellow" in the "green,red" plain.
+	 this chanches their negativ/positiv direction of the axis.
+	 -->
 			
 
@@ -39,15 +55,15 @@
 	<attached>
 
-<!-- Boxes helps to place collisionShapes -->
-
-<!--<Model position="0,0,-200"  mesh="cube_green.mesh" scale3D="0,100,150" />
-	<Model position="-300,0,100"  mesh="cube_green.mesh" scale3D="150,100,0" />
-	<Model position="-100,0,0" yaw=45 mesh="cube_red.mesh" scale3D="150,100,0" />
-
-	<Model position="-200,0,-275"  mesh="cube_green.mesh" scale3D="0,100,75" />
-	<Model position="-375,0,-100"  mesh="cube_green.mesh" scale3D="75,100,0" />
-	<Model position="-245,0,-148" yaw=45 mesh="cube_red.mesh" scale3D="70.71,100,0" />
-
-	<Model position="-225,100,-125"  mesh="cube_red.mesh" scale3D="225,0,225" /> -->
+	<!-- Boxes helps to place collisionShapes -->
+
+	<!--<Model position="0,0,-200"  mesh="cube_green.mesh" scale3D="0,100,150" />
+		<Model position="-300,0,100"  mesh="cube_green.mesh" scale3D="150,100,0" />
+		<Model position="-100,0,0" yaw=45 mesh="cube_red.mesh" scale3D="150,100,0" />
+
+		<Model position="-200,0,-275"  mesh="cube_green.mesh" scale3D="0,100,75" />
+		<Model position="-375,0,-100"  mesh="cube_green.mesh" scale3D="75,100,0" />
+		<Model position="-245,0,-148" yaw=45 mesh="cube_red.mesh" scale3D="70.71,100,0" />
+
+		<Model position="-225,100,-125"  mesh="cube_red.mesh" scale3D="225,0,225" /> -->
 
 
@@ -82,18 +98,18 @@
 	<!-- Boxes helps to place collisionShapes -->
 
-<!--<Model position="175,0,100" 	mesh="cube_green.mesh" scale3D="75,100,0" />
-	<Model position="-0,0,275"  	mesh="cube_green.mesh" scale3D="0,100,75" />
-	<Model position="-200,0,275" 	mesh="cube_red.mesh" scale3D="0,100,75" />
-	<Model position="-375,0,100" 	mesh="cube_red.mesh" scale3D="75,100,0" />
-
-	<Model position="175,0,-100"  	mesh="cube_green.mesh" scale3D="75,100,0" />
-	<Model position="0,0,-275" 		mesh="cube_green.mesh" scale3D="0,100,75" />
-	<Model position="-200,0,-275" 	mesh="cube_red.mesh" scale3D="0,100,75" />
-	<Model position="-375,0,-100" 	mesh="cube_red.mesh" scale3D="75,100,0" />
-
-	<Model position="-245,0,-147"  	yaw=45		mesh="cube_red.mesh" scale3D="70.7,100,0" />
-	<Model position="50,0,-147"  	yaw=-45		mesh="cube_red.mesh" scale3D="70.7,100,0" />
-	<Model position="-245,0,149" 	yaw=-45		mesh="cube_orange.mesh" scale3D="70.7,100,0" />
-	<Model position="50,0,148"  	yaw=45		mesh="cube_orange.mesh" scale3D="70.7,100,0" /> -->
+	<!--<Model position="175,0,100" 	mesh="cube_green.mesh" scale3D="75,100,0" />
+		<Model position="-0,0,275"  	mesh="cube_green.mesh" scale3D="0,100,75" />
+		<Model position="-200,0,275" 	mesh="cube_red.mesh" scale3D="0,100,75" />
+		<Model position="-375,0,100" 	mesh="cube_red.mesh" scale3D="75,100,0" />
+
+		<Model position="175,0,-100"  	mesh="cube_green.mesh" scale3D="75,100,0" />
+		<Model position="0,0,-275" 		mesh="cube_green.mesh" scale3D="0,100,75" />
+		<Model position="-200,0,-275" 	mesh="cube_red.mesh" scale3D="0,100,75" />
+		<Model position="-375,0,-100" 	mesh="cube_red.mesh" scale3D="75,100,0" />
+
+		<Model position="-245,0,-147"  	yaw=45		mesh="cube_red.mesh" scale3D="70.7,100,0" />
+		<Model position="50,0,-147"  	yaw=-45		mesh="cube_red.mesh" scale3D="70.7,100,0" />
+		<Model position="-245,0,149" 	yaw=-45		mesh="cube_orange.mesh" scale3D="70.7,100,0" />
+		<Model position="50,0,148"  	yaw=45		mesh="cube_orange.mesh" scale3D="70.7,100,0" /> -->
 	
 	<Model position="0,0,0" scale3D="100,100,100" mesh="ss_tube_x.mesh" />
@@ -136,61 +152,61 @@
 
 	<!-- Boxes helps to place collisionShapes -->
-
-<!--<Model position="-125,116,0" 				mesh="cube_green.mesh" 	scale3D="130,0,125" />
-	<Model position="-275,116,235" 	yaw=55		mesh="cube_green.mesh" 	scale3D="140,0,50" />
-	<Model position="-275,116,-235"	yaw=-55		mesh="cube_red.mesh"	scale3D="140,0,50" />
-	<Model position="-365,116,320" 	yaw=35		mesh="cube_green.mesh"	scale3D="100,0,50" />
-	<Model position="-365,116,-320"	yaw=-35		mesh="cube_red.mesh" 	scale3D="100,0,50" />
-	<Model position="-520,156,380" 	roll=-25	mesh="cube_green.mesh" 	scale3D="100,0,50" />
-	<Model position="-520,156,-380"	roll=-25	mesh="cube_red.mesh" 	scale3D="100,0,50" />	-->
-
-
-<!--<Model position="-80,0,100" 				mesh="cube_green.mesh" 	scale3D="80,100,0" />
-	<Model position="-160,0,150" 	yaw=90		mesh="cube_green.mesh" 	scale3D="50,200,0" />
-	<Model position="-220,0,260" 	yaw=55		mesh="cube_green.mesh" 	scale3D="140,200,0" />
-	<Model position="-360,0,390" 	yaw=33		mesh="cube_green.mesh" 	scale3D="110,200,0" />
-	<Model position="-600,16,430" 				mesh="cube_green.mesh" 	scale3D="200,200,0" />
-	<Model position="-810,16,405"	yaw=-32		mesh="cube_green.mesh" 	scale3D="150,200,0" />
-	<Model position="-965,166,270"	yaw=-55		mesh="cube_green.mesh" 	scale3D="150,50,0" />
-
-	<Model position="-80,0,-100" 				mesh="cube_red.mesh" 	scale3D="80,100,0" />
-	<Model position="-160,0,-150" 	yaw=-90		mesh="cube_red.mesh" 	scale3D="50,200,0" />
-	<Model position="-220,0,-260" 	yaw=-55		mesh="cube_red.mesh" 	scale3D="140,200,0" />
-	<Model position="-360,0,-390" 	yaw=-33		mesh="cube_red.mesh" 	scale3D="110,200,0" />
-	<Model position="-600,16,-430" 				mesh="cube_red.mesh" 	scale3D="200,200,0" />
-	<Model position="-810,16,-405"  yaw=32		mesh="cube_red.mesh" 	scale3D="150,200,0" />
-	<Model position="-965,166,-270" yaw=55		mesh="cube_red.mesh" 	scale3D="150,50,0" />	
-
-	<Model position="-1045,166,0" 				mesh="cube_orange.mesh" 	scale3D="0,50,160" />	-->
-
-
-<!--<Model position="-650,200,0"  	mesh="cube_green.mesh" scale3D="400,0,450" />
-
-	<Model position="-500,-200,0" 	mesh="cube_green.mesh" scale3D="400,0,400" />	
-	<Model position="-60,-84,0" 	mesh="cube_green.mesh" scale3D="60,0,100" />	
-	
-	<Model position="-1015,156,0" 	mesh="cube_orange.mesh" scale3D="27,25,120" />	
-	<Model position="-580,185,0" 	mesh="cube_orange.mesh" scale3D="30,12,30" />
-	<Model position="-580,195,0" 	mesh="cube_orange.mesh" scale3D="50,10,50" />	-->
-
-
-
-<!--<Model position="-255,121,0" 				mesh="cube_green.mesh" 	scale3D="0,85,125" />
-	<Model position="-300,116,190" 	yaw=-35		mesh="cube_green.mesh" 	scale3D="0,80,75" />	
-	<Model position="-300,116,-190"	yaw=35		mesh="cube_green.mesh" 	scale3D="0,80,75" />
-	<Model position="-410,116,290" 	yaw=-55		mesh="cube_green.mesh" 	scale3D="0,80,75" />	
-	<Model position="-410,116,-290"	yaw=55		mesh="cube_green.mesh" 	scale3D="0,80,75" />	
-	<Model position="-500,185,328"  yaw=2		roll=-25	mesh="cube_green.mesh" 	scale3D="100,35,0" />
-	<Model position="-500,185,-328"	yaw=-2		roll=-25	mesh="cube_red.mesh"	scale3D="100,35,0" />	-->
+	
+	<!--<Model position="-125,116,0" 				mesh="cube_green.mesh" 	scale3D="130,0,125" />
+		<Model position="-275,116,235" 	yaw=55		mesh="cube_green.mesh" 	scale3D="140,0,50" />
+		<Model position="-275,116,-235"	yaw=-55		mesh="cube_red.mesh"	scale3D="140,0,50" />
+		<Model position="-365,116,320" 	yaw=35		mesh="cube_green.mesh"	scale3D="100,0,50" />
+		<Model position="-365,116,-320"	yaw=-35		mesh="cube_red.mesh" 	scale3D="100,0,50" />
+		<Model position="-520,156,380" 	roll=-25	mesh="cube_green.mesh" 	scale3D="100,0,50" />
+		<Model position="-520,156,-380"	roll=-25	mesh="cube_red.mesh" 	scale3D="100,0,50" />	
+
+
+		<Model position="-80,0,100" 				mesh="cube_green.mesh" 	scale3D="80,100,0" />
+		<Model position="-160,0,150" 	yaw=90		mesh="cube_green.mesh" 	scale3D="50,200,0" />
+		<Model position="-220,0,260" 	yaw=55		mesh="cube_green.mesh" 	scale3D="140,200,0" />
+		<Model position="-360,0,390" 	yaw=33		mesh="cube_green.mesh" 	scale3D="110,200,0" />
+		<Model position="-600,16,430" 				mesh="cube_green.mesh" 	scale3D="200,200,0" />
+		<Model position="-810,16,405"	yaw=-32		mesh="cube_green.mesh" 	scale3D="150,200,0" />
+		<Model position="-965,166,270"	yaw=-55		mesh="cube_green.mesh" 	scale3D="150,50,0" />
+
+		<Model position="-80,0,-100" 				mesh="cube_red.mesh" 	scale3D="80,100,0" />
+		<Model position="-160,0,-150" 	yaw=-90		mesh="cube_red.mesh" 	scale3D="50,200,0" />
+		<Model position="-220,0,-260" 	yaw=-55		mesh="cube_red.mesh" 	scale3D="140,200,0" />
+		<Model position="-360,0,-390" 	yaw=-33		mesh="cube_red.mesh" 	scale3D="110,200,0" />
+		<Model position="-600,16,-430" 				mesh="cube_red.mesh" 	scale3D="200,200,0" />
+		<Model position="-810,16,-405"  yaw=32		mesh="cube_red.mesh" 	scale3D="150,200,0" />
+		<Model position="-965,166,-270" yaw=55		mesh="cube_red.mesh" 	scale3D="150,50,0" />	
+
+		<Model position="-1045,166,0" 				mesh="cube_orange.mesh" 	scale3D="0,50,160" />
+
+
+		<Model position="-650,200,0"  	mesh="cube_green.mesh" scale3D="400,0,450" />
+
+		<Model position="-500,-200,0" 	mesh="cube_green.mesh" scale3D="400,0,400" />	
+		<Model position="-60,-84,0" 	mesh="cube_green.mesh" scale3D="60,0,100" />	
+	
+		<Model position="-1015,156,0" 	mesh="cube_orange.mesh" scale3D="27,25,120" />	
+		<Model position="-580,185,0" 	mesh="cube_orange.mesh" scale3D="30,12,30" />
+		<Model position="-580,195,0" 	mesh="cube_orange.mesh" scale3D="50,10,50" />
+
+
+
+		<Model position="-255,121,0" 				mesh="cube_green.mesh" 	scale3D="0,85,125" />
+		<Model position="-300,116,190" 	yaw=-35		mesh="cube_green.mesh" 	scale3D="0,80,75" />	
+		<Model position="-300,116,-190"	yaw=35		mesh="cube_green.mesh" 	scale3D="0,80,75" />
+		<Model position="-410,116,290" 	yaw=-55		mesh="cube_green.mesh" 	scale3D="0,80,75" />	
+		<Model position="-410,116,-290"	yaw=55		mesh="cube_green.mesh" 	scale3D="0,80,75" />	
+		<Model position="-500,185,328"  yaw=2		roll=-25	mesh="cube_green.mesh" 	scale3D="100,35,0" />
+		<Model position="-500,185,-328"	yaw=-2		roll=-25	mesh="cube_red.mesh"	scale3D="100,35,0" />	-->
 
 
 
 	<!-- points for the orientation -->
-<!--<Model position="0,0,0" 			mesh="cube_orange.mesh" scale3D="10,10,10" />
-	<Model position="-260,0,0" 			mesh="cube_orange.mesh" scale3D="10,10,10" />
-	<Model position="-580,0,400" 		mesh="cube_orange.mesh" scale3D="10,10,10" />
-	<Model position="-580,0,-400" 		mesh="cube_orange.mesh" scale3D="10,10,10" />
-	
-	<Model position="-580,0,0" 			mesh="cube_orange.mesh" scale3D="10,10,10" />	-->
+	<!--<Model position="0,0,0" 			mesh="cube_orange.mesh" scale3D="10,10,10" />
+		<Model position="-260,0,0" 			mesh="cube_orange.mesh" scale3D="10,10,10" />
+		<Model position="-580,0,400" 		mesh="cube_orange.mesh" scale3D="10,10,10" />
+		<Model position="-580,0,-400" 		mesh="cube_orange.mesh" scale3D="10,10,10" />
+	
+		<Model position="-580,0,0" 			mesh="cube_orange.mesh" scale3D="10,10,10" />	-->
 	
 
@@ -264,5 +280,5 @@
 	<!-- Boxes helps to place collisionShapes -->
 	
-<!--<Model position="0,80,0" 			mesh="cube_orange.mesh" scale3D="40,80,25" />	-->
+	<!--<Model position="0,80,0" 			mesh="cube_orange.mesh" scale3D="40,80,25" />	-->
 
 	<Model position="0,0,0" roll=0 scale3D="0.15,0.15,0.15" mesh="ss_machine.mesh" />
@@ -271,5 +287,5 @@
 	 <collisionShapes>
 
-		<BoxCollisionShape position="0,80,0"    	 		halfExtents="40,80,25" />	<!--whole machine-->
+		<BoxCollisionShape position="0,80,0"		halfExtents="40,80,25" />	<!--whole machine-->
       
      </collisionShapes>
@@ -287,12 +303,14 @@
 	<attached>
 
-	<Model position="0,0,0" scale3D="25,25,25" mesh="ss_table.mesh"  />
-
-	</attached>
-	 <collisionShapes>
-		<BoxCollisionShape position="0,8,17"      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" />
+	<!-- Boxes helps to place collisionShapes -->
+			
+	<!--<Model position="0,-32,0"		mesh="cube_orange.mesh" scale3D="60,32,40" />	-->
+	
+	<Model position="0,0,0"	roll=180 scale3D="25,25,25" mesh="ss_table.mesh"  />
+
+	</attached>
+	 <collisionShapes>
+	
+		<BoxCollisionShape position="0,-32,0"	yaw=15	halfExtents="60,32,40" />	<!--ganzer Tisch-->
       
 	 </collisionShapes>
@@ -309,13 +327,16 @@
 	<MovableEntity position="0,0,0">
 	<attached>
-
-	<Model position="0,0,0" roll=0 scale3D="25,25,25" mesh="ss_table_cracked.mesh"  />
-
-	</attached>
-	 <collisionShapes>
-		<BoxCollisionShape position="0,8,17"      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" />
+	
+	<!-- Boxes helps to place collisionShapes -->
+		
+	<!--<Model position="0,-32,0" 			mesh="cube_orange.mesh" scale3D="60,32,40" />	-->
+
+
+	<Model position="0,0,0" roll=180 scale3D="25,25,25" mesh="ss_table_cracked.mesh"  />
+
+	</attached>
+	 <collisionShapes>
+	
+		<BoxCollisionShape position="0,-32,0"		halfExtents="60,32,40" />	<!--ganzer Tisch-->
       
 	 </collisionShapes>
@@ -332,14 +353,27 @@
 	<MovableEntity position="0,0,0">
 	<attached>
-
-	<Model position="0,0,0" roll=0 scale3D="25,25,25" mesh="ss_cylinder.mesh"  />
-
-	</attached>
-	 <collisionShapes>
-		<BoxCollisionShape position="0,8,17"      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" />
-      
+	
+	<!-- Boxes helps to place collisionShapes -->
+			
+	<!--<Model position="0,-40,0" 	yaw=15		mesh="cube_red.mesh" scale3D="7,65,25" />
+		<Model position="0,-40,0" 	yaw=45		mesh="cube_red.mesh" scale3D="7,65,25" />
+		<Model position="0,-40,0" 	yaw=75		mesh="cube_red.mesh" scale3D="7,65,25" />
+		<Model position="0,-40,0" 	yaw=105		mesh="cube_red.mesh" scale3D="7,65,25" />
+		<Model position="0,-40,0" 	yaw=135		mesh="cube_red.mesh" scale3D="7,65,25" />
+		<Model position="0,-40,0" 	yaw=165		mesh="cube_red.mesh" scale3D="7,65,25" />	-->
+	
+	
+	<Model position="0,0,0" roll=180 scale3D="25,25,25" mesh="ss_cylinder.mesh"  />
+
+	</attached>
+	 <collisionShapes>
+		
+		<BoxCollisionShape position="0,-40,0"	yaw=15	halfExtents="10,65,25" />	<!--Fuellung-->
+		<BoxCollisionShape position="0,-40,0"	yaw=45	halfExtents="10,65,25" />	<!--Fuellung-->
+		<BoxCollisionShape position="0,-40,0"	yaw=75	halfExtents="10,65,25" />	<!--Fuellung-->
+		<BoxCollisionShape position="0,-40,0"	yaw=105	halfExtents="10,65,25" />	<!--Fuellung-->
+		<BoxCollisionShape position="0,-40,0"	yaw=135	halfExtents="10,65,25" />	<!--Fuellung-->
+		<BoxCollisionShape position="0,-40,0"	yaw=165	halfExtents="10,65,25" />	<!--Fuellung-->
+		      
 	 </collisionShapes>
 
@@ -356,13 +390,18 @@
 	<attached>
 
-	<Model position="0,0,0" roll=0 pitch=0 scale3D="20,20,20" mesh="ss_chair.mesh"  />
-
-	</attached>
-	 <collisionShapes>
-		<BoxCollisionShape position="0,8,17"      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" />
-      
+	<!-- Boxes helps to place collisionShapes -->
+	
+	<!--<Model position="-5,18,0" 			mesh="cube_orange.mesh" scale3D="20,20,20" />
+		<Model position="-23,-30,0" 			mesh="cube_orange.mesh" scale3D="2,33,18" />	-->
+	
+
+	<Model position="0,0,0" roll=0 pitch=180 scale3D="20,20,20" mesh="ss_chair.mesh"  />
+
+	</attached>
+	 <collisionShapes>
+				
+		<BoxCollisionShape position="-5,18,0"    	 		halfExtents="20,20,20" />	<!--Unterer Teil-->
+		<BoxCollisionShape position="-23,-30,0"    	 		halfExtents="2,33,20" />	<!--Rueckenlaehne-->
+		
 	 </collisionShapes>
 
@@ -378,14 +417,17 @@
 	<MovableEntity position="0,0,0">
 	<attached>
-
-	<Model position="0,0,0" roll=0 scale3D="20,20,20" mesh="ss_wall.mesh"  />
-
-	</attached>
-	 <collisionShapes>
-		<BoxCollisionShape position="0,8,17"      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" />
-      
+	
+	<!-- Boxes helps to place collisionShapes -->
+	
+	<!--<Model position="-78,0,0"		mesh="cube_orange.mesh" scale3D="2,100,100" />	-->
+	
+
+	<Model position="0,0,0" roll=0	pitch=180	scale3D="80,80,80" mesh="ss_wall.mesh"  />
+
+	</attached>
+	 <collisionShapes>
+	
+		<BoxCollisionShape position="-78,0,0"		halfExtents="2,100,100" />	<!--Flache Seite-->
+	
 	 </collisionShapes>
 
@@ -404,6 +446,6 @@
 	<!-- Boxes helps to place collisionShapes -->
 	
-<!--<Model position="0,0,0" 			mesh="cube_orange.mesh" scale3D="2,160,2" />
-	<Model position="0,108,80" 		mesh="cube_orange.mesh" scale3D="1,50,80" />	-->
+	<!--<Model position="0,0,0" 			mesh="cube_orange.mesh" scale3D="2,160,2" />
+		<Model position="0,108,80" 		mesh="cube_orange.mesh" scale3D="1,50,80" />	-->
 	
 
