[Orxonox-commit 7191] r11808 - code/branches/cegui0.8_ogre1.9/data/levels

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-24 16:00:22 +0100 (Sat, 24 Feb 2018)
New Revision: 11808

Modified:
   code/branches/cegui0.8_ogre1.9/data/levels/AsteroidFarming.oxw
   code/branches/cegui0.8_ogre1.9/data/levels/newnewnewspacerace.oxw
   code/branches/cegui0.8_ogre1.9/data/levels/pirateAttack.oxw
Log:
attach Planets to MovableEntities to make them move (Planets are static now)

Modified: code/branches/cegui0.8_ogre1.9/data/levels/AsteroidFarming.oxw
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/levels/AsteroidFarming.oxw	2018-02-24 13:56:19 UTC (rev 11807)
+++ code/branches/cegui0.8_ogre1.9/data/levels/AsteroidFarming.oxw	2018-02-24 15:00:22 UTC (rev 11808)
@@ -110,7 +110,7 @@
     <!-- Asteroid Belt with a planet -->
 
     <SpicedAsteroidBelt position="-15000,0,0" mDensity=0.3 segments=50 minSize=1 maxSize=50 radius0=7190 radius1 = 7800 count=250 tiltBy=0.5 tiltAt=0/>
-    <Planet
+    <MovableEntity
       position="-15000,0,0"
       scale="5000"
       collisionType="dynamic"
@@ -118,22 +118,27 @@
       angularDamping="0"
       mass="10000000"
       pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
       rotationaxis="1,0,0"
       rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
       collisiondamage = 2
       enablecollisiondamage = true
-    >      
-      <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="5000" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
+    >
+        <attached>
+            <Planet
+              mesh="planets/muunilinst.mesh"
+              atmosphere="atmosphere1"
+              atmospheresize="80.0f"
+              imagesize="1024.0f"
+            >      
+              <attached>
+                <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
+              </attached>
+              <collisionShapes>
+                <SphereCollisionShape radius="5000" position="0,0,0" />
+              </collisionShapes>
+            </Planet>
+        </attached>
+    </MovableEntity>
 
 
 

Modified: code/branches/cegui0.8_ogre1.9/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/levels/newnewnewspacerace.oxw	2018-02-24 13:56:19 UTC (rev 11807)
+++ code/branches/cegui0.8_ogre1.9/data/levels/newnewnewspacerace.oxw	2018-02-24 15:00:22 UTC (rev 11808)
@@ -108,7 +108,11 @@
     <ForceField position="0,0,0" direction="0,-1,0" diameter=700 velocity=2000 length=2000/>
 
     <!-- ------------------Planet----------------- -->
-    <Planet position="25000,5000,5000" scale=3000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <MovableEntity position="25000,5000,5000" scale=3000 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
+        <attached>
+            <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
+        </attached>
+    </MovableEntity>
     <StaticEntity position="0,0,0" collisionType=static>
         <collisionShapes>
             <SphereCollisionShape radius="1" />

Modified: code/branches/cegui0.8_ogre1.9/data/levels/pirateAttack.oxw
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/levels/pirateAttack.oxw	2018-02-24 13:56:19 UTC (rev 11807)
+++ code/branches/cegui0.8_ogre1.9/data/levels/pirateAttack.oxw	2018-02-24 15:00:22 UTC (rev 11808)
@@ -531,7 +531,11 @@
             </attached>
         </StaticEntity>
     <!--Planet with asteroid belt-->
-    <Planet mesh="iceplanet.mesh" position="2600,4300,-20000" scale=1000 atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f/>
+    <MovableEntity position="2600,4300,-20000" scale=1000>
+        <attached>
+            <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f/>
+        </attached>
+    </MovableEntity>
     <StaticEntity position="2600,4300,-20000" collisionType=static>
           <collisionShapes>
             <SphereCollisionShape radius="1000" />