Changeset 11795 for code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw

Timestamp:

Feb 21, 2018, 12:03:52 AM (6 years ago)

Author:

landauf

Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:

code/branches/cegui0.8_ogre1.9

Files:

• . (modified) (1 prop)
• data/levels/missionOne.oxw (modified) (2 diffs)

code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw

@@ -1205 +1205 @@
 
 <!-- @Objects: planet && spaceboundaries  -->
-    <Planet
+    <MovableEntity
       position="-44000,0,0"
       scale="2500"
@@ -1213 +1213 @@
       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 = "false"
     >
-      <!--attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
-      </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
+      <attached>
+        <Planet
+          mesh="planets/muunilinst.mesh"
+          atmosphere="atmosphere1"
+          atmospheresize="80.0f"
+          imagesize="1024.0f"
+        >
+          <!--attached>
+            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
+          </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
+        </Planet>
+      </attached>
       <collisionShapes>
         <SphereCollisionShape radius="2500" position="0,0,0" />
       </collisionShapes>
-    </Planet>
+    </MovableEntity>