Merge branch 'assimp'

6 files changed, 164 insertions, 273 deletions

diff --git a/res/assetTemplate.m4 b/res/assetTemplate.m4
new file mode 100644
index 0000000..8750c42
--- /dev/null
+++ b/res/assetTemplate.m4
@@ -0,0 +1,5 @@
+  <asset p.typeid="TYPE" id="ID" name="ID">
+    <bodyMesh id="body">
+      <use type="ID"/>
+    </bodyMesh>
+  </asset>
diff --git a/res/brush47.mtl b/res/brush47.mtl
deleted file mode 100644
index a4ba512..0000000
--- a/res/brush47.mtl
+++ /dev/null
@@ -1,13 +0,0 @@
-# Blender MTL File: 'brush47.blend'
-# Material Count: 1
-
-newmtl Brush47
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-map_Kd brush47.png
diff --git a/res/brush47.obj b/res/brush47.obj
deleted file mode 100644
index 8fcb2b1..0000000
--- a/res/brush47.obj
+++ /dev/null
@@ -1,260 +0,0 @@
-# Blender v2.91.0 OBJ File: 'brush47.blend'
-# www.blender.org
-mtllib brush47.mtl
-o Body
-v -1.345000 1.200000 -9.690000
-v -1.345000 1.200000 9.690000
-v 1.345000 1.200000 -9.690000
-v 1.345000 1.200000 9.690000
-v -0.991447 3.900000 -8.536446
-v -1.345000 3.546447 -9.440000
-v -0.991447 3.900000 8.536446
-v -1.345000 3.546447 9.440000
-v 0.991447 3.900000 -8.536446
-v 1.345000 3.546447 -9.440000
-v 0.991447 3.900000 8.536446
-v 1.345000 3.546447 9.440000
-v -1.345000 2.723224 9.690000
-v 1.345000 2.723224 9.690000
-v 1.345000 2.723224 -9.690000
-v -1.345000 2.723224 -9.690000
-v 1.340000 0.500000 9.600000
-v -1.340000 0.500000 9.600000
-v -1.340000 1.200000 9.690000
-v -1.340000 0.500000 -9.600000
-v 1.340000 0.500000 -9.600000
-v -1.300000 0.200000 -2.250000
-v -1.300000 1.200000 -2.250000
-v -1.300000 0.200000 2.250000
-v -1.300000 1.200000 2.250000
-v 1.300000 0.200000 -2.250000
-v 1.300000 1.200000 -2.250000
-v 1.300000 0.200000 2.250000
-v 1.300000 1.200000 2.250000
-v 1.345000 1.200000 8.236500
-v 1.345000 1.200000 -8.236500
-v -1.345000 1.200000 -8.236500
-v -1.345000 1.200000 8.236500
-vt 0.025174 0.662500
-vt 0.025174 0.831250
-vt 0.037326 0.925000
-vt 0.957465 0.927083
-vt 0.971354 0.833333
-vt 0.971354 0.662500
-vt 0.900391 0.662500
-vt 0.096137 0.662500
-vt 0.025174 0.662500
-vt 0.025174 0.831250
-vt 0.037326 0.925000
-vt 0.957465 0.927083
-vt 0.971354 0.833333
-vt 0.971354 0.662500
-vt 0.900391 0.662500
-vt 0.096137 0.662500
-vt 0.605035 0.456250
-vt 0.605035 0.581250
-vt 0.359375 0.581250
-vt 0.359375 0.456250
-vt 0.605035 0.581250
-vt 0.605035 0.456250
-vt 0.359375 0.581250
-vt 0.359375 0.456250
-vt 0.026042 0.593750
-vt 0.971354 0.593750
-vt 0.026042 0.593750
-vt 0.971354 0.593750
-vt 0.088542 0.089583
-vt 0.088542 0.206250
-vt 0.918403 0.206250
-vt 0.918403 0.089583
-vt 0.926215 0.527083
-vt 0.926215 0.612500
-vt 0.834201 0.612500
-vt 0.834201 0.527083
-vt 0.083333 0.989583
-vt 0.913194 0.989583
-vt 0.037326 0.927083
-vt 0.152778 0.364583
-vt 0.197049 0.364583
-vt 0.204861 0.310417
-vt 0.144965 0.310417
-vt 0.083333 0.989583
-vt 0.913194 0.989583
-vt 0.037326 0.927083
-vt 0.152778 0.364583
-vt 0.197049 0.364583
-vt 0.204861 0.310417
-vt 0.144965 0.310417
-vt 0.834201 0.527083
-vt 0.834201 0.612500
-vt 0.927083 0.612500
-vt 0.927083 0.527083
-vt 0.114583 0.293750
-vt 0.114583 0.414583
-vt 0.010417 0.414583
-vt 0.010417 0.293750
-vt 0.010417 0.293750
-vt 0.010417 0.414583
-vt 0.114583 0.414583
-vt 0.114583 0.293750
-vt 0.043403 0.014583
-vt 0.002604 0.014583
-vt 0.002604 0.081250
-vt 0.043403 0.081250
-vt 0.043403 0.014583
-vt 0.002604 0.014583
-vt 0.002604 0.081250
-vt 0.043403 0.081250
-vn -1.0000 0.0000 0.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 0.0000 1.0000
-vn -1.0000 0.0071 0.0000
-vn 1.0000 0.0071 -0.0000
-vn -0.3335 -0.9344 -0.1252
-vn 0.3335 -0.9344 -0.1252
-vn 0.3335 -0.9344 0.1252
-vn -0.3335 -0.9344 0.1252
-vn 0.6755 -0.1083 -0.7294
-vn 0.6276 -0.5509 -0.5500
-vn -0.6276 -0.5509 -0.5500
-vn -0.6755 -0.1083 -0.7294
-vn 0.6276 -0.5509 0.5500
-vn -0.6276 -0.5509 0.5500
-vn -0.6755 -0.1083 0.7294
-vn 0.6755 -0.1083 0.7294
-vn 0.8867 0.0030 -0.4622
-vn -0.6937 0.0482 -0.7186
-vn -0.6937 0.0482 0.7186
-vn 0.6937 0.0482 0.7186
-vn -0.6128 0.1051 -0.7832
-vn 0.6145 0.1049 -0.7819
-vn 0.0000 0.1275 -0.9918
-vn 0.6128 0.1051 0.7832
-vn -0.6128 0.1051 0.7832
-usemtl Brush47
-s off
-f 4/1/1 14/2/1 12/3/1 10/4/1 15/5/1 3/6/1 31/7/1 30/8/1
-f 1/9/2 16/10/2 6/11/2 8/12/2 13/13/2 2/14/2 33/15/2 32/16/2
-f 22/17/2 23/18/2 25/19/2 24/20/2
-f 24/20/3 25/19/3 29/21/3 28/22/3
-f 28/22/1 29/21/1 27/23/1 26/24/1
-f 26/24/4 27/23/4 23/18/4 22/17/4
-f 4/1/5 30/8/5 17/25/5
-f 31/7/5 3/6/5 21/26/5
-f 1/9/6 32/16/6 20/27/6
-f 33/15/6 2/14/6 18/28/6
-s 1
-f 11/29/7 7/30/8 5/31/9 9/32/10
-f 13/33/11 8/34/12 12/35/13 14/36/14
-f 5/37/9 7/38/8 8/12/12 6/39/15
-f 7/40/8 11/41/7 12/42/13 8/43/12
-f 11/44/7 9/45/10 10/4/16 12/46/13
-f 9/47/10 5/48/9 6/49/15 10/50/16
-f 15/51/17 10/52/16 6/53/15 16/54/18
-f 2/55/19 13/56/11 14/57/14 4/58/20
-f 3/59/21 15/60/17 16/61/18 1/62/22
-f 17/63/23 18/64/24 19/65/25 4/66/20
-f 20/67/26 21/68/27 3/69/21 1/70/22
-o Bogie2
-v -0.717500 0.000000 -2.700000
-v -0.717500 0.000000 -9.300000
-v -0.717500 1.200000 -2.700000
-v 0.717500 1.200000 -2.700000
-v 0.717500 0.000000 -2.700000
-v 0.717500 0.000000 -9.300000
-v 1.017500 1.200000 -2.700000
-v 1.017500 0.000000 -2.700000
-v 1.017500 0.000000 -9.300000
-v -1.017500 0.000000 -9.300000
-v -1.017501 0.000000 -2.700000
-v -1.017501 1.200000 -2.700000
-v -0.717500 0.654015 -9.300000
-v -0.717500 1.200000 -8.236500
-v -0.717500 0.661560 -9.285304
-v 0.717500 1.200000 -8.236500
-v 0.717500 0.654015 -9.300000
-v 1.017500 1.200000 -8.236500
-v 1.017500 0.654015 -9.300000
-v -1.017500 0.654015 -9.300000
-v -1.017500 1.200000 -8.236500
-vt 0.342014 0.591667
-vt 0.342014 0.435417
-vt 0.006076 0.435417
-vt 0.006076 0.520575
-vt 0.006824 0.521557
-vt 0.060208 0.591667
-vt 0.006076 0.435417
-vt 0.342014 0.435417
-vt 0.342014 0.591667
-vt 0.060208 0.591667
-vt 0.006076 0.520575
-vt 0.217014 0.270833
-vt 0.552951 0.270833
-vt 0.552951 0.427083
-vt 0.271146 0.427083
-vt 0.217014 0.355992
-vt 0.552083 0.429167
-vt 0.552083 0.272917
-vt 0.216146 0.272917
-vt 0.216146 0.358075
-vt 0.270278 0.429167
-vn 1.0000 0.0000 -0.0000
-vn -1.0000 0.0000 0.0000
-usemtl Brush47
-s off
-f 36/71/28 34/72/28 35/73/28 46/74/28 48/75/28 47/76/28
-f 39/77/29 38/78/29 37/79/29 49/80/29 50/81/29
-f 42/82/29 41/83/29 40/84/29 51/85/29 52/86/29
-f 45/87/28 44/88/28 43/89/28 53/90/28 54/91/28
-o Bogie1
-v 0.717500 0.000000 2.700000
-v 0.717500 1.200000 2.700000
-v 0.717500 0.000000 9.300000
-v -0.717500 0.000000 2.700000
-v -0.717500 1.200000 2.700000
-v -0.717500 0.000000 9.300000
-v 1.017500 0.000000 2.700001
-v 1.017500 1.200000 2.700001
-v 1.017500 0.000000 9.300000
-v -1.017500 0.000000 2.700000
-v -1.017500 1.200000 2.700000
-v -1.017500 0.000000 9.300000
-v 0.717500 0.654015 9.300000
-v 0.717500 1.200000 8.236500
-v 1.017500 0.654015 9.300000
-v 1.017500 1.200000 8.236500
-v -0.717500 1.200000 8.236500
-v -0.717500 0.661372 9.285670
-v -0.717500 0.654015 9.300000
-v -1.017500 1.200000 8.236500
-v -1.017500 0.654015 9.300000
-vt 0.342014 0.435417
-vt 0.006076 0.435417
-vt 0.006076 0.520575
-vt 0.060208 0.591667
-vt 0.342014 0.591667
-vt 0.006076 0.520575
-vt 0.006076 0.435417
-vt 0.342014 0.435417
-vt 0.342014 0.591667
-vt 0.060208 0.591667
-vt 0.006806 0.521533
-vt 0.552083 0.270833
-vt 0.216146 0.270833
-vt 0.216146 0.355992
-vt 0.270278 0.427083
-vt 0.552083 0.427083
-vt 0.215278 0.355992
-vt 0.215278 0.270833
-vt 0.552083 0.270833
-vt 0.552083 0.427083
-vt 0.269549 0.427083
-vn -1.0000 0.0000 -0.0000
-vn 1.0000 -0.0000 0.0000
-usemtl Brush47
-s off
-f 55/92/30 57/93/30 67/94/30 68/95/30 56/96/30
-f 73/97/31 60/98/31 58/99/31 59/100/31 71/101/31 72/102/31
-f 61/103/30 63/104/30 69/105/30 70/106/30 62/107/30
-f 75/108/31 66/109/31 64/110/31 65/111/31 74/112/31
diff --git a/res/brush47.png b/res/brush47.png
deleted file mode 100644
index 3d435d6..0000000
--- a/res/brush47.png
+++ /dev/null
diff --git a/res/foliage.xml b/res/foliage.xml
new file mode 100644
index 0000000..5345b39
--- /dev/null
+++ b/res/foliage.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<ilt p.id="assetFactory">
+  <assimp path="shapespark-low-poly-plants-kit.fbx"/>
+  <asset p.typeid="Foliage" id="Tree-01-1" name="Tree-01-1">
+    <bodyMesh id="body">
+      <use type="Tree-01-1"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-01-1" name="Tree-01-1">
+    <bodyMesh id="body">
+      <use type="Tree-01-1"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-01-2" name="Tree-01-2">
+    <bodyMesh id="body">
+      <use type="Tree-01-2"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-01-3" name="Tree-01-3">
+    <bodyMesh id="body">
+      <use type="Tree-01-3"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-01-4" name="Tree-01-4">
+    <bodyMesh id="body">
+      <use type="Tree-01-4"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-02-1" name="Tree-02-1">
+    <bodyMesh id="body">
+      <use type="Tree-02-1"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-02-2" name="Tree-02-2">
+    <bodyMesh id="body">
+      <use type="Tree-02-2"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-02-3" name="Tree-02-3">
+    <bodyMesh id="body">
+      <use type="Tree-02-3"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-02-4" name="Tree-02-4">
+    <bodyMesh id="body">
+      <use type="Tree-02-4"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-03-1" name="Tree-03-1">
+    <bodyMesh id="body">
+      <use type="Tree-03-1"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-03-2" name="Tree-03-2">
+    <bodyMesh id="body">
+      <use type="Tree-03-2"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-03-3" name="Tree-03-3">
+    <bodyMesh id="body">
+      <use type="Tree-03-3"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Tree-03-4" name="Tree-03-4">
+    <bodyMesh id="body">
+      <use type="Tree-03-4"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Hedge-01" name="Hedge-01">
+    <bodyMesh id="body">
+      <use type="Hedge-01"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Bush-01" name="Bush-01">
+    <bodyMesh id="body">
+      <use type="Bush-01"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Bush-02" name="Bush-02">
+    <bodyMesh id="body">
+      <use type="Bush-02"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Bush-03" name="Bush-03">
+    <bodyMesh id="body">
+      <use type="Bush-03"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Bush-04" name="Bush-04">
+    <bodyMesh id="body">
+      <use type="Bush-04"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Bush-05" name="Bush-05">
+    <bodyMesh id="body">
+      <use type="Bush-05"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Clover-01" name="Clover-01">
+    <bodyMesh id="body">
+      <use type="Clover-01"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Clover-02" name="Clover-02">
+    <bodyMesh id="body">
+      <use type="Clover-02"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Clover-03" name="Clover-03">
+    <bodyMesh id="body">
+      <use type="Clover-03"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Clover-04" name="Clover-04">
+    <bodyMesh id="body">
+      <use type="Clover-04"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Clover-05" name="Clover-05">
+    <bodyMesh id="body">
+      <use type="Clover-05"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Grass-01" name="Grass-01">
+    <bodyMesh id="body">
+      <use type="Grass-01"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Grass-02" name="Grass-02">
+    <bodyMesh id="body">
+      <use type="Grass-02"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Grass-03" name="Grass-03">
+    <bodyMesh id="body">
+      <use type="Grass-03"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Flowers-02" name="Flowers-02">
+    <bodyMesh id="body">
+      <use type="Flowers-02"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Flowers-04" name="Flowers-04">
+    <bodyMesh id="body">
+      <use type="Flowers-04"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Flowers-01" name="Flowers-01">
+    <bodyMesh id="body">
+      <use type="Flowers-01"/>
+    </bodyMesh>
+  </asset>
+  <asset p.typeid="Foliage" id="Flowers-03" name="Flowers-03">
+    <bodyMesh id="body">
+      <use type="Flowers-03"/>
+    </bodyMesh>
+  </asset>
+</ilt>
diff --git a/res/shapespark-low-poly-plants-kit.fbx b/res/shapespark-low-poly-plants-kit.fbx
new file mode 100644
index 0000000..fe87c0c
--- /dev/null
+++ b/res/shapespark-low-poly-plants-kit.fbx