New batch renderer

.gitignore

@@ -61,3 +61,7 @@ perf.data*
 /GPATH
 /GRTAGS
 /GTAGS
+#copyrighted assets
+/assets/converted/
+/assets/terrain/
+.vscode/settings.json

.mailmap

@@ -13,3 +13,4 @@ Henry Snoek <?> <snoek09@users.noreply.github.com>
 coop shell (Michael Enßlin, Jonas Jelten, Andre Kupka) <coop@sft.mx>
 Franz-Niclas Muschter <fm@stusta.net> <franz-niclas.muschter@stusta.net>
 Niklas Fiekas <niklas.fiekas@backscattering.de> <niklas.fiekas@tu-clausthal.de>
+Wojciech Nawrocki <wjnawrocki@protonmail.com> <wjnawrocki+gh@protonmail.com>

CMakeLists.txt

@@ -54,6 +54,14 @@ if(NOT DEFINED WANT_INOTIFY)
 	set(WANT_INOTIFY if_available)
 endif()
 
+if(NOT DEFINED WANT_OPENGL)
+	set(WANT_OPENGL if_available)
+endif()
+
+if(NOT DEFINED WANT_VULKAN)
+	set(WANT_VULKAN if_available)
+endif()
+
 if(NOT DEFINED WANT_GPERFTOOLS_PROFILER)
 	set(WANT_GPERFTOOLS_PROFILER if_available)
 endif()

README.md

@@ -29,7 +29,7 @@ Technology     | Component
 **Qt5**        | Graphical user interface
 **Cython**     | Glue code
 **CMake**      | Build system
-**OpenGL2.1**  | Rendering, shaders
+**OpenGL3.3**  | Rendering, shaders
 **SDL2**       | Cross-platform Audio/Input/Window handling
 **Opus**       | Audio codec
 **Humans**     | Mixing together all of the above

assets/test_shaders/alphamask.frag.glsl

@@ -0,0 +1,34 @@
+// alpha masking shader
+//
+// applies an alpha mask texture to a base texture,
+// then draws the masked texture.
+#version 330
+
+// the base and mask texture, base is the plain terrain tile
+uniform sampler2D base_texture;
+uniform sampler2D mask_texture;
+
+// disable blending and show the mask instead
+//uniform bool show_mask;
+
+// get those interpolated texture position from vertexshader
+in vec2 base_tex_position;
+in vec2 mask_tex_position;
+
+layout(location=0) out vec4 blended_pixel;
+
+void main() {
+	// get the texel from the uniform texture.
+	vec4 base_pixel = texture2D(base_texture, base_tex_position);
+	vec4 mask_pixel = texture2D(mask_texture, mask_tex_position);
+
+	//float factor = 1.0 - mask_pixel.x;
+	float factor = mask_pixel.x;
+	vec4 blended_pixel = vec4(base_pixel.r, base_pixel.g, base_pixel.b, base_pixel.a - factor);
+
+	//if (0) {
+	//	gl_FragColor = mask_pixel;
+	//} else {
+		gl_FragColor = blended_pixel;
+	//}
+}

assets/test_shaders/alphamask.vert.glsl

@@ -0,0 +1,25 @@
+// vertex shader for applying an alpha mask to a texture
+#version 330
+
+// modelview*projection matrix
+uniform mat4 mvp_matrix;
+
+// the position of this vertex
+layout(location=0) in vec2 vertex_position;
+
+// send the texture coordinates to the fragmentshader
+layout(location=1) in vec2 base_tex_coordinates;
+layout(location=2) in vec2 mask_tex_coordinates;
+
+// send the texture coordinates to the fragmentshader
+out vec2 base_tex_position;
+out vec2 mask_tex_position;
+
+void main(void) {
+	// transform the position with the mvp matrix
+	gl_Position = mvp_matrix * vec4(vertex_position,0.0,1.0);
+
+	// set the fixpoints for the tex coordinates at this vertex
+	mask_tex_position = mask_tex_coordinates;
+	base_tex_position = base_tex_coordinates;
+}

