made normals look not crap lol

WoMspace · Jun 18, 2021 · b8b66d3 · b8b66d3
1 parent 36cc3cf
commit b8b66d3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang
@@ -73,8 +73,8 @@ option.LAVA_FOG_G=Lava Fog Green
 option.LAVA_FOG_G.comment=How much green in the lava fog.
 option.LAVA_FOG_B=Lava Fog Blue
 option.LAVA_FOG_B.comment=How much blue in the lava fog.
-option.NORMALS_STRENGTH=Normal Strength
-option.NORMALS_STRENGTH.comment=How strong the normal mapping should be.
+option.NORMALMAP_STRENGTH=Normal Strength
+option.NORMALMAP_STRENGTH.comment=How strong the normal mapping should be.
 option.NORMALS_LAB_AO_ENABLED=Texture AO
 option.NORMALS_LAB_AO_ENABLED.comment=Enabled baked-in texture ambient occlusion. Requires labPBR texture format.
 option.NORMALS_LAB_AO_STRENGTH=Texture AO Strength

diff --git a/shaders/lib/labPBR.glsl b/shaders/lib/labPBR.glsl
@@ -11,7 +11,7 @@ float getNormals(vec4 normal, mat4 gbufferModelViewInverse, vec3 shadowLightPosi
 {
 	vec3 normalMap = extractNormalMap(normal, tbn, gbufferModelViewInverse);
 	vec3 celestialDirection = mat3(gbufferModelViewInverse) * shadowLightPosition;
-	return clamp(dot(normalMap, celestialDirection), 0.0, 1.0);
+	return clamp(dot(normalMap, celestialDirection) * 0.01 * NORMALMAP_STRENGTH, 0.0, 1.0);
 }
 
 vec4 applyEmission(vec4 specular, vec4 color, float strength)

diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl
@@ -1,9 +1,9 @@
+#define NORMALMAP_STRENGTH 1.0 // [0.01 0.05 0.1 0.5 1.0 5.0 10.0 50.0]
 //#define NORMALS_LAB_AO_ENABLED // Should the labPBR texture Ambient Occlusion be used.
 #define NORMALS_LAB_AO_STRENGTH 1.0 // How strong the labPBR ambient occlusion is. [0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0]
 //#define SPECULAR_EMISSIVE_ENABLED
 #define SPECULAR_EMISSIVE_STRENGTH 6.0 // How strong the labPBR Emission is. [0.2 0.4 0.6 0.8 1.0 1.2 1.4 1.6 1.8 2.0 2.2 2.4 2.6 2.8 3.0 3.2 3.4 3.6 3.8 4.0 4.2 4.4 4.6 4.8 5.0 5.2 5.4 5.6 5.8 6.0 6.2 6.4 6.6 6.8 7.0 7.2 7.4 7.6 7.8 8.0]
 
-#define NORMALMAP_ENABLED = defined(NORMALS_ENABLED) || defined(NORMALS_LAB_AO_ENABLED)
 #define SPECULARMAP_ENABLED = defined(SPECULAR_EMISSIVE_ENABLED)
 
 #define HDR_BLOCKLIGHT_STRENGTH 2.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0 7.1 7.2 7.3 7.4 7.5 7.6 7.7 7.8 7.9 8.0 8.1 8.2 8.3 8.4 8.5 8.6 8.7 8.8 8.9 9.0 9.1 9.2 9.3 9.4 9.5 9.6 9.7 9.8 9.9 10.0]

diff --git a/shaders/shaders.properties b/shaders/shaders.properties
@@ -38,6 +38,7 @@ WATER_FOG_G LAVA_FOG_G \
 WATER_FOG_B LAVA_FOG_B
 screen.RP_SUPPORT.columns=1
 screen.RP_SUPPORT=\
+NORMALMAP_STRENGTH \
 NORMALS_LAB_AO_ENABLED \
 NORMALS_LAB_AO_STRENGTH \
 SPECULAR_EMISSIVE_ENABLED \
@@ -132,7 +133,7 @@ TONEMAP_SHOULDER_CURVE TONEMAP_SHOULDER_LENGTH \
 
 screen.MISC=*
 
-sliders=HDR_EXPOSURE_VALUE FOG_END FOG_NEAR WATER_FOG_R WATER_FOG_G WATER_FOG_B WATER_FOG_DISTANCE LAVA_FOG_R LAVA_FOG_G LAVA_FOG_B LAVA_FOG_DISTANCE DOF_DISTANCE centerDepthHalflife DOF_ANAMORPHIC DOF_BOKEH_SAMPLES BLOOM_STRENGTH BLOOM_THRESHOLD BLOOM_QUALITY FILM_BRIGHTNESS FILM_CONTRAST GREYSCALE_RED_CONTRIBUTION GREYSCALE_GREEN_CONTRIBUTION GREYSCALE_BLUE_CONTRIBUTION COLORFILM_SATURATION COLORFILM_STRENGTH GRAIN_STRENGTH noiseTextureResolution CHROMA_SAMPLING_SIZE INTERLACING_SIZE SCANLINE_DISTANCE SCANLINE_STRENGTH SCANLINE_THICKNESS CRT_BOOST CRT_TEXTURE_SCALE GHOSTING_STRENGTH BARREL_POWER GRADING_HI_RED GRADING_HI_GREEN GRADING_HI_BLUE GRADING_MID_RED GRADING_MID_GREEN GRADING_MID_BLUE GRADING_LOW_RED GRADING_LOW_GREEN GRADING_LOW_BLUE LENS_LENGTH LENS_APERTURE FILM_IMPERFECTIONS_SHAKE_STRENGTH FILM_IMPERFECTIONS_SPOTS_SIZE FILM_IMPERFECTIONS_SPOTS_AMOUNT FILM_IMPERFECTIONS_LINES_STRENGTH NORMALS_STRENGTH NORMALS_LAB_AO_STRENGTH SPECULAR_EMISSIVE_STRENGTH QUANTISATION_BITDEPTH HDR_BLOCKLIGHT_RED HDR_BLOCKLIGHT_GREEN HDR_BLOCKLIGHT_BLUE HDR_AMBIENTLIGHT_STRENGTH HDR_MINLIGHT HDR_EXPOSURE_VALUE HDR_BLOCKLIGHT_STRENGTH HDR_EXPOSURE_MAXIMUM HDR_EXPOSURE_MINIMUM LUT_STRENGTH LUT_SELECTED HDR_BLOCKLIGHT_RED HDR_SUNLIGHT_RED HDR_MOONLIGHT_RED HDR_BLOCKLIGHT_GREEN HDR_SUNLIGHT_GREEN HDR_MOONLIGHT_GREEN HDR_BLOCKLIGHT_BLUE HDR_SUNLIGHT_BLUE HDR_MOONLIGHT_BLUE PIXEL_SIZE SHADOW_BIAS SHADOW_DISTORTION_FACTOR SHADOW_FILTER_SAMPLES shadowMapResolution CAMERA_ISO CAMERA_SHUTTER_SPEED CHROMATIC_ABERRATION_STRENGTH TONEMAP_TOE_LENGTH TONEMAP_TOE_STRENGTH TONEMAP_LINEAR_LENGTH TONEMAP_LINEAR_SLOPE TONEMAP_SHOULDER_LENGTH TONEMAP_SHOULDER_CURVE GRAIN_PERFORMANCE
+sliders=HDR_EXPOSURE_VALUE FOG_END FOG_NEAR WATER_FOG_R WATER_FOG_G WATER_FOG_B WATER_FOG_DISTANCE LAVA_FOG_R LAVA_FOG_G LAVA_FOG_B LAVA_FOG_DISTANCE DOF_DISTANCE centerDepthHalflife DOF_ANAMORPHIC DOF_BOKEH_SAMPLES BLOOM_STRENGTH BLOOM_THRESHOLD BLOOM_QUALITY FILM_BRIGHTNESS FILM_CONTRAST GREYSCALE_RED_CONTRIBUTION GREYSCALE_GREEN_CONTRIBUTION GREYSCALE_BLUE_CONTRIBUTION COLORFILM_SATURATION COLORFILM_STRENGTH GRAIN_STRENGTH noiseTextureResolution CHROMA_SAMPLING_SIZE INTERLACING_SIZE SCANLINE_DISTANCE SCANLINE_STRENGTH SCANLINE_THICKNESS CRT_BOOST CRT_TEXTURE_SCALE GHOSTING_STRENGTH BARREL_POWER GRADING_HI_RED GRADING_HI_GREEN GRADING_HI_BLUE GRADING_MID_RED GRADING_MID_GREEN GRADING_MID_BLUE GRADING_LOW_RED GRADING_LOW_GREEN GRADING_LOW_BLUE LENS_LENGTH LENS_APERTURE FILM_IMPERFECTIONS_SHAKE_STRENGTH FILM_IMPERFECTIONS_SPOTS_SIZE FILM_IMPERFECTIONS_SPOTS_AMOUNT FILM_IMPERFECTIONS_LINES_STRENGTH NORMALS_STRENGTH NORMALS_LAB_AO_STRENGTH SPECULAR_EMISSIVE_STRENGTH QUANTISATION_BITDEPTH HDR_BLOCKLIGHT_RED HDR_BLOCKLIGHT_GREEN HDR_BLOCKLIGHT_BLUE HDR_AMBIENTLIGHT_STRENGTH HDR_MINLIGHT HDR_EXPOSURE_VALUE HDR_BLOCKLIGHT_STRENGTH HDR_EXPOSURE_MAXIMUM HDR_EXPOSURE_MINIMUM LUT_STRENGTH LUT_SELECTED HDR_BLOCKLIGHT_RED HDR_SUNLIGHT_RED HDR_MOONLIGHT_RED HDR_BLOCKLIGHT_GREEN HDR_SUNLIGHT_GREEN HDR_MOONLIGHT_GREEN HDR_BLOCKLIGHT_BLUE HDR_SUNLIGHT_BLUE HDR_MOONLIGHT_BLUE PIXEL_SIZE SHADOW_BIAS SHADOW_DISTORTION_FACTOR SHADOW_FILTER_SAMPLES shadowMapResolution CAMERA_ISO CAMERA_SHUTTER_SPEED CHROMATIC_ABERRATION_STRENGTH TONEMAP_TOE_LENGTH TONEMAP_TOE_STRENGTH TONEMAP_LINEAR_LENGTH TONEMAP_LINEAR_SLOPE TONEMAP_SHOULDER_LENGTH TONEMAP_SHOULDER_CURVE GRAIN_PERFORMANCE NORMALMAP_STRENGTH
 
 profile.OFF=\
 !NORMALS_LAB_AO_ENABLED \