GPU (SceneLayer) Drawing

.github/workflows/meson.yml

@@ -178,7 +178,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install libsdl2 onetbb lz4 libpng minizip luajit flac
+          omp install libsdl2 libsdl2_image onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

.vscode/launch.json

@@ -13,7 +13,7 @@
       "request": "launch",
       "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
-      "preLaunchTask": "meson Build Release",
+      "preLaunchTask": "Meson: Build all targets",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
       "presentation": {
         "group": "unix"

Data/Base.rte/Index.ini

@@ -1,5 +1,6 @@
 DataModule
 	ModuleName = Base Set
+	IncludeFile = Base.rte/Shaders/Shaders.ini
 	ScriptPath = Base.rte/Constants.lua
 	IncludeFile = Base.rte/GUIs.ini
 	IncludeFile = Base.rte/Materials.ini

Data/Base.rte/Shaders/Background.frag

@@ -0,0 +1,29 @@
+#version 130
+
+in vec2 textureUV;
+in vec4 vertexColor;
+
+out vec4 FragColor;
+
+uniform sampler2D rteTexture;
+uniform sampler2D rtePalette;
+uniform vec4 rteColor;
+uniform bool drawMasked;
+
+
+vec4 texture2DAA(sampler2D tex, vec2 uv) {
+	vec2 texsize = vec2(textureSize(tex, 0));
+	vec2 uv_texspace = uv * texsize;
+	vec2 seam = floor(uv_texspace + .5);
+	uv_texspace = (uv_texspace - seam) / fwidth(uv_texspace) + seam;
+	uv_texspace = clamp(uv_texspace, seam - .5, seam + .5);
+	return texture(tex, uv_texspace / texsize);
+}
+
+void main() {
+	float red = texture2D(rteTexture, textureUV).r;
+	if (red==0 && drawMasked) {
+		discard;
+	}
+	FragColor = texture2DAA(rtePalette, vec2(red * rteColor.r * vertexColor.r, 0.0)) * vec4(vec3(1.0), rteColor.a * vertexColor.a);
+}

Data/Base.rte/Shaders/Blit8.vert

@@ -1,15 +1,16 @@
 #version 130
 
-in vec2 rteVertexPosition;
-in vec2 rteTexUV;
+in vec3 rteVertexPosition;
+in vec2 rteVertexTexUV;
+in vec4 rteVertexColor;
 
 out vec2 textureUV;
-
-uniform mat4 rteTransform;
+out vec4 vertexColor;
+//uniform mat4 rteModelViewProjection;
 uniform mat4 rteProjection;
-uniform mat4 rteUVTransform;
 
 void main() {
-	gl_Position = rteProjection * rteTransform * vec4(rteVertexPosition, 0.0, 1.0);
-	textureUV = (rteUVTransform * vec4(rteTexUV, 0.0, 1.0)).xy;
+	gl_Position = rteProjection * vec4(rteVertexPosition, 1.0);
+	textureUV = rteVertexTexUV;
+	vertexColor = rteVertexColor;
 }

Data/Base.rte/Shaders/Flat.frag

@@ -0,0 +1,12 @@
+#version 130
+
+in vec2 textureUV;
+
+out vec4 FragColor;
+
+uniform sampler2D rteTexture;
+uniform vec4 rteColor;
+
+void main() {
+	FragColor = rteColor;
+}

Data/Base.rte/Shaders/PostProcess.vert

@@ -1,14 +1,14 @@
 #version 130
 
-in vec2 rteVertexPosition;
-in vec2 rteTexUV;
+in vec3 rteVertexPosition;
+in vec2 rteVertexTexUV;
 
 out vec2 textureUV;
 
-uniform mat4 rteTransform;
+uniform mat4 rteModel;
 uniform mat4 rteProjection;
 
 void main() {
-	gl_Position = rteProjection * rteTransform * vec4(rteVertexPosition, 0.0, 1.0);
-	textureUV = vec2(rteTexUV.x, -rteTexUV.y);
+	gl_Position = rteProjection * rteModel * vec4(rteVertexPosition, 1.0);
+	textureUV = rteVertexTexUV;
 }

Data/Base.rte/Shaders/ScreenBlit.frag

@@ -17,8 +17,8 @@ vec4 texture2DAA(sampler2D tex, vec2 uv) {
 }
 
 void main() {
-	vec4 guiColor = texture2DAA(rteGUITexture, textureUV);
-	float guiSolid = step(0.00000001, guiColor.r + guiColor.g + guiColor.b);
+	vec4 guiColor = texture2DAA(rteGUITexture, vec2(textureUV.x, -textureUV.y));
+	float guiSolid = float((guiColor.r + guiColor.g + guiColor.b) > 0.0);
 	float blendRatio = max(guiColor.a, guiSolid);
 	FragColor = (texture2DAA(rteTexture, textureUV) * (1.0F - blendRatio)) + guiColor * blendRatio;
 }

Data/Base.rte/Shaders/ScreenBlit.vert

@@ -1,14 +1,14 @@
 #version 130
 
-in vec2 rteVertexPosition;
-in vec2 rteTexUV;
+in vec3 rteVertexPosition;
+in vec2 rteVertexTexUV;
 
 out vec2 textureUV;
 
-uniform mat4 rteTransform;
+uniform mat4 rteModel;
 uniform mat4 rteProjection;
 
 void main() {
-	gl_Position = rteProjection * rteTransform * vec4(rteVertexPosition.xy, 0.0, 1.0);
-	textureUV = rteTexUV;
+	gl_Position = rteProjection * rteModel * vec4(rteVertexPosition, 1.0);
+	textureUV = rteVertexTexUV;
 }

Data/Base.rte/Shaders/Shaders.ini

@@ -0,0 +1,19 @@
+AddShader = Shader
+	PresetName = Blit8
+	VertexShader = Base.rte/Shaders/Blit8.vert
+	FragmentShader = Base.rte/Shaders/Blit8.frag
+
+AddShader = Shader
+	PresetName = PostProcess
+	VertexShader = Base.rte/Shaders/PostProcess.vert
+	FragmentShader = Base.rte/Shaders/PostProcess.frag
+
+AddShader = Shader
+	PresetName = ScreenBlit
+	VertexShader = Base.rte/Shaders/ScreenBlit.vert
+	FragmentShader = Base.rte/Shaders/ScreenBlit.frag
+
+AddShader = Shader
+	PresetName = Background
+	VertexShader = Base.rte/Shaders/Blit8.vert
+	FragmentShader = Base.rte/Shaders/Background.frag