Gamestate/renderer simulation

assets/CMakeLists.txt

@@ -5,13 +5,6 @@ add_subdirectory(shaders/)
 add_subdirectory(test/)
 add_subdirectory(textures/)
 
-
-install(FILES
-	"missing.png"
-	"gaben.png"
-	DESTINATION "${ASSET_DIR}"
-)
-
 install(DIRECTORY "qml"
 	DESTINATION "${ASSET_DIR}"
 )

assets/shaders/world.vert.glsl

@@ -15,6 +15,5 @@ float height = offset_tile.w - offset_tile.z;
 
 void main() {
 	gl_Position = proj * view * model * vec4(position, 0.0, 1.0);
-	// gl_Position = vec4(position, 0.0, 1.0);
     v_uv = vec2((uv.x * width) + offset_tile.x, (((1.0 - uv.y) * height) + offset_tile.z));
 }

assets/test/shaders/demo_0_display.frag.glsl

@@ -0,0 +1,10 @@
+#version 330
+
+uniform sampler2D color_texture;
+
+in vec2 v_uv;
+out vec4 col;
+
+void main() {
+	col = texture(color_texture, v_uv);
+}

assets/test/shaders/demo_0_display.vert.glsl

@@ -0,0 +1,10 @@
+#version 330
+
+layout(location=0) in vec2 position;
+layout(location=1) in vec2 uv;
+out vec2 v_uv;
+
+void main() {
+	gl_Position =  vec4(position, 0.0, 1.0);
+	v_uv = uv;
+}

assets/test/shaders/demo_0_obj.frag.glsl

@@ -0,0 +1,17 @@
+#version 330
+
+in vec2 v_uv;
+uniform sampler2D tex;
+uniform uint u_id;
+
+layout(location=0) out vec4 col;
+layout(location=1) out uint id;
+
+void main() {
+	vec4 tex_val = texture(tex, v_uv);
+	if (tex_val.a == 0) {
+		discard;
+	}
+	col = tex_val;
+	id = u_id;
+}

assets/test/shaders/demo_0_obj.vert.glsl

@@ -0,0 +1,12 @@
+#version 330
+
+layout(location=0) in vec2 position;
+layout(location=1) in vec2 uv;
+uniform mat4 mv;
+uniform mat4 proj;
+out vec2 v_uv;
+
+void main() {
+	gl_Position = proj * mv * vec4(position, 0.0, 1.0);
+	v_uv = vec2(uv.x, 1.0 - uv.y);
+}

assets/test/shaders/demo_1_display.frag.glsl

@@ -0,0 +1,10 @@
+#version 330
+
+uniform sampler2D color_texture;
+
+in vec2 v_uv;
+out vec4 col;
+
+void main() {
+	col = texture(color_texture, v_uv);
+}

assets/test/shaders/demo_1_display.vert.glsl

@@ -0,0 +1,10 @@
+#version 330
+
+layout(location=0) in vec2 position;
+layout(location=1) in vec2 uv;
+out vec2 v_uv;
+
+void main() {
+	gl_Position = vec4(position, 0.0, 1.0);
+	v_uv = uv;
+}

assets/test/shaders/demo_1_obj.frag.glsl

@@ -0,0 +1,31 @@
+#version 330
+
+in vec2 v_uv;
+uniform sampler2D tex;
+uniform uint u_id;
+
+layout(location=0) out vec4 col;
+layout(location=1) out uint id;
+
+void main() {
+	vec4 tex_val = texture(tex, v_uv);
+	int alpha = int(round(tex_val.a * 255));
+	switch (alpha) {
+		case 0:
+		discard;
+		break;
+		case 254:
+		col = vec4(1.0f, 0.0f, 0.0f, 1.0f);
+		break;
+		case 252:
+		col = vec4(0.0f, 1.0f, 0.0f, 1.0f);
+		break;
+		case 250:
+		col = vec4(0.0f, 0.0f, 1.0f, 1.0f);
+		break;
+		default:
+	    col = tex_val;
+		break;
+	}
+	id = u_id;
+}

assets/test/shaders/demo_1_obj.vert.glsl

