Changeset 595 for code/branches/FICN

Timestamp:

Dec 17, 2007, 9:23:52 PM (17 years ago)

Author:

landauf

Message:

spaceships are now models too (except the steered one)

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)

code/branches/FICN/bin/levels/sample.oxw

@@ -34 +34 @@
     <BaseEntity name="TheShip" src="assf2.mesh" node="ShipNode" />
 
-    <SceneNode name="ShipNode2" pos="200,0,500" scale="10,10,10" yaw="-90" pitch="-90" />
-    <BaseEntity name="TheShip2" src="assf2.mesh" node="ShipNode2" />
-
-    <SceneNode name="ShipNode3" pos="-200,0,500" scale="10,10,10" yaw="-90" pitch="-90" />
-    <BaseEntity name="TheShip3" src="assf2.mesh" node="ShipNode3" />
+    <Model position="200,0,500" scale="10" mesh="assf2.mesh" yaw="-90" pitch="-90" />
+    <Model position="-200,0,500" scale="10" mesh="assf2.mesh" yaw="-90" pitch="-90" />
 
     <Model position="0,2000,0" scale="40" mesh="ast1.mesh" />

code/branches/FICN/src/orxonox/objects/WorldEntity.cc

@@ -107 +107 @@
         }
 
+        if (xmlElem->Attribute("yaw") || xmlElem->Attribute("pitch") || xmlElem->Attribute("roll"))
+        {
+            float yaw = 0.0, pitch = 0.0, roll = 0.0;
+            if (xmlElem->Attribute("yaw"))
+                String2Number<float>(yaw,xmlElem->Attribute("yaw"));
+
+            if (xmlElem->Attribute("pitch"))
+                String2Number<float>(pitch,xmlElem->Attribute("pitch"));
+
+            if (xmlElem->Attribute("roll"))
+                String2Number<float>(roll,xmlElem->Attribute("roll"));
+
+            this->yaw(Degree(yaw));
+            this->pitch(Degree(pitch));
+            this->roll(Degree(roll));
+        }
+
         if (xmlElem->Attribute("scale"))
         {