Better utility pole model

3 files changed, 274 insertions, 23 deletions

diff --git a/assets/models/UtilityPole.mtl b/assets/models/UtilityPole.mtl
index 7ec6792..2f89de0 100644
--- a/assets/models/UtilityPole.mtl
+++ b/assets/models/UtilityPole.mtl
@@ -1,2 +1,12 @@
 # Blender 4.4.3 MTL File: 'None'
 # www.blender.org
+
+newmtl Material
+Ns 250.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.500000
+d 1.000000
+illum 2
diff --git a/assets/models/UtilityPole.obj b/assets/models/UtilityPole.obj
index d5bdeeb..a4e05ce 100644
--- a/assets/models/UtilityPole.obj
+++ b/assets/models/UtilityPole.obj
@@ -1,27 +1,123 @@
 # Blender 4.4.3
 # www.blender.org
 mtllib UtilityPole.mtl
-o Cylinder
-v 0.000000 -100.000000 -3.000000
-v 0.000000 100.000000 -3.000000
-v 2.598076 -100.000000 -1.500000
-v 2.598076 100.000000 -1.500000
-v 2.598076 -100.000000 1.500000
-v 2.598076 100.000000 1.500000
-v 0.000000 -100.000000 3.000000
-v 0.000000 100.000000 3.000000
-v -2.598076 -100.000000 1.500000
-v -2.598076 100.000000 1.500000
-v -2.598076 -100.000000 -1.500000
-v -2.598076 100.000000 -1.500000
-vn 0.5000 -0.0000 -0.8660
+o UtilityPole
+v -4.185792 96.787964 40.433559
+v -4.185785 96.787964 -40.433559
+v -2.886754 97.537964 40.433559
+v -2.886747 97.537964 -40.433559
+v -2.886754 99.037964 40.433559
+v -2.886747 99.037964 -40.433559
+v -4.185792 99.787964 40.433559
+v -4.185785 99.787964 -40.433559
+v -5.484830 99.037964 40.433559
+v -5.484823 99.037964 -40.433559
+v -5.484830 97.537964 40.433559
+v -5.484823 97.537964 -40.433559
+v 0.000000 -100.000000 -2.999992
+v 0.000000 100.000000 -3.000008
+v 2.598076 -100.000000 -1.499992
+v 2.598076 100.000000 -1.500008
+v 2.598076 -100.000000 1.500008
+v 2.598077 100.000000 1.499993
+v -0.000000 -100.000000 3.000008
+v 0.000000 100.000000 2.999993
+v -2.598076 -100.000000 1.500008
+v -2.598076 100.000000 1.499993
+v -2.598077 -100.000000 -1.499992
+v -2.598076 100.000000 -1.500008
+v -4.185792 81.228996 40.433559
+v -4.185785 81.228996 -40.433559
+v -2.886754 81.978996 40.433559
+v -2.886747 81.978996 -40.433559
+v -2.886754 83.478996 40.433559
+v -2.886747 83.478996 -40.433559
+v -4.185792 84.228996 40.433559
+v -4.185785 84.228996 -40.433559
+v -5.484830 83.478996 40.433559
+v -5.484823 83.478996 -40.433559
+v -5.484830 81.978996 40.433559
+v -5.484823 81.978996 -40.433559
+v 1.097947 75.581894 -0.852443
+v -3.878506 82.333672 -9.659947
+v 1.563250 76.434464 -0.461776
+v -3.413203 83.186241 -9.269281
+v 1.073404 77.014130 0.259365
+v -3.903049 83.765900 -8.548140
+v 0.118254 76.741219 0.589839
+v -4.858199 83.492996 -8.217666
+v -0.347049 75.888649 0.199172
+v -5.323502 82.640427 -8.608332
+v 0.142797 75.308990 -0.521969
+v -4.833655 82.060760 -9.329473
+v 1.475691 75.549820 -1.176989
+v -4.384640 83.244644 6.442365
+v 2.520627 75.652954 -0.477439
+v -3.339703 83.347771 7.141915
+v 2.562824 74.990311 0.224222
+v -3.297507 82.685127 7.843576
+v 1.560084 74.224533 0.226332
+v -4.300247 81.919357 7.845686
+v 0.515147 74.121407 -0.473217
+v -5.345184 81.816223 7.146136
+v 0.472950 74.784050 -1.174878
+v -5.387380 82.478867 6.444476
+v 1.475691 91.219925 -1.176989
+v -4.384640 98.914749 6.442366
+v 2.520628 91.323059 -0.477439
+v -3.339703 99.017876 7.141915
+v 2.562824 90.660416 0.224222
+v -3.297507 98.355232 7.843575
+v 1.560084 89.894638 0.226332
+v -4.300247 97.589462 7.845687
+v 0.515148 89.791512 -0.473217
+v -5.345183 97.486336 7.146137
+v 0.472951 90.454155 -1.174878
+v -5.387380 98.148972 6.444476
+v 1.097946 91.251999 -0.852443
+v -3.878506 98.003777 -9.659947
+v 1.563250 92.104568 -0.461776
+v -3.413203 98.856346 -9.269280
+v 1.073403 92.684235 0.259365
+v -3.903049 99.436012 -8.548140
+v 0.118254 92.411324 0.589839
+v -4.858199 99.163101 -8.217666
+v -0.347050 91.558754 0.199172
+v -5.323503 98.310532 -8.608333
+v 0.142797 90.979095 -0.521969
+v -4.833656 97.730873 -9.329473
+vn 0.5000 -0.8660 -0.0000
 vn 1.0000 -0.0000 -0.0000
