From ed7c2a6a73f24f97a0f04c2e6be6862ffe54b585 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Feb 2023 01:25:34 +0000
Subject: Support for loading objects, uses and model factories from an XML
 resource

---
 res/brush47.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 res/brush47.xml

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
new file mode 100644
index 0000000..8f1d934
--- /dev/null
+++ b/res/brush47.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<ilt p.id="modelFactory">
+  <object id="wheel">
+    <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,90"/>
+  </object>
+  <object id="axel">
+    <use type="wheel" position="0.717,0,0"/>
+    <use type="wheel" position="-0.717,0,0" rotation="0,90,0"/>
+  </object>
+  <object id="bogey">
+    <use type="axel" position="0,0,0"/>
+    <use type="axel" position="0,2,0"/>
+    <use type="axel" position="0,-2,0"/>
+  </object>
+</ilt>
-- 
cgit v1.2.3


From 5e561d390dc82b08c20532de0952f428e7b14283 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 21 Feb 2023 19:34:16 +0000
Subject: Rename ModelFactory to AssetFactory

---
 res/brush47.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 8f1d934..3c6705a 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ilt p.id="modelFactory">
+<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,90"/>
   </object>
-- 
cgit v1.2.3


From df2a078c51cee464905c6fb1d1c7c4aa7873f6a1 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 22 Feb 2023 23:40:46 +0000
Subject: Implement loading asset, mesh and face definitions

---
 res/brush47.xml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 3c6705a..9cd654f 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -1,15 +1,33 @@
 <?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,90"/>
+    <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708"/>
   </object>
   <object id="axel">
     <use type="wheel" position="0.717,0,0"/>
-    <use type="wheel" position="-0.717,0,0" rotation="0,90,0"/>
+    <use type="wheel" position="-0.717,0,0" rotation="0,3.14159,0"/>
   </object>
-  <object id="bogey">
+  <object id="bogie">
     <use type="axel" position="0,0,0"/>
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
   </object>
+  <asset id="brush-47" name="Brush 47">
+    <mesh 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="#1111dd">
+        <face id="bottom" colour="#2C3539"/>
+        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,1.0">
+          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2"/>
+          <!--smooth="true"-->
+        </face>
+      </use>
+      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#2C3539"/>
+    </mesh>
+    <mesh id="bogie1">
+      <use type="bogie" position="0,6,0"/>
+    </mesh>
+    <mesh id="bogie2">
+      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0"/>
+    </mesh>
+  </asset>
 </ilt>
-- 
cgit v1.2.3


From 96560a2f927831d1b98e654e80ee085f3ef562d8 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 23 Feb 2023 00:42:40 +0000
Subject: Smooth roof now supported

---
 res/brush47.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 9cd654f..841c951 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -17,8 +17,7 @@
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#1111dd">
         <face id="bottom" colour="#2C3539"/>
         <face id="top" type="extrude" scale="1,0.95,1" position="0,0,1.0">
-          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2"/>
-          <!--smooth="true"-->
+          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2" smooth="true"/>
         </face>
       </use>
       <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#2C3539"/>
-- 
cgit v1.2.3


From 27c9f248d374d1327e90e1627ae3a98d148f8972 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 23 Feb 2023 00:55:36 +0000
Subject: Fix axel definition

Test output images now identical
---
 res/brush47.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 841c951..9fd4fe2 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -4,8 +4,8 @@
     <use type="cylinder" position="0,0,0.571" scale="1.142,1.142,0.07" rotation="0,0,1.5708"/>
   </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"/>
+    <use type="wheel" position="0.717,0,0" rotation="0,3.14159,0"/>
   </object>
   <object id="bogie">
     <use type="axel" position="0,0,0"/>
-- 
cgit v1.2.3


From 7d0decccaac3aa564b549d91a36279e7aca0814e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 24 Feb 2023 19:30:30 +0000
Subject: Support for recursive colouring of asset factory faces

Updates colours in sample model.
---
 res/brush47.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 9fd4fe2..fe3d114 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -14,19 +14,21 @@
   </object>
   <asset id="brush-47" name="Brush 47">
     <mesh 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="#1111dd">