@@ -0,0 +1,18 @@
+#version 330
+
+layout(location=0) in vec2 position;
+layout(location=1) in vec2 uv;
+
+uniform mat4 mv;
+uniform mat4 proj;
+uniform vec4 offset_tile;
+
+float width = offset_tile.y - offset_tile.x;
+float height = offset_tile.w - offset_tile.z;
+
+out vec2 v_uv;
+
+void main() {
+	gl_Position = proj * mv * vec4(position, 0.0, 1.0);
+    v_uv = vec2((uv.x * width) + offset_tile.x, (((1.0 - uv.y) * height) + offset_tile.z));
+}

assets/test/shaders/demo_2_display.frag.glsl

@@ -0,0 +1,7 @@
+#version 330
+
+out vec4 col;
+
+void main() {
+    col = vec4(1.0, 0.4, 0.0, 0.8);
+}

assets/test/shaders/demo_2_display.vert.glsl

@@ -0,0 +1,7 @@
+#version 330
+
+layout(location=0) in vec2 position;
+
+void main() {
+	gl_Position = vec4(position, 0.0, 1.0);
+}

assets/test/shaders/demo_4_display.frag.glsl

@@ -0,0 +1,10 @@
+#version 330
+
+uniform sampler2D color_texture;
+
+in vec2 v_uv;
+out vec4 col;
+
+void main() {
+	col = texture(color_texture, v_uv);
+}

assets/test/shaders/demo_4_display.vert.glsl

@@ -0,0 +1,10 @@
+#version 330
+
+layout(location=0) in vec2 position;
+layout(location=1) in vec2 uv;
+out vec2 v_uv;
+
+void main() {
+	gl_Position = vec4(position, 0.0, 1.0);
+	v_uv = uv;
+}

assets/test/shaders/demo_4_obj.frag.glsl

@@ -0,0 +1,31 @@
+#version 330
+
+in vec2 v_uv;
+uniform sampler2D tex;
+uniform uint u_id;
+
+layout(location=0) out vec4 col;
+layout(location=1) out uint id;
+
+void main() {
+	vec4 tex_val = texture(tex, v_uv);
+	int alpha = int(round(tex_val.a * 255));
+	switch (alpha) {
+		case 0:
+		discard;
+		break;
+		case 254:
+		col = vec4(1.0f, 0.0f, 0.0f, 1.0f);
+		break;
+		case 252:
+		col = vec4(0.0f, 1.0f, 0.0f, 1.0f);
+		break;
+		case 250:
+		col = vec4(0.0f, 0.0f, 1.0f, 1.0f);
+		break;
+		default:
+	    col = tex_val;
+		break;
+	}
+	id = u_id;
+}

assets/test/shaders/demo_4_obj.vert.glsl

@@ -0,0 +1,18 @@
+#version 330
+
+layout(location=0) in vec2 position;
+layout(location=1) in vec2 uv;
+
+uniform mat4 mv;
+uniform mat4 proj;
+uniform vec4 offset_tile;
+
+float width = offset_tile.y - offset_tile.x;
+float height = offset_tile.w - offset_tile.z;
+
+out vec2 v_uv;
+
+void main() {
+	gl_Position = proj * mv * vec4(position, 0.0, 1.0);
+    v_uv = vec2((uv.x * width) + offset_tile.x, (((1.0 - uv.y) * height) + offset_tile.z));
+}

assets/test/textures/test_animation.sprite

@@ -0,0 +1,31 @@
+# Copyright 2021-2021 the openage authors. See copying.md for legal info.
+# openage sprite definition file
+
+version 2
+
+texture 0 "test_texture.texture"
+
+scalefactor 1
+
+layer 0 mode=loop position=20 time_per_frame=0.125
+
+angle 0
+
+frame 0 0 0 0 0
+frame 1 0 0 0 1
+frame 2 0 0 0 2
+frame 3 0 0 0 3
+frame 4 0 0 0 4
+frame 5 0 0 0 5
+frame 6 0 0 0 6
+frame 7 0 0 0 7
+frame 8 0 0 0 8
+frame 9 0 0 0 9
+frame 10 0 0 0 10
+frame 11 0 0 0 11
+frame 12 0 0 0 12
+frame 13 0 0 0 13
+frame 14 0 0 0 14
+frame 15 0 0 0 15
+frame 16 0 0 0 16
+frame 17 0 0 0 17