assets/test_shaders/batch.frag.glsl

@@ -0,0 +1,157 @@
+#version 330 core
+out vec4 FragColor;
+
+in vec4 ourColor;
+in vec2 pos;
+in vec2 uv;
+in float a_id;
+uniform vec2 mouse_pos = vec2(0.0,0.0);
+
+uniform sampler2D texture_0;
+uniform sampler2D texture_1;
+uniform sampler2D texture_2;
+uniform sampler2D texture_3;
+uniform sampler2D texture_4;
+uniform sampler2D texture_5;
+uniform sampler2D texture_6;
+uniform sampler2D texture_7;
+uniform sampler2D texture_8;
+uniform sampler2D texture_9;
+uniform sampler2D texture_10;
+uniform sampler2D texture_11;
+uniform sampler2D texture_12;
+uniform sampler2D texture_13;
+uniform sampler2D texture_14;
+uniform sampler2D texture_15;
+uniform sampler2D texture_16;
+uniform sampler2D texture_17;
+uniform sampler2D texture_18;
+uniform sampler2D texture_19;
+uniform sampler2D texture_20;
+uniform sampler2D texture_21;
+uniform sampler2D texture_22;
+uniform sampler2D texture_23;
+uniform sampler2D texture_24;
+uniform sampler2D texture_25;
+uniform sampler2D texture_26;
+uniform sampler2D texture_27;
+uniform sampler2D texture_28;
+uniform sampler2D texture_29;
+uniform sampler2D texture_30;
+uniform sampler2D texture_31;
+
+void switcher(in int index,out vec4 color){
+
+switch(index){
+case 0:
+        color = texture(texture_0, uv);
+        break;
+case 1:
+        color = texture(texture_1, uv);
+        break;
+case 2:
+        color = texture(texture_2, uv);
+        break;
+case 3:
+        color = texture(texture_3, uv);
+        break;
+case 4:
+        color = texture(texture_4, uv);
+        break;
+case 5:
+        color = texture(texture_5, uv);
+        break;
+case 6:
+        color = texture(texture_6, uv);
+        break;
+case 7:
+        color = texture(texture_7, uv);
+        break;
+case 8:
+        color = texture(texture_8, uv);
+        break;
+case 9:
+        color = texture(texture_9, uv);
+        break;
+case 10:
+        color = texture(texture_10, uv);
+        break;
+case 11:
+        color = texture(texture_11, uv);
+        break;
+case 12:
+        color = texture(texture_12, uv);
+        break;
+case 13:
+        color = texture(texture_13, uv);
+        break;
+case 14:
+        color = texture(texture_14, uv);
+        break;
+case 15:
+        color = texture(texture_15, uv);
+        break;
+case 16:
+        color = texture(texture_16, uv);
+        break;
+case 17:
+        color = texture(texture_17, uv);
+        break;
+case 18:
+        color = texture(texture_18, uv);
+        break;
+case 19:
+        color = texture(texture_19, uv);
+        break;
+case 20:
+        color = texture(texture_20, uv);
+        break;
+case 21:
+        color = texture(texture_21, uv);
+        break;
+case 22:
+        color = texture(texture_22, uv);
+        break;
+case 23:
+        color = texture(texture_23, uv);
+        break;
+case 24:
+        color = texture(texture_24, uv);
+        break;
+case 25:
+        color = texture(texture_25, uv);
+        break;
+case 26:
+        color = texture(texture_26, uv);
+        break;
+case 27:
+        color = texture(texture_27, uv);
+        break;
+case 28:
+        color = texture(texture_28, uv);
+        break;
+
+case 29:
+        color = texture(texture_29, uv);
+        break;
+case 30:
+        color = texture(texture_30, uv);
+        break;
+
+case 31:
+        color = texture(texture_31, uv);
+        break;
+}
+}
+void main()
+{
+	float intensity = 500.0/(length(pos - mouse_pos));
+	FragColor = ourColor*intensity;	
+	if(a_id != -1.0){
+	int index = int(a_id + 0.5);
+	vec4 tex_color;
+ 	switcher(index,tex_color);	
+	FragColor = tex_color;//*intensity;
+	}
+
+}