-        <face id="bottom" colour="#2C3539"/>
-        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,1.0">
-          <face id="top" type="extrude" scale="0.6,0.9,0" position="0,0,0.2" smooth="true"/>
+      <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,1.5" colour="#2c4f5a">
+        <face id="bottom" colour="#2c3539"/>
+        <face id="front" colour="#fbc32f"/>
+        <face id="back" colour="#fbc32f"/>
+        <face id="top" type="extrude" scale="1,0.95,1" position="0,0,0.8">
+          <face id="top" type="extrude" scale="0.5,0.8,0" position="0,0,0.4" smooth="true" colour="#aeb0b0"/>
         </face>
       </use>
-      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#2C3539"/>
+      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#413b3a"/>
     </mesh>
     <mesh id="bogie1">
-      <use type="bogie" position="0,6,0"/>
+      <use type="bogie" position="0,6,0" colour="#413b3a"/>
     </mesh>
     <mesh id="bogie2">
-      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0"/>
+      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0" colour="#413b3a"/>
     </mesh>
   </asset>
 </ilt>
-- 
cgit v1.2.3


From 29faadd99b2c6fd8dd5bfd9842d1361d82690f96 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 25 Feb 2023 03:32:24 +0000
Subject: Colour windows of sample model

---
 res/brush47.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index fe3d114..1ece78f 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -19,6 +19,8 @@
         <face id="front" colour="#fbc32f"/>
         <face id="back" colour="#fbc32f"/>
         <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>
       </use>
-- 
cgit v1.2.3


From 5c703a1549b88339ca48ac3c48f67ab7503d223a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 27 Feb 2023 23:56:03 +0000
Subject: Support for named colours in assets

Fixes up some error handling in colour parser.
---
 res/brush47.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 1ece78f..477610c 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -16,15 +16,15 @@
     <mesh 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">
         <face id="bottom" colour="#2c3539"/>
-        <face id="front" colour="#fbc32f"/>
-        <face id="back" colour="#fbc32f"/>
+        <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>
       </use>
-      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="#413b3a"/>
+      <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
     </mesh>
     <mesh id="bogie1">
       <use type="bogie" position="0,6,0" colour="#413b3a"/>
-- 
cgit v1.2.3


From 54ddcd3da0916b6a46f5fcf3f33ff0fbffe375ce Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 4 Mar 2023 14:27:23 +0000
Subject: Support and load factory asset directly into a RailVehicleClass
 instance

---
 res/brush47.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 477610c..796641a 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -12,8 +12,8 @@
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
   </object>
-  <asset id="brush-47" name="Brush 47">
-    <mesh id="body" size="2.69,19.38,3.9">
+  <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47">
+    <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">
         <face id="bottom" colour="#2c3539"/>
         <face id="front" colour="goldenrod"/>
@@ -25,12 +25,12 @@
         </face>
       </use>
       <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
-    </mesh>
-    <mesh id="bogie1">
+    </bodyMesh>
+    <bogie id="bogie1">
       <use type="bogie" position="0,6,0" colour="#413b3a"/>
-    </mesh>
-    <mesh id="bogie2">
+    </bogie>
+    <bogie id="bogie2">
       <use type="bogie" position="0,-6,0" rotation="0,3.14159,0" colour="#413b3a"/>
-    </mesh>
+    </bogie>
   </asset>
 </ilt>
-- 
cgit v1.2.3


From c8ecaaddeee46900540e24e096f86306e77493f7 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 4 Mar 2023 15:12:30 +0000
Subject: Load length, wheelBase and maxSpeed RailVehicleClass properties from
 XML

Adjusts bogie position to appear correct according to wheelBase
---
 res/brush47.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 796641a..9c7d2a8 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -12,7 +12,7 @@
     <use type="axel" position="0,2,0"/>
     <use type="axel" position="0,-2,0"/>
   </object>
-  <asset p.typeid="RailVehicleClass" id="brush-47" name="Brush 47">
+  <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">
         <face id="bottom" colour="#2c3539"/>
@@ -27,10 +27,10 @@
       <use type="cuboid" position="0,0,0.2" scale="2.6,4.5,1" colour="grey30"/>
     </bodyMesh>
     <bogie id="bogie1">
-      <use type="bogie" position="0,6,0" colour="#413b3a"/>
+      <use type="bogie" position="0,-1.85,0" colour="#413b3a"/>
     </bogie>
     <bogie id="bogie2">
-      <use type="bogie" position="0,-6,0" rotation="0,3.14159,0" colour="#413b3a"/>
+      <use type="bogie" position="0,1.85,0" rotation="0,3.14159,0" colour="#413b3a"/>
     </bogie>
   </asset>
 </ilt>
-- 
cgit v1.2.3