+vn 0.5000 0.8660 -0.0000
+vn -0.5000 0.8660 -0.0000
+vn -0.0000 -0.0000 -1.0000
+vn -1.0000 -0.0000 -0.0000
+vn -0.5000 -0.8660 -0.0000
+vn -0.0000 -0.0000 1.0000
+vn 0.5000 -0.0000 -0.8660
 vn 0.5000 -0.0000 0.8660
 vn -0.5000 -0.0000 0.8660
 vn -0.0000 1.0000 -0.0000
-vn -1.0000 -0.0000 -0.0000
 vn -0.5000 -0.0000 -0.8660
 vn -0.0000 -1.0000 -0.0000
+vn 0.7969 -0.1692 -0.5799
+vn 0.7834 0.6207 0.0332
+vn -0.0135 0.7899 0.6131
+vn -0.7969 0.1692 0.5799
+vn -0.4092 0.5551 -0.7242
+vn -0.7834 -0.6207 -0.0332
+vn 0.0135 -0.7899 -0.6131
+vn 0.4092 -0.5551 0.7242
+vn 0.2959 0.7764 -0.5565
+vn 0.8784 0.3727 0.2992
+vn 0.3766 -0.4910 0.7855
+vn -0.2959 -0.7764 0.5565
+vn -0.4759 0.6249 0.6188
+vn -0.8784 -0.3727 -0.2992
+vn -0.3766 0.4910 -0.7855
+vn 0.4759 -0.6249 -0.6188
+vn -0.7969 0.1692 0.5800
+vn -0.4760 0.6249 0.6188
 vt 1.000000 1.000000
 vt 0.833333 0.500000
 vt 1.000000 0.500000
@@ -41,6 +137,23 @@ vt -0.000000 0.500000
 vt 0.750000 0.010000
 vt 0.542154 0.130000
 vt 0.542154 0.370000
+vt 0.833333 0.500000
+vt 0.833333 1.000000
+vt 0.666667 0.500000
+vt 0.666667 1.000000
+vt 0.500000 0.500000
+vt 0.500000 1.000000
+vt 0.333333 0.500000
+vt 0.042154 0.130000
+vt 0.250000 0.010000
+vt 0.457846 0.130000
+vt 0.333333 1.000000
+vt 0.166667 0.500000
+vt 0.166667 1.000000
+vt -0.000000 0.500000
+vt 0.750000 0.010000
+vt 0.542154 0.130000
+vt 0.542154 0.370000
 vt 0.457846 0.370000
 vt 0.250000 0.490000
 vt 0.042154 0.370000
@@ -48,7 +161,13 @@ vt -0.000000 1.000000
 vt 0.750000 0.490000
 vt 0.957846 0.370000
 vt 0.957846 0.130000
+vt -0.000000 1.000000
+vt 0.457846 0.370000
+vt 0.042154 0.370000
+vt 0.957846 0.370000
+vt 0.957846 0.130000
 s 0