assets/test_shaders/batch.vert.glsl

@@ -0,0 +1,27 @@
+#version 330 core
+layout (location = 0) in vec2 aPos;
+layout (location = 1) in vec4 aColor;
+layout (location = 2) in vec2 auv;
+layout (location = 3) in float active_id;
+layout (location = 4) in float is_terrain;
+uniform mat4 ortho = mat4(1.0);
+uniform mat4 dimet = mat4(1.0);
+out vec4 ourColor;
+out vec2 pos;
+out vec2 uv;
+out float a_id;
+
+
+
+void main()
+{
+if(is_terrain == 1.0){
+  	gl_Position = ortho*dimet*vec4(aPos,0.0, 1.0);
+}
+else
+	gl_Position = ortho*vec4(aPos,0.0, 1.0);
+    ourColor = aColor;	
+    pos =aPos;
+    uv = auv;	
+    a_id = active_id;
+}

assets/test_shaders/fshader_display_src.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/fshader_src.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 + 1u;
+}

assets/test_shaders/not_batch.frag.glsl

@@ -0,0 +1,15 @@
+#version 330 core
+out vec4 FragColor;
+
+in vec4 ourColor;
+in vec2 pos;
+in vec2 auv;
+uniform sampler2DArray texture_array;
+uniform int layer = 0;
+//uniform sampler2D texture_array;
+void main()
+{
+	//float intensity = 100.0/(length(pos - mouse_pos));
+	//FragColor = ourColor;//*intensity;
+	FragColor = texture(texture_array,vec3(auv,layer));	
+}

assets/test_shaders/not_batch.vert.glsl

@@ -0,0 +1,21 @@
+#version 330 core
+layout (location = 0) in vec2 aPos;
+layout (location = 1) in vec4 aColor;
+layout (location = 2) in vec2 uv;
+uniform mat4 ortho = mat4(1.0);
+uniform mat4 dimet = mat4(1.0);  
+/*mat4 ortho = mat4(2.0/1920.0,0.0,0.0,-1.0,
+		0.0,-2.0/1080.0,0.0,1.0,
+		0.0,0.0,1.0,0.0,
+		0.0,0.0,1.0,1.0);
+*/
+out vec4 ourColor;
+out vec2 pos;
+out vec2 auv;
+void main()
+{
+    gl_Position = ortho*dimet*vec4(aPos,0.0, 1.0);
+    ourColor = aColor;	
+    pos =aPos;
+    auv = uv;	
+}

assets/test_shaders/terrain.frag.glsl

@@ -0,0 +1,11 @@
+#version 330 core
+out vec4 FragColor;
+
+in vec2 pos;
+in vec2 auv;
+in float tex_ind;
+uniform sampler2DArray texture_array;
+void main()
+{
+	FragColor = texture(texture_array,vec3(auv,tex_ind));	
+}

assets/test_shaders/terrain.vert.glsl

@@ -0,0 +1,23 @@
+#version 330 core
+layout (location = 0) in vec2 aPos;
+layout (location = 1) in vec2 uv;
+layout (location = 2) in float terrain_index;
+layout (location = 3) in float alpha_mask;
+
+uniform mat4 ortho = mat4(1.0);
+uniform mat4 dimet = mat4(1.0);  
+/*mat4 ortho = mat4(2.0/1920.0,0.0,0.0,-1.0,
+		0.0,-2.0/1080.0,0.0,1.0,
+		0.0,0.0,1.0,0.0,
+		0.0,0.0,1.0,1.0);
+*/
+out vec2 pos;
+out vec2 auv;
+out float tex_ind;
+void main()
+{
+    gl_Position = ortho*dimet*vec4(aPos,0.0, 1.0);
+    pos =aPos;
+    auv = uv;
+    tex_ind = terrain_index;
+}

assets/test_shaders/vshader_display_src.vert.glsl

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