From 1bbe41c0685546fa91c95ddd265fac78949ff43b Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 10 Mar 2026 17:56:05 -0500 Subject: [PATCH] move GL shaders into the correct folder --- .../shaders/debug/gl}/frag.frag | 0 .../shaders/debug/gl}/vert.vert | 0 .../shaders/fade/gl}/apply.frag | 0 .../shaders/fade/gl}/dhFade.frag | 0 .../shaders/fade/gl}/vanillaFade.frag | 0 .../shaders/fog/gl}/apply.frag | 0 .../distanthorizons/shaders/fog/gl}/fog.frag | 0 .../shaders/generic/gl}/direct/frag.frag | 0 .../shaders/generic/gl}/direct/vert.vert | 0 .../shaders/generic/gl}/instanced/frag.frag | 0 .../shaders/generic/gl}/instanced/vert.vert | 0 .../shaders/shared/gl}/apply.frag | 0 .../shaders/shared/gl}/flat_shaded.frag | 0 .../shaders/shared/gl}/quadApply.vert | 0 .../shaders/shared/gl}/standard.vert | 0 .../distanthorizons/shaders/ssao/gl}/ao.frag | 0 .../shaders/ssao/gl}/apply.frag | 0 .../shaders/test/gl}/frag.frag | 0 .../shaders/test/gl}/vert.vert | 0 .../main/resources/shaders/noise/noise.frag | 74 ------------------- .../src/main/resources/shaders/test/dark.frag | 9 --- 21 files changed, 83 deletions(-) rename core/src/main/resources/{shaders/debug => assets/distanthorizons/shaders/debug/gl}/frag.frag (100%) rename core/src/main/resources/{shaders/debug => assets/distanthorizons/shaders/debug/gl}/vert.vert (100%) rename core/src/main/resources/{shaders/fade => assets/distanthorizons/shaders/fade/gl}/apply.frag (100%) rename core/src/main/resources/{shaders/fade => assets/distanthorizons/shaders/fade/gl}/dhFade.frag (100%) rename core/src/main/resources/{shaders/fade => assets/distanthorizons/shaders/fade/gl}/vanillaFade.frag (100%) rename core/src/main/resources/{shaders/fog => assets/distanthorizons/shaders/fog/gl}/apply.frag (100%) rename core/src/main/resources/{shaders/fog => assets/distanthorizons/shaders/fog/gl}/fog.frag (100%) rename core/src/main/resources/{shaders/genericObject => assets/distanthorizons/shaders/generic/gl}/direct/frag.frag (100%) rename core/src/main/resources/{shaders/genericObject => assets/distanthorizons/shaders/generic/gl}/direct/vert.vert (100%) rename core/src/main/resources/{shaders/genericObject => assets/distanthorizons/shaders/generic/gl}/instanced/frag.frag (100%) rename core/src/main/resources/{shaders/genericObject => assets/distanthorizons/shaders/generic/gl}/instanced/vert.vert (100%) rename core/src/main/resources/{shaders => assets/distanthorizons/shaders/shared/gl}/apply.frag (100%) rename core/src/main/resources/{shaders => assets/distanthorizons/shaders/shared/gl}/flat_shaded.frag (100%) rename core/src/main/resources/{shaders => assets/distanthorizons/shaders/shared/gl}/quadApply.vert (100%) rename core/src/main/resources/{shaders => assets/distanthorizons/shaders/shared/gl}/standard.vert (100%) rename core/src/main/resources/{shaders/ssao => assets/distanthorizons/shaders/ssao/gl}/ao.frag (100%) rename core/src/main/resources/{shaders/ssao => assets/distanthorizons/shaders/ssao/gl}/apply.frag (100%) rename core/src/main/resources/{shaders/test => assets/distanthorizons/shaders/test/gl}/frag.frag (100%) rename core/src/main/resources/{shaders/test => assets/distanthorizons/shaders/test/gl}/vert.vert (100%) delete mode 100644 core/src/main/resources/shaders/noise/noise.frag delete mode 100644 core/src/main/resources/shaders/test/dark.frag diff --git a/core/src/main/resources/shaders/debug/frag.frag b/core/src/main/resources/assets/distanthorizons/shaders/debug/gl/frag.frag similarity index 100% rename from core/src/main/resources/shaders/debug/frag.frag rename to core/src/main/resources/assets/distanthorizons/shaders/debug/gl/frag.frag diff --git a/core/src/main/resources/shaders/debug/vert.vert b/core/src/main/resources/assets/distanthorizons/shaders/debug/gl/vert.vert similarity index 100% rename from core/src/main/resources/shaders/debug/vert.vert rename to core/src/main/resources/assets/distanthorizons/shaders/debug/gl/vert.vert diff --git a/core/src/main/resources/shaders/fade/apply.frag b/core/src/main/resources/assets/distanthorizons/shaders/fade/gl/apply.frag similarity index 100% rename from core/src/main/resources/shaders/fade/apply.frag rename to core/src/main/resources/assets/distanthorizons/shaders/fade/gl/apply.frag diff --git a/core/src/main/resources/shaders/fade/dhFade.frag b/core/src/main/resources/assets/distanthorizons/shaders/fade/gl/dhFade.frag similarity index 100% rename from core/src/main/resources/shaders/fade/dhFade.frag rename to core/src/main/resources/assets/distanthorizons/shaders/fade/gl/dhFade.frag diff --git a/core/src/main/resources/shaders/fade/vanillaFade.frag b/core/src/main/resources/assets/distanthorizons/shaders/fade/gl/vanillaFade.frag similarity index 100% rename from core/src/main/resources/shaders/fade/vanillaFade.frag rename to core/src/main/resources/assets/distanthorizons/shaders/fade/gl/vanillaFade.frag diff --git a/core/src/main/resources/shaders/fog/apply.frag b/core/src/main/resources/assets/distanthorizons/shaders/fog/gl/apply.frag similarity index 100% rename from core/src/main/resources/shaders/fog/apply.frag rename to core/src/main/resources/assets/distanthorizons/shaders/fog/gl/apply.frag diff --git a/core/src/main/resources/shaders/fog/fog.frag b/core/src/main/resources/assets/distanthorizons/shaders/fog/gl/fog.frag similarity index 100% rename from core/src/main/resources/shaders/fog/fog.frag rename to core/src/main/resources/assets/distanthorizons/shaders/fog/gl/fog.frag diff --git a/core/src/main/resources/shaders/genericObject/direct/frag.frag b/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/direct/frag.frag similarity index 100% rename from core/src/main/resources/shaders/genericObject/direct/frag.frag rename to core/src/main/resources/assets/distanthorizons/shaders/generic/gl/direct/frag.frag diff --git a/core/src/main/resources/shaders/genericObject/direct/vert.vert b/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/direct/vert.vert similarity index 100% rename from core/src/main/resources/shaders/genericObject/direct/vert.vert rename to core/src/main/resources/assets/distanthorizons/shaders/generic/gl/direct/vert.vert diff --git a/core/src/main/resources/shaders/genericObject/instanced/frag.frag b/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/frag.frag similarity index 100% rename from core/src/main/resources/shaders/genericObject/instanced/frag.frag rename to core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/frag.frag diff --git a/core/src/main/resources/shaders/genericObject/instanced/vert.vert b/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/vert.vert similarity index 100% rename from core/src/main/resources/shaders/genericObject/instanced/vert.vert rename to core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/vert.vert diff --git a/core/src/main/resources/shaders/apply.frag b/core/src/main/resources/assets/distanthorizons/shaders/shared/gl/apply.frag similarity index 100% rename from core/src/main/resources/shaders/apply.frag rename to core/src/main/resources/assets/distanthorizons/shaders/shared/gl/apply.frag diff --git a/core/src/main/resources/shaders/flat_shaded.frag b/core/src/main/resources/assets/distanthorizons/shaders/shared/gl/flat_shaded.frag similarity index 100% rename from core/src/main/resources/shaders/flat_shaded.frag rename to core/src/main/resources/assets/distanthorizons/shaders/shared/gl/flat_shaded.frag diff --git a/core/src/main/resources/shaders/quadApply.vert b/core/src/main/resources/assets/distanthorizons/shaders/shared/gl/quadApply.vert similarity index 100% rename from core/src/main/resources/shaders/quadApply.vert rename to core/src/main/resources/assets/distanthorizons/shaders/shared/gl/quadApply.vert diff --git a/core/src/main/resources/shaders/standard.vert b/core/src/main/resources/assets/distanthorizons/shaders/shared/gl/standard.vert similarity index 100% rename from core/src/main/resources/shaders/standard.vert rename to core/src/main/resources/assets/distanthorizons/shaders/shared/gl/standard.vert diff --git a/core/src/main/resources/shaders/ssao/ao.frag b/core/src/main/resources/assets/distanthorizons/shaders/ssao/gl/ao.frag similarity index 100% rename from core/src/main/resources/shaders/ssao/ao.frag rename to core/src/main/resources/assets/distanthorizons/shaders/ssao/gl/ao.frag diff --git a/core/src/main/resources/shaders/ssao/apply.frag b/core/src/main/resources/assets/distanthorizons/shaders/ssao/gl/apply.frag similarity index 100% rename from core/src/main/resources/shaders/ssao/apply.frag rename to core/src/main/resources/assets/distanthorizons/shaders/ssao/gl/apply.frag diff --git a/core/src/main/resources/shaders/test/frag.frag b/core/src/main/resources/assets/distanthorizons/shaders/test/gl/frag.frag similarity index 100% rename from core/src/main/resources/shaders/test/frag.frag rename to core/src/main/resources/assets/distanthorizons/shaders/test/gl/frag.frag diff --git a/core/src/main/resources/shaders/test/vert.vert b/core/src/main/resources/assets/distanthorizons/shaders/test/gl/vert.vert similarity index 100% rename from core/src/main/resources/shaders/test/vert.vert rename to core/src/main/resources/assets/distanthorizons/shaders/test/gl/vert.vert diff --git a/core/src/main/resources/shaders/noise/noise.frag b/core/src/main/resources/shaders/noise/noise.frag deleted file mode 100644 index 6d39b6253..000000000 --- a/core/src/main/resources/shaders/noise/noise.frag +++ /dev/null @@ -1,74 +0,0 @@ -#version 150 core - -in vec4 vertexColor; -in vec4 vPos; -in vec3 vertexWorldPos; -out vec4 fragColor; - -uniform float distanceScale; - -uniform int uNoiseSteps; -uniform float uNoiseIntensity; -uniform float uNoiseDropoff; - - - -// The random functions for diffrent dimentions -float rand(float co) { return fract(sin(co*(91.3458)) * 47453.5453); } -float rand(vec2 co){ return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453); } -float rand(vec3 co){ return rand(co.xy+rand(co.z)); } - -// Puts steps in a float -// EG. setting stepSize to 4 then this would be the result of this function -// In: 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, ..., 1.1, 1.2, 1.3 -// Out: 0.0, 0.0, 0.0, 0.25, 0.25, 0.5, 0.5, ..., 1.0, 1.0, 1.25 -float quantize(float val, int stepSize) { - return floor(val*stepSize)/stepSize; -} - -vec3 quantize(vec3 val, int stepSize) { - return floor(val*stepSize)/stepSize; -} - - -/** - * Fragment shader for adding noise to lods. - * This should be passed close to first as it affects the base color of the lod - * - * version: 2023-6-21 - */ -void main() { - // This bit of code is required to fix the vertex position problem cus of floats in the verted world position varuable - vec3 vertexNormal = normalize(cross(dFdx(vPos.xyz), dFdy(vPos.xyz))); - vec3 fixedVPos = vPos.xyz - vertexNormal * 0.001; - - - float noiseAmplification = uNoiseIntensity; - noiseAmplification = (-1 * pow(2*((vertexColor.x + vertexColor.y + vertexColor.z) / 3) - 1, 2) + 1) * noiseAmplification; // Lessen the effect on depending on how dark the object is, equasion for this is -(2x-1)^{2}+1 - noiseAmplification *= vertexColor.w; // The effect would lessen on transparent objects - - // Random value for each position - float randomValue = rand(quantize(fixedVPos.xyz, uNoiseSteps)) - * 2.0 * noiseAmplification - noiseAmplification; - - - // Modifies the color - // A value of 0 on the randomValue will result in the original color, while a value of 1 will result in a fully bright color - vec3 newCol = (1.0 - vertexColor.rgb) * randomValue; - - // Clamps it and turns it back into a vec4 - float distA = length(vertexWorldPos) * distanceScale * uNoiseDropoff; - fragColor = clamp(vec4(newCol.rgb, distA), 0.0, 1.0); // The further away it gets, the less noise gets applied - - // The further away it gets, the less noise gets applied - fragColor = vec4(0.0, 0.0, 0.0, randomValue); - - // For testing -// if (vertexColor.r != 69420.) { -// fragColor = vec4( -// mod(fixedVPos.x, 1), -// mod(fixedVPos.y, 1), -// mod(fixedVPos.z, 1), -// 1f); -// } -} \ No newline at end of file diff --git a/core/src/main/resources/shaders/test/dark.frag b/core/src/main/resources/shaders/test/dark.frag deleted file mode 100644 index ab99d05ce..000000000 --- a/core/src/main/resources/shaders/test/dark.frag +++ /dev/null @@ -1,9 +0,0 @@ -#version 150 core - -out vec4 fragColor; - -// A test shader that makes everything darker -void main() -{ - fragColor = vec4(0., 0., 1., 0.5); -} \ No newline at end of file