From 88c9d66352c2f4856682efd48482b5b72aca18bf Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 12 Mar 2023 00:54:24 +0000
Subject: Support loading references to texture fragments

---
 res/brush47.xml                |   2 ++
 res/rail/roofSideWithVents.png | Bin 0 -> 17011 bytes
 res/rail/roofTopWithVents.png  | Bin 0 -> 11921 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 res/rail/roofSideWithVents.png
 create mode 100644 res/rail/roofTopWithVents.png

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index dbd3327..a7e3894 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -59,6 +59,8 @@
       </face>
     </use>
   </object>
+  <textureFragment id="roofSideWithVents" path="rail/roofSideWithVents.png"/>
+  <textureFragment id="roofTopWithVents" path="rail/roofTopWithVents.png"/>
   <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,0.3" colour="goldenrod">
diff --git a/res/rail/roofSideWithVents.png b/res/rail/roofSideWithVents.png
new file mode 100644
index 0000000..67ed851
Binary files /dev/null and b/res/rail/roofSideWithVents.png differ
diff --git a/res/rail/roofTopWithVents.png b/res/rail/roofTopWithVents.png
new file mode 100644
index 0000000..0f64ced
Binary files /dev/null and b/res/rail/roofTopWithVents.png differ
-- 
cgit v1.2.3


From 0ee9b8c6036899f95dfd54f151cb60a03645f87a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 12 Mar 2023 01:05:18 +0000
Subject: Support loading texture references into faces

---
 res/brush47.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index a7e3894..c345c82 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -71,7 +71,11 @@
           <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 id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
+              <face id="top" texture="roofTopWithVents"/>
+              <face id="left" texture="roofSideWithVents"/>
+              <face id="right" texture="roofSideWithVents"/>
+            </face>
           </face>
         </face>
       </use>
-- 
cgit v1.2.3


From b5db39e7de50cff669920ab1f279df223d257a51 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 20 Mar 2023 00:26:16 +0000
Subject: Support applying a single face controller to multiple faces

---
 res/brush47.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index c345c82..f74cb29 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -2,8 +2,7 @@
 <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" colour="silver">
-      <face id="top" colour="#413b3a"/>
-      <face id="bottom" colour="#413b3a"/>
+      <face id="top bottom" colour="#413b3a"/>
     </use>
     <use type="cuboid" scale="0.3,0.5,0.3" position="0.2,0,0.421" colour="grey30"/>
   </object>
@@ -66,15 +65,12 @@
       <use type="cuboid" position="0,0,1.2" scale="2.69,19.38,0.3" colour="goldenrod">
         <face id="bottom" colour="#2c3539"/>
         <face id="top" type="extrude" position="0,0,1.05" colour="#2c4f5a">
-          <face id="front" colour="goldenrod"/>
-          <face id="back" colour="goldenrod"/>
+          <face id="front 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="front back" colour="#e1eff3"/>
             <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
               <face id="top" texture="roofTopWithVents"/>
-              <face id="left" texture="roofSideWithVents"/>
-              <face id="right" texture="roofSideWithVents"/>
+              <face id="right left" texture="roofSideWithVents"/>
             </face>
           </face>
         </face>
-- 
cgit v1.2.3


From 2bcbb86db4061e32005adea8806e4ac552691bcf Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 7 Apr 2023 23:55:09 +0100
Subject: Extend face controller to support splitting a face along a plane

Individual parts of the splits faces can then be styled separately
---
 res/brush47.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index f74cb29..20c43c8 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -70,7 +70,11 @@
             <face id="front back" colour="#e1eff3"/>
             <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
               <face id="top" texture="roofTopWithVents"/>
-              <face id="right left" texture="roofSideWithVents"/>
+              <face id="right left">
+                <split id="frontcorner" origin="0,7.90704,0" normal="0,1,0"/>
+                <split id="backcorner" origin="0,-7.90704,0" normal="0,-1,0"/>
+                <face id="right left" texture="roofSideWithVents"/>
+              </face>
             </face>
           </face>
         </face>
-- 
cgit v1.2.3


From 26219bd0e3a1a0da74282509357f0ffcbcbafd7e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 8 Apr 2023 11:50:40 +0100
Subject: Update Brush47 with yellow cab parts and window texture

Note: side window distorted still.
---
 res/brush47.xml             |  13 ++++++++++++-
 res/rail/cabWindowFront.png | Bin 0 -> 630 bytes
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 res/rail/cabWindowFront.png

(limited to 'res')

diff --git a/res/brush47.xml b/res/brush47.xml
index 20c43c8..31518c8 100644
--- a/res/brush47.xml
+++ b/res/brush47.xml
@@ -60,14 +60,25 @@
   </object>
   <textureFragment id="roofSideWithVents" path="rail/roofSideWithVents.png"/>
   <textureFragment id="roofTopWithVents" path="rail/roofTopWithVents.png"/>
+  <textureFragment id="cabWindowFront" path="rail/cabWindowFront.png"/>
   <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,0.3" colour="goldenrod">
         <face id="bottom" colour="#2c3539"/>
         <face id="top" type="extrude" position="0,0,1.05" colour="#2c4f5a">
           <face id="front back" colour="goldenrod"/>
+          <face id="right left">
+            <split id="frontcorner" origin="0,7.90704,0" normal="0,1,0"/>
+            <split id="backcorner" origin="0,-7.90704,0" normal="0,-1,0"/>
+            <face id="rightfrontcorner leftfrontcorner rightbackcorner leftbackcorner" colour="goldenrod"/>
+          </face>
           <face id="top" type="extrude" scale="1,0.96,1" position="0,0,0.775">
-            <face id="front back" colour="#e1eff3"/>
+            <face id="front back" texture="cabWindowFront"/>
+            <face id="right left">
+              <split id="frontcorner" origin="0,7.90704,0" normal="0,1,0"/>
+              <split id="backcorner" origin="0,-7.90704,0" normal="0,-1,0"/>
+              <face id="rightfrontcorner leftfrontcorner rightbackcorner leftbackcorner" texture="cabWindowFront"/>
+            </face>
             <face id="top" type="extrude" scale="0.5,0.85,0" smooth="true" position="0,0,0.575" colour="#aeb0b0">
               <face id="top" texture="roofTopWithVents"/>
               <face id="right left">
diff --git a/res/rail/cabWindowFront.png b/res/rail/cabWindowFront.png
new file mode 100644
index 0000000..3803f21
Binary files /dev/null and b/res/rail/cabWindowFront.png differ
-- 
cgit v1.2.3