+usemtl 
 f 2/1/1 3/2/1 1/3/1
 f 4/4/2 5/5/2 3/2/2
 f 6/6/3 7/7/3 5/5/3
@@ -57,15 +176,137 @@ f 10/10/5 8/11/5 6/12/5
 f 10/13/6 11/14/6 9/9/6
 f 12/15/7 1/16/7 11/14/7
 f 7/17/8 9/18/8 11/19/8
+f 26/1/1 27/2/1 25/3/1
+f 28/4/2 29/5/2 27/2/2
+f 30/6/3 31/7/3 29/5/3
+f 32/8/4 33/9/4 31/7/4
+f 34/10/5 32/11/5 30/12/5
+f 34/13/6 35/14/6 33/9/6
+f 36/15/7 25/16/7 35/14/7
+f 31/17/8 33/18/8 35/19/8
+f 38/1/15 39/2/15 37/3/15
+f 40/4/16 41/5/16 39/2/16
+f 42/6/17 43/7/17 41/5/17
+f 43/7/18 46/13/18 45/9/18
+f 44/11/19 42/12/19 38/38/19
+f 45/9/20 48/15/20 47/14/20
+f 47/14/21 38/44/21 37/16/21
+f 43/17/22 45/18/22 47/19/22
+f 49/3/23 52/4/23 51/2/23
+f 51/2/24 54/6/24 53/5/24
+f 53/5/25 56/8/25 55/7/25
+f 56/8/26 57/9/26 55/7/26
+f 56/11/27 54/12/27 50/38/27
+f 58/13/28 59/14/28 57/9/28
+f 60/15/29 49/16/29 59/14/29
+f 55/17/30 57/18/30 59/19/30
+f 61/3/23 64/4/23 63/2/23
+f 63/2/24 66/6/24 65/5/24
+f 65/5/25 68/8/25 67/7/25
+f 68/8/26 69/9/26 67/7/26
+f 68/11/27 66/12/27 62/38/27
+f 70/13/28 71/14/28 69/9/28
+f 72/15/29 61/16/29 71/14/29
+f 67/17/30 69/18/30 71/19/30
+f 74/1/15 75/2/15 73/3/15
+f 76/4/16 77/5/16 75/2/16
+f 78/6/17 79/7/17 77/5/17
+f 79/7/31 82/13/31 81/9/31
+f 80/11/19 78/12/19 74/38/19
+f 81/9/20 84/15/20 83/14/20
+f 83/14/21 74/44/21 73/16/21
+f 79/17/22 81/18/22 83/19/22
 f 2/1/1 4/4/1 3/2/1
 f 4/4/2 6/6/2 5/5/2
 f 6/6/3 8/8/3 7/7/3
 f 8/8/4 10/13/4 9/9/4
-f 6/12/5 4/20/5 10/10/5
-f 4/20/5 2/21/5 10/10/5
-f 2/21/5 12/22/5 10/10/5
+f 6/12/5 4/45/5 10/10/5
+f 4/45/5 2/38/5 10/10/5
+f 2/38/5 12/46/5 10/10/5
 f 10/13/6 12/15/6 11/14/6