assets/test/textures/test_gaben.sprite

@@ -0,0 +1,14 @@
+# Copyright 2023-2023 the openage authors. See copying.md for legal info.
+# openage sprite definition file
+
+version 2
+
+texture 0 "test_gaben.texture"
+
+scalefactor 1
+
+layer 0 mode=once
+
+angle 0
+
+frame 0 0 0 0 0

assets/test/textures/test_gaben.texture

@@ -0,0 +1,12 @@
+# Copyright 2023-2023 the openage authors.
+# openage texture definition file
+
+version 1
+
+imagefile "gaben.png"
+
+size 719 1073
+
+pxformat rgba8 cbits=True
+
+subtex 0 0 719 1073 359 536

assets/test/textures/test_missing.sprite

@@ -0,0 +1,14 @@
+# Copyright 2023-2023 the openage authors. See copying.md for legal info.
+# openage sprite definition file
+
+version 2
+
+texture 0 "test_missing.texture"
+
+scalefactor 1
+
+layer 0 mode=once
+
+angle 0
+
+frame 0 0 0 0 0

assets/test/textures/test_missing.texture

@@ -0,0 +1,12 @@
+# Copyright 2023-2023 the openage authors.
+# openage texture definition file
+
+version 1
+
+imagefile "missing.png"
+
+size 32 32
+
+pxformat rgba8 cbits=True
+
+subtex 0 0 32 32 16 16

assets/test/textures/test_terrain.terrain

@@ -0,0 +1,12 @@
+# Copyright 2023-2023 the openage authors. See copying.md for legal info.
+# openage terrain definition file
+
+version 2
+
+texture 0 "test_terrain.texture"
+
+scalefactor 1
+
+layer 0
+
+frame 0 0 0 0

assets/test/textures/test_terrain.texture

@@ -0,0 +1,12 @@
+# Copyright 2023-2023 the openage authors.
+# openage texture definition file
+
+version 1
+
+imagefile "test_terrain.png"
+
+size 500 500
+
+pxformat rgba8 cbits=True
+
+subtex 0 0 500 500 0 0

assets/test/textures/test_texture.texture

@@ -0,0 +1,45 @@
+# The image file was adapted from the "Elemental Ground Monk" sprite pack,
+# Copyright 2021-2021 by chierit.
+#
+# It's licensed under the terms of the Creative Commons Attribution v4.0 International license.
+# (https://creativecommons.org/licenses/by/4.0/)
+#
+# The original version can be found at:
+# https://chierit.itch.io/elementals-ground-monk
+#
+# Modifications by us:
+#   - Extracted sprites from the "3_atk" animation
+#   - Added an outline to the monk with the openage outline colour command (RGBA: 0,0,0,252)
+#   - Changed orange colour (239,105,47,255) with the openage playercolor colour command (RGBA: 239,105,47,254)
+#
+# Copyright 2021-2021 the openage authors.
+# See copying.md for further legal info.
+
+# openage texture definition file
+
+version 1
+
+imagefile "test_texture.png"
+
+size 208 160
+
+pxformat rgba8 cbits=True
+
+subtex 0 0 28 39 0 0
+subtex 28 0 27 37 0 0
+subtex 55 0 36 38 0 0
+subtex 91 0 40 36 0 0
+subtex 91 36 42 37 0 0
+subtex 0 73 33 42 0 0
+subtex 33 73 36 46 0 0
+subtex 69 73 35 37 0 0
+subtex 131 0 28 33 0 0
+subtex 133 33 27 45 0 0
+subtex 104 78 28 46 0 0
+subtex 0 124 47 31 0 0
+subtex 160 0 48 41 0 0
+subtex 160 41 48 41 0 0
+subtex 132 82 48 41 0 0
+subtex 47 123 51 37 0 0
+subtex 0 41 55 31 0 0
+subtex 132 123 48 31 0 0