diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt index 0bae2600..b0b61d53 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt @@ -107,7 +107,7 @@ class StarboundClient : Closeable { var viewportTopRight = Vector2d() private set - var fullbright = false + var fullbright = true var clientTerminated = false private set @@ -777,7 +777,7 @@ class StarboundClient : Closeable { texture2D = viewportLightingTexture activeTexture = 0 - val lightmapUV = Vector4f( + val lightmapUV = if (fullbright) Vector4f.ZERO else Vector4f( ((viewportBottomLeft.x - viewportCellX) / viewportLighting.width).toFloat(), ((viewportBottomLeft.y - viewportCellY) / viewportLighting.height).toFloat(), (1f - (viewportCellX + viewportCellWidth - viewportTopRight.x) / viewportLighting.width).toFloat(), diff --git a/src/main/resources/shaders/flat_color.fsh b/src/main/resources/shaders/flat_color.fsh deleted file mode 100644 index 90d524b7..00000000 --- a/src/main/resources/shaders/flat_color.fsh +++ /dev/null @@ -1,10 +0,0 @@ - -#version 330 - -in vec4 finalVertexColor; - -out vec4 color; - -void main() { - color = finalVertexColor; -} diff --git a/src/main/resources/shaders/flat_color.vsh b/src/main/resources/shaders/flat_color.vsh deleted file mode 100644 index 3e106a27..00000000 --- a/src/main/resources/shaders/flat_color.vsh +++ /dev/null @@ -1,13 +0,0 @@ - -#version 330 - -layout (location = 0) in vec2 vertexPos; -layout (location = 1) in vec4 vertexColor; -uniform mat4 transform; - -out vec4 finalVertexColor; - -void main() { - gl_Position = transform * vec4(vertexPos, 0.5, 1.0); - finalVertexColor = vertexColor; -} diff --git a/src/main/resources/shaders/font.fsh b/src/main/resources/shaders/font.fsh deleted file mode 100644 index 5b6500c5..00000000 --- a/src/main/resources/shaders/font.fsh +++ /dev/null @@ -1,12 +0,0 @@ - -#version 330 - -in vec2 uv_out; -out vec4 color_out; - -uniform sampler2D texture0; -uniform vec4 color; - -void main() { - color_out = color * texture(texture0, uv_out).r; -} diff --git a/src/main/resources/shaders/font.vsh b/src/main/resources/shaders/font.vsh deleted file mode 100644 index ac1b45b8..00000000 --- a/src/main/resources/shaders/font.vsh +++ /dev/null @@ -1,14 +0,0 @@ - -#version 330 - -layout (location = 0) in vec2 pos; -layout (location = 1) in vec2 uv_in; - -out vec2 uv_out; - -uniform mat4 transform; - -void main() { - uv_out = uv_in; - gl_Position = transform * vec4(pos, 0.0, 1.0); -} diff --git a/src/main/resources/shaders/fragment/position.fsh b/src/main/resources/shaders/fragment/position.fsh deleted file mode 100644 index 34a027b4..00000000 --- a/src/main/resources/shaders/fragment/position.fsh +++ /dev/null @@ -1,9 +0,0 @@ - -#version 330 - -uniform vec4 colorMultiplier; -out vec4 colorResult; - -void main() { - colorResult = colorMultiplier; -} diff --git a/src/main/resources/shaders/fragment/position_color.fsh b/src/main/resources/shaders/fragment/position_color.fsh deleted file mode 100644 index fb8ba49e..00000000 --- a/src/main/resources/shaders/fragment/position_color.fsh +++ /dev/null @@ -1,11 +0,0 @@ - -#version 330 - -uniform vec4 colorMultiplier; - -in vec4 vertexColor; -out vec4 colorResult; - -void main() { - colorResult = vertexColor * colorMultiplier; -} diff --git a/src/main/resources/shaders/fragment/texture.glsl b/src/main/resources/shaders/fragment/texture.glsl deleted file mode 100644 index bd8f867d..00000000 --- a/src/main/resources/shaders/fragment/texture.glsl +++ /dev/null @@ -1,13 +0,0 @@ - -#version 330 - -uniform sampler2D texture0; - -in vec2 uv_out; - -out vec4 color_out; - -void main() { - vec4 texel = texture(texture0, uv_out); - color_out = texel; -} diff --git a/src/main/resources/shaders/fragment/texture_color.glsl b/src/main/resources/shaders/fragment/texture_color.glsl deleted file mode 100644 index 90614da8..00000000 --- a/src/main/resources/shaders/fragment/texture_color.glsl +++ /dev/null @@ -1,13 +0,0 @@ - -#version 330 - -uniform sampler2D texture0; -uniform vec4 color; - -in vec2 uv_out; -out vec4 color_out; - -void main() { - vec4 texel = texture(texture0, uv_out); - color_out = texel * color; -} diff --git a/src/main/resources/shaders/light.fsh b/src/main/resources/shaders/light.fsh deleted file mode 100644 index 484d23ce..00000000 --- a/src/main/resources/shaders/light.fsh +++ /dev/null @@ -1,11 +0,0 @@ - -#version 330 - -in vec2 oUVCoords; -out vec4 resultColor; - -uniform vec4 baselineColor; - -void main() { - resultColor = vec4(baselineColor.rgb * smoothstep(0.0, 1.0, 1.0 - sqrt(pow(oUVCoords.x - 0.5, 2.0) + pow(oUVCoords.y - 0.5, 2.0)) * 2.0), baselineColor.a); -} diff --git a/src/main/resources/shaders/light.vsh b/src/main/resources/shaders/light.vsh deleted file mode 100644 index 6a374e2d..00000000 --- a/src/main/resources/shaders/light.vsh +++ /dev/null @@ -1,15 +0,0 @@ - -#version 330 - -layout (location = 0) in vec2 vertexPos; -layout (location = 1) in vec2 uvCoords; - -out vec2 oUVCoords; - -uniform mat3 transform; - -void main() { - vec3 result = transform * vec3(vertexPos, 1.0); - gl_Position = vec4(result.x, result.y, 0.0, result.z); - oUVCoords = uvCoords; -} diff --git a/src/main/resources/shaders/vertex/2dtexture.glsl b/src/main/resources/shaders/vertex/2dtexture.glsl deleted file mode 100644 index cc741c04..00000000 --- a/src/main/resources/shaders/vertex/2dtexture.glsl +++ /dev/null @@ -1,13 +0,0 @@ - -#version 330 - -layout (location = 0) in vec2 pos; -layout (location = 1) in vec2 uv_in; - -out vec2 uv_out; -uniform mat4 transform; - -void main() { - uv_out = uv_in; - gl_Position = transform * vec4(pos, 1.0, 1.0); -} diff --git a/src/main/resources/shaders/vertex/position.vsh b/src/main/resources/shaders/vertex/position.vsh deleted file mode 100644 index b6869ed0..00000000 --- a/src/main/resources/shaders/vertex/position.vsh +++ /dev/null @@ -1,13 +0,0 @@ - -#version 330 - -layout (location = 0) in vec2 pos; - -uniform mat3 viewMatrix; // projection (viewport) + camera -uniform mat3 worldMatrix; // matrix stack -uniform mat3 modelMatrix; // local transformations - -void main() { - vec3 result = viewMatrix * worldMatrix * modelMatrix * vec3(pos, 1.0); - gl_Position = vec4(result.x, result.y, 0.0, result.z); -} diff --git a/src/main/resources/shaders/vertex/position_color.vsh b/src/main/resources/shaders/vertex/position_color.vsh deleted file mode 100644 index 131d9c9b..00000000 --- a/src/main/resources/shaders/vertex/position_color.vsh +++ /dev/null @@ -1,18 +0,0 @@ - -#version 330 - -layout (location = 0) in vec2 pos; -layout (location = 1) in vec4 color; - -uniform mat3 viewMatrix; // projection (viewport) + camera -uniform mat3 worldMatrix; // matrix stack -uniform mat3 modelMatrix; // local transformations - -out vec4 vertexColor; - -void main() { - vec3 result = viewMatrix * worldMatrix * modelMatrix * vec3(pos, 1.0); - gl_Position = vec4(result.x, result.y, 0.0, result.z); - - vertexColor = color; -} diff --git a/src/main/resources/shaders/vertex/texture.glsl b/src/main/resources/shaders/vertex/texture.glsl deleted file mode 100644 index 55489e51..00000000 --- a/src/main/resources/shaders/vertex/texture.glsl +++ /dev/null @@ -1,13 +0,0 @@ - -#version 330 - -layout (location = 0) in vec3 pos; -layout (location = 1) in vec2 uv_in; - -out vec2 uv_out; -uniform mat4 transform; - -void main() { - uv_out = uv_in; - gl_Position = transform * vec4(pos, 1.0); -}