-f 12/15/7 2/23/7 1/16/7
-f 11/19/8 1/24/8 7/17/8
-f 1/24/8 3/25/8 7/17/8
-f 3/25/8 5/26/8 7/17/8
+f 12/15/7 2/44/7 1/16/7
+f 11/19/8 1/41/8 7/17/8
+f 1/41/8 3/47/8 7/17/8
+f 3/47/8 5/48/8 7/17/8
+f 26/1/1 28/4/1 27/2/1
+f 28/4/2 30/6/2 29/5/2
+f 30/6/3 32/8/3 31/7/3
+f 32/8/4 34/13/4 33/9/4
+f 30/12/5 28/45/5 34/10/5
+f 28/45/5 26/38/5 34/10/5
+f 26/38/5 36/46/5 34/10/5
+f 34/13/6 36/15/6 35/14/6
+f 36/15/7 26/44/7 25/16/7
+f 35/19/8 25/41/8 31/17/8
+f 25/41/8 27/47/8 31/17/8
+f 27/47/8 29/48/8 31/17/8
+f 38/1/15 40/4/15 39/2/15
+f 40/4/16 42/6/16 41/5/16
+f 42/6/17 44/8/17 43/7/17
+f 43/7/31 44/8/31 46/13/31
+f 42/12/19 40/45/19 38/38/19
+f 38/38/19 48/46/19 44/11/19
+f 48/46/19 46/10/19 44/11/19
+f 45/9/20 46/13/20 48/15/20
+f 47/14/21 48/15/21 38/44/21
+f 47/19/22 37/41/22 43/17/22
+f 37/41/22 39/47/22 41/48/22
+f 43/17/22 37/41/22 41/48/22
+f 49/3/23 50/1/23 52/4/23
+f 51/2/24 52/4/24 54/6/24
+f 53/5/25 54/6/25 56/8/25
+f 56/8/26 58/13/26 57/9/26
+f 54/12/27 52/45/27 50/38/27
+f 50/38/27 60/46/27 56/11/27
+f 60/46/32 58/10/32 56/11/32
+f 58/13/28 60/15/28 59/14/28
+f 60/15/29 50/44/29 49/16/29
+f 59/19/30 49/41/30 55/17/30
+f 49/41/30 51/47/30 53/48/30
+f 55/17/30 49/41/30 53/48/30
+f 61/3/23 62/1/23 64/4/23
+f 63/2/24 64/4/24 66/6/24
+f 65/5/25 66/6/25 68/8/25
+f 68/8/26 70/13/26 69/9/26
+f 66/12/27 64/45/27 62/38/27
+f 62/38/27 72/46/27 68/11/27
+f 72/46/27 70/10/27 68/11/27
+f 70/13/28 72/15/28 71/14/28
+f 72/15/29 62/44/29 61/16/29
+f 71/19/30 61/41/30 67/17/30
+f 61/41/30 63/47/30 65/48/30
+f 67/17/30 61/41/30 65/48/30
+f 74/1/15 76/4/15 75/2/15
+f 76/4/16 78/6/16 77/5/16
+f 78/6/17 80/8/17 79/7/17
+f 79/7/18 80/8/18 82/13/18
+f 78/12/19 76/45/19 74/38/19
+f 74/38/19 84/46/19 80/11/19
+f 84/46/19 82/10/19 80/11/19
+f 81/9/20 82/13/20 84/15/20
+f 83/14/21 84/15/21 74/44/21
+f 83/19/22 73/41/22 79/17/22
+f 73/41/22 75/47/22 77/48/22
+f 79/17/22 73/41/22 77/48/22
+s 1
+usemtl Material
+f 14/1/9 15/20/9 13/3/9
+f 16/21/2 17/22/2 15/20/2
+f 18/23/10 19/24/10 17/22/10
+f 20/25/11 21/26/11 19/24/11
+f 22/27/12 20/28/12 18/29/12
+f 22/30/6 23/31/6 21/26/6
+f 24/32/13 13/33/13 23/31/13
+f 19/34/14 21/35/14 23/36/14
+f 14/1/9 16/21/9 15/20/9
+f 16/21/2 18/23/2 17/22/2
+f 18/23/10 20/25/10 19/24/10
+f 20/25/11 22/30/11 21/26/11
+f 18/29/12 16/37/12 22/27/12
+f 16/37/12 14/38/12 22/27/12
+f 14/38/12 24/39/12 22/27/12
+f 22/30/6 24/32/6 23/31/6
+f 24/32/13 14/40/13 13/33/13
+f 23/36/14 13/41/14 19/34/14
+f 13/41/14 15/42/14 19/34/14
+f 15/42/14 17/43/14 19/34/14
diff --git a/src/world.c b/src/world.c
index 658fb49..bd1c3c4 100644
--- a/src/world.c
+++ b/src/world.c
@@ -488,7 +488,7 @@ Seed generateWorldUtilityPoles(World* world, const Assets* assets, Seed seed,
   assets->models[UTILITY_POLE_MODEL].materials[0].shader =
     assets->shaders[INSTANCING_SHADER];
   assets->models[UTILITY_POLE_MODEL].materials[0]
-    .maps[MATERIAL_MAP_DIFFUSE].color = BLUE;
+    .maps[MATERIAL_MAP_DIFFUSE].color = BROWN;
   
   for (int index = start; index < end; ++index)
   {