Merge branch 'model-factory-fixup'

1 files changed, 66 insertions, 13 deletions

diff --git a/res/brush47.xml b/res/brush47.xml
index 9c7d2a8..dbd3327 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -1,36 +1,89 @@
 <?xml version="1.0"?>
 <ilt p.id="assetFactory">
   <object id="wheel">
-    <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708"/>
+    <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708" colour="silver">
+      <face id="top" colour="#413b3a"/>
+      <face id="bottom" colour="#413b3a"/>
+    </use>
+    <use type="cuboid" scale="0.3,0.5,0.3" position="0.2,0,0.421" colour="grey30"/>
+  </object>
+  <object id="spring">
+    <use type="cylinder" scale="0.15,0.15,0.2" position="0,0,-0.1" colour="red"/>
+  </object>
+  <object id="spring-pair">
+    <use type="spring" position="0.0,-0.1,0.0"/>
+    <use type="spring" position="0.0,0.1,0.0"/>
   </object>
   <object id="axel">
-    <use type="wheel" position="-0.717,0,0"/>
-    <use type="wheel" position="0.717,0,0" rotation="0,3.14159,0"/>
+    <use type="wheel" position="-0.717,0,0" rotation="0,3.14159,0"/>
+    <use type="wheel" position="0.717,0,0"/>
+    <use type="cylinder" scale="0.1,0.1,2.2" position="-1.1,0,0.571" rotation="0,0,1.5708" colour="yellow"/>
+  </object>
+  <object id="bogie-side">
+    <use type="spring-pair" position="0,-1.1,0"/>
+    <use type="spring-pair" position="0,1.1,0"/>
+    <use type="cuboid" scale="0.2,4.3,0.15" position="0,0,-0.25" colour="darkgrey">
+      <face id="bottom" type="extrude" scale="1,0.3,1" position="0,0,-0.1"/>
+    </use>
+    <use type="cuboid" scale="0.2,4.3,0.15" position="0,0,0.1" colour="darkgrey">
+      <face id="top" type="extrude" scale="1,0.3,1" position="0,0,0.3"/>
+    </use>
   </object>
   <object id="bogie">
     <use type="axel" position="0,0,0"/>
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
+    <use type="bogie-side" position="0.9,0,0.571"/>
+    <use type="bogie-side" position="-0.9,0,0.571"/>
+    <use type="cuboid" scale="1.8,0.6,0.5" position="0,1,0.4" colour="darkgrey"/>
+    <use type="cuboid" scale="1.8,0.6,0.5" position="0,-1,0.4" colour="darkgrey"/>
+    <use type="cuboid" scale="1.2,1.9,0.5" position="0,0,0.5" colour="grey30"/>
+    <use type="cuboid" scale="1,5.3,0.4" position="0,0,0.4" colour="darkgrey"/>
+    <use type="cuboid" scale="1.6,0.2,0.3" position="0,2.7,0.4" colour="grey30"/>
+  </object>
+  <object id="battery">
+    <use type="cuboid" scale="2.6,2.2,0.7" position="0,0,0.4" colour="slategrey">
+      <face id="bottom" type="extrude" scale="0.6,1,1" position="0,0,-0.3"/>
+    </use>
+  </object>
+  <object id="buffer">
+    <use type="cylinder" scale="0.3,0.3,0.3" colour="grey10"/>
+    <use type="cylinder" scale="0.6,0.6,0.1" position="0,0,0.3" colour="grey10"/>
+  </object>
+  <object id="buffers">
+    <use type="buffer" rotation="-1.5708,0,0" position="1.1,0,-0.3"/>
+    <use type="buffer" rotation="-1.5708,0,0" position="-1.1,0,-0.3"/>
+    <use type="cuboid" scale="2.65,0.1,0.6" position="0,-0.05,-0.6">
+      <face id="front" type="extrude" scale="0.9,1,0.4" position="0,-0.5,0.18">
+        <face id="front" type="extrude" scale="0.4,1,0" position="0,-0.5,0.09"/>
+      </face>
+    </use>
   </object>
   <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47" length="19.38" wheelBase="15.70" maxSpeed="42.4688">
     <bodyMesh id="body" size="2.69,19.38,3.9">
-      <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#2c4f5a">
+      <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,0.3" colour="goldenrod">
         <face id="bottom" colour="#2c3539"/>
-        <face id="front" colour="goldenrod"/>
-        <face id="back" colour="goldenrod"/>
-        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,0.8">
-          <face id="front" colour="#e1eff3"/>
-          <face id="back" colour="#e1eff3"/>
-          <face id="top" type="extrude" scale="0.5,0.8,0" position="0,0,0.4" smooth="true" colour="#aeb0b0"/>
+        <face id="top" type="extrude" position="0,0,1.05" colour="#2c4f5a">
+          <face id="front" colour="goldenrod"/>
+          <face id="back" colour="goldenrod"/>
+          <face id="top" type="extrude" scale="1,0.96,1" position="0,0,0.775">
+            <face id="front" colour="#e1eff3"/>
+            <face id="back" colour="#e1eff3"/>
+            <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0"/>
+          </face>
         </face>
       </use>
-      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
+      <use type="cuboid" position="0,0,0.3" scale="1.6,4,1" colour="darkslategrey"/>
+      <use type="battery" position="0,1.2,0"/>
+      <use type="battery" position="0,-1.2,0"/>
+      <use type="buffers" position="0,9.69,1.2" colour="grey20"/>
+      <use type="buffers" position="0,-9.69,1.2" colour="grey20" rotation="0,3.14159,0"/>
     </bodyMesh>
     <bogie id="bogie1">
-      <use type="bogie" position="0,-1.85,0" colour="#413b3a"/>
+      <use type="bogie" position="0,-1.85,0"/>
     </bogie>
     <bogie id="bogie2">
-      <use type="bogie" position="0,1.85,0" rotation="0,3.14159,0" colour="#413b3a"/>
+      <use type="bogie" position="0,1.85,0" rotation="0,3.14159,0"/>
     </bogie>
   </asset>
 </ilt>