aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornathan <nathansmith@disroot.org>2025-08-08 20:22:22 +0000
committernathan <nathansmith@disroot.org>2025-08-08 20:22:22 +0000
commit9008ba69ba749e96da1ce0c56dce91ea72296223 (patch)
treefbb7a39b0716fca036b4fbd2c581cea3c83456d5
parente5acfb329827802fe2259f91701dc8762c2573b6 (diff)
downloadFindThings-9008ba69ba749e96da1ce0c56dce91ea72296223.tar.gz
FindThings-9008ba69ba749e96da1ce0c56dce91ea72296223.tar.bz2
FindThings-9008ba69ba749e96da1ce0c56dce91ea72296223.zip
I need sleep
-rw-r--r--assets/models/UtilityPole.obj50
-rw-r--r--assets/shaders/glsl330/instancing.fs2
-rw-r--r--assets/shaders/glsl330/instancing.vs2
-rw-r--r--src/world.c2
4 files changed, 27 insertions, 29 deletions
diff --git a/assets/models/UtilityPole.obj b/assets/models/UtilityPole.obj
index 83cf6ae..d5bdeeb 100644
--- a/assets/models/UtilityPole.obj
+++ b/assets/models/UtilityPole.obj
@@ -1,19 +1,19 @@
# Blender 4.4.3
# www.blender.org
mtllib UtilityPole.mtl
-o UtilityPole
-v 0.000000 -20.000000 -1.000000
-v 0.000000 20.000000 -1.000000
-v 0.866025 -20.000000 -0.500000
-v 0.866025 20.000000 -0.500000
-v 0.866025 -20.000000 0.500000
-v 0.866025 20.000000 0.500000
-v 0.000000 -20.000000 1.000000
-v 0.000000 20.000000 1.000000
-v -0.866025 -20.000000 0.500000
-v -0.866025 20.000000 0.500000
-v -0.866025 -20.000000 -0.500000
-v -0.866025 20.000000 -0.500000
+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
vn 1.0000 -0.0000 -0.0000
vn 0.5000 -0.0000 0.8660
@@ -31,41 +31,41 @@ vt 0.666667 1.000000
vt 0.500000 0.500000
vt 0.500000 1.000000
vt 0.333333 0.500000
-vt 0.250000 0.490000
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.957846 0.370000
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
-vt 0.250000 0.010000
vt -0.000000 1.000000
vt 0.750000 0.490000
+vt 0.957846 0.370000
vt 0.957846 0.130000
-vt 0.542154 0.130000
s 0
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
f 8/8/4 9/9/4 7/7/4
-f 2/10/5 10/11/5 6/12/5
+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 3/17/8 7/18/8 11/19/8
+f 7/17/8 9/18/8 11/19/8
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 2/10/5
-f 2/10/5 12/21/5 10/11/5
-f 10/11/5 8/22/5 6/12/5
+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 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 3/17/8
-f 3/17/8 5/25/8 7/18/8
-f 7/18/8 9/26/8 11/19/8
+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
diff --git a/assets/shaders/glsl330/instancing.fs b/assets/shaders/glsl330/instancing.fs
index 0044ac7..40eaddf 100644
--- a/assets/shaders/glsl330/instancing.fs
+++ b/assets/shaders/glsl330/instancing.fs
@@ -1,7 +1,5 @@
#version 330 core
-// https://github.com/Rogeatic/raylib-instancing
-
// Input vertex attributes (from vertex shader)
in vec2 fragTexCoord;
diff --git a/assets/shaders/glsl330/instancing.vs b/assets/shaders/glsl330/instancing.vs
index 800d6fd..f537278 100644
--- a/assets/shaders/glsl330/instancing.vs
+++ b/assets/shaders/glsl330/instancing.vs
@@ -1,7 +1,5 @@
#version 330 core
-// https://github.com/Rogeatic/raylib-instancing
-
// Input vertex attributes
in vec3 vertexPosition;
in vec2 vertexTexCoord;
diff --git a/src/world.c b/src/world.c
index a5af6e7..7a50885 100644
--- a/src/world.c
+++ b/src/world.c
@@ -494,6 +494,8 @@ Seed generateWorldUtilityPoles(World* world, const Assets* assets, Seed seed,
shader.locs[SHADER_LOC_MATRIX_PROJECTION] = GetShaderLocation(shader,
"projection");
assets->models[UTILITY_POLE_MODEL].materials[0].shader = shader;
+ assets->models[UTILITY_POLE_MODEL].materials[0]
+ .maps[MATERIAL_MAP_DIFFUSE].color = BLUE;
for (int index = start; index < end; ++index)
{