From fd0e4c45bea6716814847f11dd13e43f8ff4343b Mon Sep 17 00:00:00 2001 From: Xonk Date: Fri, 20 Oct 2023 20:26:41 -0400 Subject: [PATCH] ADDED material AO. made Volumetric fogs all converge better. made "ambient light only" work universally. removed fallback dimension. --- shaders/dimension.properties | 4 +- shaders/dimensions/all_particles.fsh | 6 +- shaders/dimensions/all_solid.fsh | 10 +++- shaders/dimensions/all_translucent.fsh | 10 +--- shaders/dimensions/composite.fsh | 8 ++- shaders/dimensions/composite1.fsh | 33 ++--------- shaders/dimensions/composite2.fsh | 5 -- shaders/dimensions/deferred.fsh | 29 ++++++---- shaders/lang/en_us.lang | 5 +- shaders/lib/diffuse_lighting.glsl | 56 +------------------ shaders/lib/end_fog.glsl | 4 +- shaders/lib/indirect_lighting_effects.glsl | 1 + shaders/lib/settings.glsl | 5 +- shaders/shaders.properties | 47 ++++++++-------- .../unknown_dimension_fallback/composite1.fsh | 5 -- .../unknown_dimension_fallback/composite1.vsh | 5 -- .../composite10.fsh | 5 -- .../composite10.vsh | 5 -- .../composite11.fsh | 5 -- .../composite11.vsh | 5 -- .../unknown_dimension_fallback/composite2.fsh | 5 -- .../unknown_dimension_fallback/composite2.vsh | 5 -- .../unknown_dimension_fallback/composite3.fsh | 5 -- .../unknown_dimension_fallback/composite3.vsh | 5 -- .../unknown_dimension_fallback/composite4.fsh | 5 -- .../unknown_dimension_fallback/composite4.vsh | 5 -- .../unknown_dimension_fallback/composite5.fsh | 5 -- .../unknown_dimension_fallback/composite5.vsh | 5 -- .../unknown_dimension_fallback/composite6.fsh | 5 -- .../unknown_dimension_fallback/composite6.vsh | 5 -- .../unknown_dimension_fallback/composite7.fsh | 5 -- .../unknown_dimension_fallback/composite7.vsh | 5 -- .../unknown_dimension_fallback/composite8.fsh | 5 -- .../unknown_dimension_fallback/composite8.vsh | 5 -- .../unknown_dimension_fallback/composite9.fsh | 5 -- .../unknown_dimension_fallback/composite9.vsh | 5 -- .../unknown_dimension_fallback/deferred.fsh | 5 -- .../unknown_dimension_fallback/deferred.vsh | 5 -- .../unknown_dimension_fallback/deferred1.fsh | 5 -- .../unknown_dimension_fallback/deferred1.vsh | 5 -- shaders/unknown_dimension_fallback/final.fsh | 5 -- shaders/unknown_dimension_fallback/final.vsh | 5 -- .../gbuffers_armor_glint.fsh | 5 -- .../gbuffers_armor_glint.vsh | 5 -- .../gbuffers_basic.fsh | 9 --- .../gbuffers_basic.vsh | 10 ---- .../gbuffers_beaconbeam.fsh | 5 -- .../gbuffers_beaconbeam.vsh | 5 -- .../gbuffers_block.fsh | 8 --- .../gbuffers_block.vsh | 8 --- .../gbuffers_damagedblock.fsh | 6 -- .../gbuffers_damagedblock.vsh | 6 -- .../gbuffers_entities.fsh | 8 --- .../gbuffers_entities.vsh | 9 --- .../gbuffers_entities_glowing.fsh | 5 -- .../gbuffers_entities_glowing.vsh | 5 -- .../gbuffers_hand.fsh | 8 --- .../gbuffers_hand.vsh | 8 --- .../gbuffers_hand_water.fsh | 6 -- .../gbuffers_hand_water.vsh | 6 -- .../gbuffers_skybasic.fsh | 7 --- .../gbuffers_skybasic.vsh | 5 -- .../gbuffers_skytextured.fsh | 7 --- .../gbuffers_skytextured.vsh | 5 -- .../gbuffers_spidereyes.fsh | 5 -- .../gbuffers_spidereyes.vsh | 5 -- .../gbuffers_terrain.fsh | 7 --- .../gbuffers_terrain.vsh | 7 --- .../gbuffers_textured.fsh | 6 -- .../gbuffers_textured.vsh | 6 -- .../gbuffers_textured_lit.fsh | 5 -- .../gbuffers_textured_lit.vsh | 8 --- .../gbuffers_water.fsh | 5 -- .../gbuffers_water.vsh | 5 -- .../gbuffers_weather.fsh | 49 ---------------- .../gbuffers_weather.vsh | 44 --------------- 76 files changed, 80 insertions(+), 581 deletions(-) delete mode 100644 shaders/unknown_dimension_fallback/composite1.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite1.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite10.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite10.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite11.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite11.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite2.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite2.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite3.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite3.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite4.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite4.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite5.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite5.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite6.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite6.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite7.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite7.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite8.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite8.vsh delete mode 100644 shaders/unknown_dimension_fallback/composite9.fsh delete mode 100644 shaders/unknown_dimension_fallback/composite9.vsh delete mode 100644 shaders/unknown_dimension_fallback/deferred.fsh delete mode 100644 shaders/unknown_dimension_fallback/deferred.vsh delete mode 100644 shaders/unknown_dimension_fallback/deferred1.fsh delete mode 100644 shaders/unknown_dimension_fallback/deferred1.vsh delete mode 100644 shaders/unknown_dimension_fallback/final.fsh delete mode 100644 shaders/unknown_dimension_fallback/final.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_armor_glint.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_armor_glint.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_basic.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_basic.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_beaconbeam.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_beaconbeam.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_block.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_block.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_damagedblock.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_damagedblock.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_entities.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_entities.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_entities_glowing.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_entities_glowing.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_hand.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_hand.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_hand_water.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_hand_water.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_skybasic.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_skybasic.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_skytextured.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_skytextured.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_spidereyes.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_spidereyes.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_terrain.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_terrain.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_textured.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_textured.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_textured_lit.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_textured_lit.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_water.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_water.vsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_weather.fsh delete mode 100644 shaders/unknown_dimension_fallback/gbuffers_weather.vsh diff --git a/shaders/dimension.properties b/shaders/dimension.properties index 3078402..feb8c9a 100644 --- a/shaders/dimension.properties +++ b/shaders/dimension.properties @@ -8,8 +8,8 @@ # dimension.world-1 = minecraft:the_nether # dimension.WHATEVER = somemod:whateverdimension -dimension.world0 = minecraft:overworld +dimension.world0 = minecraft:overworld * dimension.world-1 = minecraft:the_nether dimension.world1 = minecraft:the_end -dimension.unknown_dimension_fallback = * \ No newline at end of file +# dimension.unknown_dimension_fallback = * \ No newline at end of file diff --git a/shaders/dimensions/all_particles.fsh b/shaders/dimensions/all_particles.fsh index 18772e9..afb8028 100644 --- a/shaders/dimensions/all_particles.fsh +++ b/shaders/dimensions/all_particles.fsh @@ -149,7 +149,7 @@ void main() { Direct_lighting *= phaseg(clamp(dot(feetPlayerPos_normalized, WsunVec),0.0,1.0), 0.65)*2 + 0.5; #endif - vec3 AmbientLightColor = averageSkyCol_Clouds; + vec3 AmbientLightColor = averageSkyCol_Clouds * 3.0; #endif @@ -161,10 +161,6 @@ void main() { vec3 AmbientLightColor = vec3(1.0); #endif - #ifdef FALLBACK_SHADER - vec3 AmbientLightColor = vec3(1.0); - #endif - Indirect_lighting = DoAmbientLightColor(AmbientLightColor, vec3(TORCH_R,TORCH_G,TORCH_B), clamp(lightmap.xy,0,1)); #ifndef LINES diff --git a/shaders/dimensions/all_solid.fsh b/shaders/dimensions/all_solid.fsh index 56b1dde..d6dbac2 100644 --- a/shaders/dimensions/all_solid.fsh +++ b/shaders/dimensions/all_solid.fsh @@ -442,8 +442,13 @@ void main() { //////////////////////////////// //////////////////////////////// #if defined WORLD && defined MC_NORMAL_MAP - vec3 NormalTex = texture2D_POMSwitch(normals, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM).xyw; - float Heightmap = 1.0 - NormalTex.z; + vec4 NormalTex = texture2D_POMSwitch(normals, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM).xyzw; + + #ifdef MATERIAL_AO + Albedo.rgb *= NormalTex.b*0.5+0.5; + #endif + + float Heightmap = 1.0 - NormalTex.w; NormalTex.xy = NormalTex.xy * 2.0-1.0; NormalTex.z = sqrt(max(1.0 - dot(NormalTex.xy, NormalTex.xy), 0.0)); @@ -455,6 +460,7 @@ void main() { gl_FragDepth = toClipSpace3(truePos).z; #endif + if(PHYSICSMOD_SNOW < 1) normal = applyBump(tbnMatrix, NormalTex.xyz, mix(1.0,1-Puddle_shape,rainfall) ); #endif diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh index ee04a83..30609f3 100644 --- a/shaders/dimensions/all_translucent.fsh +++ b/shaders/dimensions/all_translucent.fsh @@ -306,12 +306,12 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) #endif #ifdef Vanilla_like_water - if (iswater > 0.5) { - gl_FragData[0].a = luma(Albedo.rgb); + if (iswater > 0.95){ + // gl_FragData[0].a = luma(Albedo.rgb); Albedo = color.rgb * sqrt(luma(Albedo.rgb)); } #else - if (iswater > 0.9) { + if (iswater > 0.95){ Albedo = vec3(0.0); gl_FragData[0] = vec4(vec3(0.0),1.0/255.0); } @@ -468,10 +468,6 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) vec3 AmbientLightColor = vec3(1.0); #endif - #ifdef FALLBACK_SHADER - vec3 AmbientLightColor = vec3(1.0); - #endif - Indirect_lighting = DoAmbientLightColor(AmbientLightColor, vec3(TORCH_R,TORCH_G,TORCH_B), lightmap.xy); vec3 FinalColor = (Indirect_lighting + Direct_lighting) * Albedo; diff --git a/shaders/dimensions/composite.fsh b/shaders/dimensions/composite.fsh index 74e0efc..08d46ed 100644 --- a/shaders/dimensions/composite.fsh +++ b/shaders/dimensions/composite.fsh @@ -90,8 +90,9 @@ vec2 decodeVec2(float a){ return fract( a * constant1 ) * constant2 ; } float R2_dither(){ + vec2 coord = gl_FragCoord.xy + (frameCounter%40000) * 2.0; vec2 alpha = vec2(0.75487765, 0.56984026); - return fract(alpha.x * gl_FragCoord.x + alpha.y * gl_FragCoord.y + 1.0/1.6180339887 * frameCounter); + return fract(alpha.x * coord.x + alpha.y * coord.y ) ; } float blueNoise(){ return fract(texelFetch2D(noisetex, ivec2(gl_FragCoord.xy)%512, 0).a + 1.0/1.6180339887 * frameCounter); @@ -228,8 +229,9 @@ void main() { float diffthreshM = diffthresh*mult*d0*k/20.; float avgDepth = 0.0; - int seed = (frameCounter%40000) + frameCounter*2; - float noise = fract(R2_samples(seed).y + blueNoise(gl_FragCoord.xy).y); + // int seed = (frameCounter%40000) + frameCounter*2; + // float noise = fract(R2_samples(seed).y + blueNoise(gl_FragCoord.xy).y); + float noise = R2_dither(); for(int i = 0; i < VPS_Search_Samples; i++){ diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index 2299ef5..e8cdeed 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -37,11 +37,6 @@ const bool colortex5MipmapEnabled = true; // #define LIGHTSOURCE_REFLECTION #endif -#ifdef FALLBACK_SHADER - uniform sampler2D colortex4; - uniform float nightVision; - // #define LIGHTSOURCE_REFLECTION -#endif uniform sampler2D noisetex; //noise uniform sampler2D depthtex1; //depth @@ -624,7 +619,7 @@ void main() { vec2 bnoise = blueNoise(gl_FragCoord.xy).rg; int seed = (frameCounter%40000) + frameCounter*2; float noise = fract(R2_samples(seed).y + bnoise.y); - float noise_2 = blueNoise(); + float noise_2 = R2_dither(); vec2 tempOffset = TAA_Offset; vec3 viewPos = toScreenSpace(vec3(texcoord/RENDER_SCALE - TAA_Offset*texelSize*0.5,z)); @@ -643,7 +638,7 @@ void main() { vec3 normal = decode(dataUnpacked0.yw); vec2 lightmap = dataUnpacked1.yz; - #ifndef OVERWORLD_SHADER + #if defined END_SHADER || defined NETHER_SHADER lightmap.y = 1.0; #endif @@ -700,9 +695,7 @@ void main() { float NdotL = 1.0; #ifdef OVERWORLD_SHADER - #ifndef ambientLight_only - DirectLightColor = lightCol.rgb/80.0; - #endif + DirectLightColor = lightCol.rgb/80.0; #ifdef PER_BIOME_ENVIRONMENT BiomeSunlightColor(DirectLightColor); @@ -754,15 +747,6 @@ void main() { #if defined NETHER_SHADER || defined END_SHADER gl_FragData[0].rgb = vec3(0); #endif - - #ifdef FALLBACK_SHADER - vec3 Background = vec3(0.5,0.3,1.0)*0.025; - Background += vec3(0.8,1.0,0.5) * 0.5 * pow(normalize(-feetPlayerPos_normalized).y*0.5+0.5,3.0); - - Background += stars(feetPlayerPos_normalized) * 100.0 * pow(normalize(feetPlayerPos_normalized).y*0.5+0.5,3.0); - gl_FragData[0].rgb = clamp(Background, 0.0, 65000.); - - #endif } else { @@ -829,8 +813,7 @@ void main() { for(int i = 0; i < samples; i++){ - // vec2 offsetS = SpiralSample(i, 7, 8, noise)*0.5; - vec2 offsetS = tapLocation_simple(i, 7, 9, noise) * 0.5; + vec2 offsetS = tapLocation_simple(i, 7, 9, noise_2) * 0.5; float isShadow = shadow2D(shadow, projectedShadowPosition + vec3(rdMul*offsetS, smallbias) ).x; Shadows += isShadow/samples; @@ -965,10 +948,6 @@ void main() { vec3 AmbientLightColor = vec3(1.0); #endif - #ifdef FALLBACK_SHADER - vec3 AmbientLightColor = vec3(1.0); - #endif - Indirect_lighting = DoAmbientLightColor(AmbientLightColor, vec3(TORCH_R,TORCH_G,TORCH_B), lightmap.xy); // Indirect_lighting += LightningFlashLighting; @@ -1050,14 +1029,14 @@ void main() { #endif //////////////////////////////// SKY SSS //////////////////////////////// - #ifdef Ambient_SSS + #if defined Ambient_SSS && defined OVERWORLD_SHADER if (!hand){ #if indirect_effect != 1 SkySSS = ScreenSpace_SSS(viewPos, FlatNormals, hand, isLeaf, noise); #endif - vec3 ambientColor = (AmbientLightColor / 30.0) * 2.5; + vec3 ambientColor = (averageSkyCol_Clouds / 10.0); float skylightmap = pow(lightmap.y,3); Indirect_SSS = SubsurfaceScattering_sky(albedo, SkySSS, LabSSS); diff --git a/shaders/dimensions/composite2.fsh b/shaders/dimensions/composite2.fsh index f375611..bd6f8bd 100644 --- a/shaders/dimensions/composite2.fsh +++ b/shaders/dimensions/composite2.fsh @@ -56,11 +56,6 @@ uniform ivec2 eyeBrightnessSmooth; #include "/lib/end_fog.glsl" #endif -#ifdef FALLBACK_SHADER - uniform sampler2D colortex4; - #include "/lib/fallback_fog.glsl" -#endif - #define fsign(a) (clamp((a)*1e35,0.,1.)*2.-1.) float interleaved_gradientNoise(){ diff --git a/shaders/dimensions/deferred.fsh b/shaders/dimensions/deferred.fsh index 6d0c4fa..c80e8de 100644 --- a/shaders/dimensions/deferred.fsh +++ b/shaders/dimensions/deferred.fsh @@ -86,11 +86,6 @@ float blueNoise(){ #include "/lib/end_fog.glsl" #endif -#ifdef FALLBACK_SHADER - uniform sampler2D colortex4; - #include "/lib/fallback_fog.glsl" -#endif - void main() { /* DRAWBUFFERS:4 */ @@ -115,14 +110,26 @@ float mixhistory = 0.07; if (gl_FragCoord.x > 1. && gl_FragCoord.x < 2. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) gl_FragData[0] = vec4((skyGroundCol/150.0) * AmbientLightTint,1.0); - if (gl_FragCoord.x > 6. && gl_FragCoord.x < 7. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) - gl_FragData[0] = vec4(lightSourceColor,1.0); + #ifdef ambientLight_only + if (gl_FragCoord.x > 6. && gl_FragCoord.x < 7. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) + gl_FragData[0] = vec4(0.0,0.0,0.0,1.0); - if (gl_FragCoord.x > 8. && gl_FragCoord.x < 9. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) - gl_FragData[0] = vec4(sunColor,1.0); + if (gl_FragCoord.x > 8. && gl_FragCoord.x < 9. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) + gl_FragData[0] = vec4(0.0,0.0,0.0,1.0); - if (gl_FragCoord.x > 13. && gl_FragCoord.x < 14. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) - gl_FragData[0] = vec4(moonColor,1.0); + if (gl_FragCoord.x > 13. && gl_FragCoord.x < 14. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) + gl_FragData[0] = vec4(0.0,0.0,0.0,1.0); + #else + if (gl_FragCoord.x > 6. && gl_FragCoord.x < 7. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) + gl_FragData[0] = vec4(lightSourceColor,1.0); + + if (gl_FragCoord.x > 8. && gl_FragCoord.x < 9. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) + gl_FragData[0] = vec4(sunColor,1.0); + + if (gl_FragCoord.x > 13. && gl_FragCoord.x < 14. && gl_FragCoord.y > 19.+18. && gl_FragCoord.y < 19.+18.+1 ) + gl_FragData[0] = vec4(moonColor,1.0); + #endif + //////////////////////////////// /// --- ATMOSPHERE IMAGE --- /// diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 857f9f8..eb7d114 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -302,6 +302,7 @@ screen.Porosity = Porosity / Puddles option.Puddles = Puddles option.Puddle_Size = Puddle Size Multiplier +option.MATERIAL_AO = Material Ambient Occlusion option.DOF_QUALITY=Depth Of Field value.DOF_QUALITY.-1=Off @@ -495,4 +496,6 @@ screen.Post_Processing.comment = Configure settings for all post processing effe option.TAA_UPSCALING.comment = Toggle temporal upscaling. This retains a good amount of quality from a lower resolution image when it upscales. so you can still have a high looking resolution compared to typical upsanpling and still have better performance. option.SCALE_FACTOR.comment = Configure from what fraction of your resolution to upscale from. Below 0.5 is not recommended at all i only have it as an option because it's funny :P -option.RESOURCEPACK_SKY.comment = Toggle resourcepack sky support. Configure settings to use the whole resourcepack sky, or keep the shader's sun and moon. §aPERFORMANCE COST:§r very low \ No newline at end of file +option.RESOURCEPACK_SKY.comment = Toggle resourcepack sky support. Configure settings to use the whole resourcepack sky, or keep the shader's sun and moon. §aPERFORMANCE COST:§r very low + +option.MATERIAL_AO.comment = Toggle the use of ambient occlusion based on what the resourcepack provides. §aPERFORMANCE COST:§r very low \ No newline at end of file diff --git a/shaders/lib/diffuse_lighting.glsl b/shaders/lib/diffuse_lighting.glsl index 08718a3..eefc94b 100644 --- a/shaders/lib/diffuse_lighting.glsl +++ b/shaders/lib/diffuse_lighting.glsl @@ -16,6 +16,7 @@ vec3 DoAmbientLightColor( vec3 TorchLight = TorchColor * TORCH_AMOUNT * TorchLM; return IndirectLight + TorchLight; } + vec4 RT_AmbientLight( vec3 TorchColor, vec2 Lightmap @@ -27,57 +28,4 @@ vec4 RT_AmbientLight( vec3 TorchLight = TorchColor * TORCH_AMOUNT * TorchLM; return vec4(TorchLight, skyLM); -} -// #ifdef NETHER_SHADER -// vec3 DoAmbientLighting_Nether(vec3 FogColor, vec3 TorchColor, float Lightmap, vec3 Normal, vec3 np3, vec3 WorldPos){ - -// float TorchLM = 10.0 - ( 1.0 / (pow(exp(-0.5*inversesqrt(Lightmap)),5.0)+0.1)); -// TorchLM = pow(TorchLM/4,10) + pow(Lightmap,1.5)*0.5; //pow(TorchLM/4.5,10)*2.5 + pow(Lightmap.x,1.5)*0.5; -// vec3 TorchLight = TorchColor * TorchLM * 0.75; -// TorchLight *= TORCH_AMOUNT; - -// FogColor = max(FogColor, vec3(0.05) * MIN_LIGHT_AMOUNT*0.01 + nightVision); - -// return FogColor + TorchLight ; -// } -// #endif - -// #ifdef END_SHADER -// vec3 DoAmbientLighting_End(vec3 FogColor, vec3 TorchColor, float Lightmap, vec3 Normal, vec3 np3){ - -// float TorchLM = 10.0 - ( 1.0 / (pow(exp(-0.5*inversesqrt(Lightmap)),5.0)+0.1)); -// TorchLM = pow(TorchLM/4,10) + pow(Lightmap,1.5)*0.5; -// vec3 TorchLight = TorchColor * TorchLM * 0.75; -// TorchLight *= TORCH_AMOUNT; - - -// FogColor = FogColor / max(dot(FogColor,vec3(0.3333)),0.05); - -// vec3 FogTint = FogColor*clamp(1.1 + dot(Normal,np3),0.0,1.0) * 0.1; - -// vec3 AmbientLight = max(vec3(0.5,0.75,1.0)* 0.1, (MIN_LIGHT_AMOUNT*0.01 + nightVision*0.5) ); - - -// return TorchLight + AmbientLight;// + AmbientLight + FogTint; -// } - -// #endif - -// #ifdef FALLBACK_SHADER -// vec3 DoAmbientLighting_Fallback(vec3 Color, vec3 TorchColor, float Lightmap, vec3 Normal, vec3 p3){ - -// float TorchLM = 10.0 - ( 1.0 / (pow(exp(-0.5*inversesqrt(Lightmap)),5.0)+0.1)); -// TorchLM = pow(TorchLM/4,10) + pow(Lightmap,1.5)*0.5; -// vec3 TorchLight = TorchColor * TorchLM * 0.75; -// TorchLight *= TORCH_AMOUNT; - -// float NdotL = clamp(-dot(Normal,normalize(p3)),0.0,1.0); - -// float PlayerLight = exp( (1.0-clamp(1.0 - length(p3) / 32.0,0.0,1.0)) *-10.0); -// // vec3 AmbientLight = TorchColor * PlayerLight * NdotL; -// vec3 AmbientLight = vec3(0.5,0.3,1.0)*0.2 * (Normal.y*0.5+0.6); - - -// return TorchLight + AmbientLight;// + AmbientLight + FogTint; -// } -// #endif \ No newline at end of file +} \ No newline at end of file diff --git a/shaders/lib/end_fog.glsl b/shaders/lib/end_fog.glsl index 2dc3ef2..a348aa2 100644 --- a/shaders/lib/end_fog.glsl +++ b/shaders/lib/end_fog.glsl @@ -198,7 +198,7 @@ vec4 GetVolumetricFog( float dither, float dither2 ){ - int SAMPLES = 32; + int SAMPLES = 16; vec3 vL = vec3(0.0); float absorbance = 1.0; @@ -286,7 +286,7 @@ vec4 GetVolumetricFog( float AirDensity = 0.002; // AirDensity = 0.0; - vec3 vL1 = vec3(0.5,0.75,1.0); + vec3 vL1 = vec3(0.5,0.75,1.0) * 0.5; // vL1 += Light1 + Light2; vL += (vL1 - vL1*exp2(-AirDensity*dd*dL)) * absorbance; diff --git a/shaders/lib/indirect_lighting_effects.glsl b/shaders/lib/indirect_lighting_effects.glsl index 834c796..6cee1e1 100644 --- a/shaders/lib/indirect_lighting_effects.glsl +++ b/shaders/lib/indirect_lighting_effects.glsl @@ -34,6 +34,7 @@ vec2 SpiralSample( return vec2(x, y); } + //////////////////////////////////////////////////////////////// ///////////////////////////// SSAO //////////////////////// //////////////////////////////////////////////////////////////// diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index b9e52a5..8cf9468 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -261,6 +261,7 @@ const float sunPathRotation = -35; //[-90 -89 -88 -87 -86 -85 -84 -83 -82 -81 -8 #endif #define Puddle_Size 1.0 // [0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5] +// #define MATERIAL_AO ////////////////////////////////////// @@ -315,7 +316,9 @@ uniform int moonPhase; #ifdef VOLUMETRIC_CLOUDS #define Cloud_Fog - #define CLOUDS_SHADOWS + #ifndef ambientLight_only + #define CLOUDS_SHADOWS + #endif #ifdef CLOUDS_SHADOWS #define VL_CLOUDS_SHADOWS diff --git a/shaders/shaders.properties b/shaders/shaders.properties index 97484b9..53115a3 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -36,6 +36,7 @@ blend.gbuffers_water = SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE_MINUS_DST_ALPHA ONE blend.gbuffers_hand_water = SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO blend.gbuffers_textured = SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO blend.gbuffers_textured_lit = SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO +blend.gbuffers_spidereyes = SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE_MINUS_DST_ALPHA ONE blend.gbuffers_armor_glint = ONE ONE ONE ONE blend.gbuffers_weather = ONE ONE ONE ONE blend.gbuffers_skytextured = ONE ONE ONE ONE @@ -48,7 +49,6 @@ blend.gbuffers_basic = off blend.gbuffers_entities = off blend.gbuffers_armor_glint = off blend.gbuffers_beaconbeam = off -blend.gbuffers_spidereyes = off blend.gbuffers_armor_glint = off blend.gbuffers_water.colortex11 = off @@ -98,6 +98,9 @@ PhysicsMod_support [LabPBR] screen.Filtering.columns=1 screen.Filtering = BASIC_SHADOW_FILTER SHADOW_FILTER_SAMPLE_COUNT Min_Shadow_Filter_Radius Variable_Penumbra_Shadows VPS_Search_Samples Max_Shadow_Filter_Radius Max_Filter_Depth + screen.Sun_and_Moon_Colors.columns = 1 + screen.Sun_and_Moon_Colors = sunColorR sunColorG sunColorB moonColorR moonColorG moonColorB colortype Sun_temp Moon_temp + ### AMBIENT LIGHT screen.Ambient_light.columns=1 screen.Ambient_light = [Torch_Colors] [Ambient_Colors] MIN_LIGHT_AMOUNT indirect_effect AO_Strength GI_Strength ambientOcclusionLevel HQ_SSGI Hand_Held_lights SKY_CONTRIBUTION_IN_SSRT @@ -108,7 +111,15 @@ PhysicsMod_support [LabPBR] screen.Ambient_Colors.columns=1 screen.Ambient_Colors = ambient_brightness MIN_LIGHT_AMOUNT AmbientLight_R AmbientLight_G AmbientLight_B + ### LABPBR + screen.LabPBR.columns = 1 + screen.LabPBR = [Reflections] [Subsurface_Scattering] [Emissives] [POM] [Porosity] MATERIAL_AO + screen.Emissives.columns = 1 + screen.Emissives = EMISSIVE_TYPE Emissive_Brightness Emissive_Curve + + screen.Porosity.columns = 1 + screen.Porosity = Porosity Puddles Puddle_Size ######## WORLD screen.World.columns=1 @@ -226,22 +237,12 @@ PhysicsMod_support [LabPBR] screen.Misc_Settings.columns=1 screen.Misc_Settings = [the_orb] display_LUT WhiteWorld SSS_view ambientLight_only Glass_Tint LIGHTNING_FLASH HURT_AND_DEATH_EFFECT LIT_PARTICLE_BRIGHTNESS - screen.the_orb.columns = 1 - screen.the_orb = THE_ORB ORB_X ORB_Y ORB_Z ORB_ColMult ORB_R ORB_G ORB_B + screen.the_orb.columns = 1 + screen.the_orb = THE_ORB ORB_X ORB_Y ORB_Z ORB_ColMult ORB_R ORB_G ORB_B + - screen.LabPBR.columns = 1 - screen.LabPBR = [Reflections] [Subsurface_Scattering] [Emissives] [POM] [Porosity] - - screen.Emissives.columns = 1 - screen.Emissives = EMISSIVE_TYPE Emissive_Brightness Emissive_Curve - - screen.Porosity.columns = 1 - screen.Porosity = Porosity Puddles Puddle_Size - screen.Sun_and_Moon_Colors.columns = 1 - screen.Sun_and_Moon_Colors = sunColorR sunColorG sunColorB moonColorR moonColorG moonColorB colortype Sun_temp Moon_temp - screen.Advanced = Dirt_Scatter_R Dirt_Scatter_G Dirt_Scatter_B Dirt_Absorb_R Dirt_Absorb_G Dirt_Absorb_B Water_Absorb_R Water_Absorb_G Water_Absorb_B @@ -335,7 +336,8 @@ uniform.vec3.lightningEffect = vec3(77.0 * lightningFlash, 153.0 * lightningFlas ####### BIOME RELATED STUFF ####### ################################### -variable.int.BiomeTransitionTime = 1 +# in seconds +variable.int.BiomeTransitionTime = 30 #ifdef SWAMP_ENV uniform.float.isSwamps = smooth(if(in(biome, 6, 52, 7), 1,0), BiomeTransitionTime, BiomeTransitionTime) @@ -367,7 +369,7 @@ uniform.float.sandStorm = smooth(if(in(biome, 5, 26, 27, 28), rainStrength, 0), # set to only happen in cold mountains. uniform.float.snowStorm = smooth(if(in(biome, 31, 32, 33, 34), rainStrength, 0), 15,30) -uniform.float.noPuddleAreas = smooth(if(in(biome, 3, 4, 16, 37, 39, 48, 49, 31, 32, 33, 34, 5, 17, 18, 26, 27, 28), 0,1), 5,5) +uniform.float.noPuddleAreas = smooth(if(in(biome, 3, 4, 16, 37, 39, 48, 49, 31, 32, 33, 34, 5, 17, 18, 26, 27, 28), 0,1), 15,15) @@ -381,7 +383,11 @@ uniform.float.noPuddleAreas = smooth(if(in(biome, 3, 4, 16, 37, 39, 48, 49, 31, uniform.float.dead = smooth(if(dying >= 1.99, 1,0),1,0) #endif -uniform.vec3.CamPos = vec3(cameraPosition.x,cameraPosition.y,cameraPosition.z) +# uniform.vec3.CamPos = vec3(cameraPosition.x,cameraPosition.y,cameraPosition.z) + +# photon stuff +uniform.vec2.view_res = vec2(viewWidth, viewHeight) +uniform.vec2.view_pixel_size = vec2(1.0 / viewWidth, 1.0 / viewHeight) texture.noise = texture/noises.png texture.composite.colortex6 = texture/blueNoise.png @@ -428,7 +434,6 @@ variable.float.shStartZ = (shadowModelView.0.2 * gbufferModelViewInverse.3.0 + s uniform.vec3.shadowCamera = vec3(shStartX + shadowModelView.3.0 + shViewDirX*2., shStartY + shadowModelView.3.1 + shViewDirY*2., shStartZ + shadowModelView.3.2 + shViewDirZ*2.0) - variable.float.wSunX = (gbufferModelViewInverse.0.0 * sunPosX + gbufferModelViewInverse.1.0 * sunPosY + gbufferModelViewInverse.2.0 * sunPosZ) variable.float.wSunY = (gbufferModelViewInverse.0.1 * sunPosX + gbufferModelViewInverse.1.1 * sunPosY + gbufferModelViewInverse.2.1 * sunPosZ) variable.float.wSunZ = (gbufferModelViewInverse.0.2 * sunPosX + gbufferModelViewInverse.1.2 * sunPosY + gbufferModelViewInverse.2.2 * sunPosZ) @@ -439,8 +444,4 @@ variable.float.shSunZ = (shadowModelView.0.2 * wSunX + shadowModelView.1.2 * wSu uniform.vec3.shadowLightVec = vec3(lightSign*shSunX, lightSign*shSunY, lightSign*shSunZ) -uniform.float.shadowMaxProj = 150.0/abs(sunPosY) - -# photon stuff -uniform.vec2.view_res = vec2(viewWidth, viewHeight) -uniform.vec2.view_pixel_size = vec2(1.0 / viewWidth, 1.0 / viewHeight) \ No newline at end of file +uniform.float.shadowMaxProj = 150.0/abs(sunPosY) \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite1.fsh b/shaders/unknown_dimension_fallback/composite1.fsh deleted file mode 100644 index 123ad4f..0000000 --- a/shaders/unknown_dimension_fallback/composite1.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite1.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite1.vsh b/shaders/unknown_dimension_fallback/composite1.vsh deleted file mode 100644 index 3d14adf..0000000 --- a/shaders/unknown_dimension_fallback/composite1.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite1.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite10.fsh b/shaders/unknown_dimension_fallback/composite10.fsh deleted file mode 100644 index 9b21c51..0000000 --- a/shaders/unknown_dimension_fallback/composite10.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite10.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite10.vsh b/shaders/unknown_dimension_fallback/composite10.vsh deleted file mode 100644 index 784ddc5..0000000 --- a/shaders/unknown_dimension_fallback/composite10.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite10.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite11.fsh b/shaders/unknown_dimension_fallback/composite11.fsh deleted file mode 100644 index 122b809..0000000 --- a/shaders/unknown_dimension_fallback/composite11.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite11.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite11.vsh b/shaders/unknown_dimension_fallback/composite11.vsh deleted file mode 100644 index ac416fb..0000000 --- a/shaders/unknown_dimension_fallback/composite11.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite11.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite2.fsh b/shaders/unknown_dimension_fallback/composite2.fsh deleted file mode 100644 index 99f759f..0000000 --- a/shaders/unknown_dimension_fallback/composite2.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite2.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite2.vsh b/shaders/unknown_dimension_fallback/composite2.vsh deleted file mode 100644 index 3c8dbd0..0000000 --- a/shaders/unknown_dimension_fallback/composite2.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite2.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite3.fsh b/shaders/unknown_dimension_fallback/composite3.fsh deleted file mode 100644 index e77e983..0000000 --- a/shaders/unknown_dimension_fallback/composite3.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite3.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite3.vsh b/shaders/unknown_dimension_fallback/composite3.vsh deleted file mode 100644 index 0d1a913..0000000 --- a/shaders/unknown_dimension_fallback/composite3.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite3.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite4.fsh b/shaders/unknown_dimension_fallback/composite4.fsh deleted file mode 100644 index 67b3aff..0000000 --- a/shaders/unknown_dimension_fallback/composite4.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite4.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite4.vsh b/shaders/unknown_dimension_fallback/composite4.vsh deleted file mode 100644 index e20d49b..0000000 --- a/shaders/unknown_dimension_fallback/composite4.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite4.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite5.fsh b/shaders/unknown_dimension_fallback/composite5.fsh deleted file mode 100644 index 6ccd991..0000000 --- a/shaders/unknown_dimension_fallback/composite5.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite5.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite5.vsh b/shaders/unknown_dimension_fallback/composite5.vsh deleted file mode 100644 index f4d4595..0000000 --- a/shaders/unknown_dimension_fallback/composite5.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite5.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite6.fsh b/shaders/unknown_dimension_fallback/composite6.fsh deleted file mode 100644 index 5cd8f50..0000000 --- a/shaders/unknown_dimension_fallback/composite6.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite6.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite6.vsh b/shaders/unknown_dimension_fallback/composite6.vsh deleted file mode 100644 index 485c580..0000000 --- a/shaders/unknown_dimension_fallback/composite6.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite6.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite7.fsh b/shaders/unknown_dimension_fallback/composite7.fsh deleted file mode 100644 index 391ce79..0000000 --- a/shaders/unknown_dimension_fallback/composite7.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite7.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite7.vsh b/shaders/unknown_dimension_fallback/composite7.vsh deleted file mode 100644 index 79e408a..0000000 --- a/shaders/unknown_dimension_fallback/composite7.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite7.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite8.fsh b/shaders/unknown_dimension_fallback/composite8.fsh deleted file mode 100644 index 0550c52..0000000 --- a/shaders/unknown_dimension_fallback/composite8.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite8.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite8.vsh b/shaders/unknown_dimension_fallback/composite8.vsh deleted file mode 100644 index 32e1f6b..0000000 --- a/shaders/unknown_dimension_fallback/composite8.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite8.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite9.fsh b/shaders/unknown_dimension_fallback/composite9.fsh deleted file mode 100644 index 66b4642..0000000 --- a/shaders/unknown_dimension_fallback/composite9.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite9.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/composite9.vsh b/shaders/unknown_dimension_fallback/composite9.vsh deleted file mode 100644 index eda2e6f..0000000 --- a/shaders/unknown_dimension_fallback/composite9.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/composite9.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/deferred.fsh b/shaders/unknown_dimension_fallback/deferred.fsh deleted file mode 100644 index fb7ece7..0000000 --- a/shaders/unknown_dimension_fallback/deferred.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/deferred.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/deferred.vsh b/shaders/unknown_dimension_fallback/deferred.vsh deleted file mode 100644 index 75ba542..0000000 --- a/shaders/unknown_dimension_fallback/deferred.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/deferred.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/deferred1.fsh b/shaders/unknown_dimension_fallback/deferred1.fsh deleted file mode 100644 index 4572957..0000000 --- a/shaders/unknown_dimension_fallback/deferred1.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/deferred1.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/deferred1.vsh b/shaders/unknown_dimension_fallback/deferred1.vsh deleted file mode 100644 index 7cf4357..0000000 --- a/shaders/unknown_dimension_fallback/deferred1.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/deferred1.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/final.fsh b/shaders/unknown_dimension_fallback/final.fsh deleted file mode 100644 index de7edf7..0000000 --- a/shaders/unknown_dimension_fallback/final.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/final.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/final.vsh b/shaders/unknown_dimension_fallback/final.vsh deleted file mode 100644 index 3be04af..0000000 --- a/shaders/unknown_dimension_fallback/final.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/final.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_armor_glint.fsh b/shaders/unknown_dimension_fallback/gbuffers_armor_glint.fsh deleted file mode 100644 index 5501d52..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_armor_glint.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define ENCHANT_GLINT - -#include "/dimensions/all_vanilla_emissives.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_armor_glint.vsh b/shaders/unknown_dimension_fallback/gbuffers_armor_glint.vsh deleted file mode 100644 index 87ad965..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_armor_glint.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define ENCHANT_GLINT - -#include "/dimensions/all_vanilla_emissives.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_basic.fsh b/shaders/unknown_dimension_fallback/gbuffers_basic.fsh deleted file mode 100644 index 13c7677..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_basic.fsh +++ /dev/null @@ -1,9 +0,0 @@ -#version 120 - -// #define ENTITIES -#define BLOCKENTITIES -#define WORLD - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_basic.vsh b/shaders/unknown_dimension_fallback/gbuffers_basic.vsh deleted file mode 100644 index 0d728b7..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_basic.vsh +++ /dev/null @@ -1,10 +0,0 @@ -#version 120 - -// #define ENTITIES -// #define LINE -#define BLOCKENTITIES -#define WORLD - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_beaconbeam.fsh b/shaders/unknown_dimension_fallback/gbuffers_beaconbeam.fsh deleted file mode 100644 index 3e666de..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_beaconbeam.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define BEACON_BEAM - -#include "/dimensions/all_vanilla_emissives.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_beaconbeam.vsh b/shaders/unknown_dimension_fallback/gbuffers_beaconbeam.vsh deleted file mode 100644 index f285c00..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_beaconbeam.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define BEACON_BEAM - -#include "/dimensions/all_vanilla_emissives.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_block.fsh b/shaders/unknown_dimension_fallback/gbuffers_block.fsh deleted file mode 100644 index be6bdeb..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_block.fsh +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -#define WORLD -#define BLOCKENTITIES - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_block.vsh b/shaders/unknown_dimension_fallback/gbuffers_block.vsh deleted file mode 100644 index 083af2e..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_block.vsh +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -#define WORLD -#define BLOCKENTITIES - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_damagedblock.fsh b/shaders/unknown_dimension_fallback/gbuffers_damagedblock.fsh deleted file mode 100644 index de28554..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_damagedblock.fsh +++ /dev/null @@ -1,6 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER -#define DAMAGE_BLOCK_EFFECT - -#include "/dimensions/all_translucent.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_damagedblock.vsh b/shaders/unknown_dimension_fallback/gbuffers_damagedblock.vsh deleted file mode 100644 index 6dca068..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_damagedblock.vsh +++ /dev/null @@ -1,6 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER -#define DAMAGE_BLOCK_EFFECT - -#include "/dimensions/all_translucent.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_entities.fsh b/shaders/unknown_dimension_fallback/gbuffers_entities.fsh deleted file mode 100644 index bfe616a..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_entities.fsh +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -#define WORLD -#define ENTITIES - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_entities.vsh b/shaders/unknown_dimension_fallback/gbuffers_entities.vsh deleted file mode 100644 index 9551379..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_entities.vsh +++ /dev/null @@ -1,9 +0,0 @@ -#version 120 - - -// #define WORLD -#define ENTITIES - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_entities_glowing.fsh b/shaders/unknown_dimension_fallback/gbuffers_entities_glowing.fsh deleted file mode 100644 index 2f75507..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_entities_glowing.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define GLOWING - -#include "/dimensions/all_vanilla_emissives.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_entities_glowing.vsh b/shaders/unknown_dimension_fallback/gbuffers_entities_glowing.vsh deleted file mode 100644 index a8a4292..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_entities_glowing.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define GLOWING - -#include "/dimensions/all_vanilla_emissives.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_hand.fsh b/shaders/unknown_dimension_fallback/gbuffers_hand.fsh deleted file mode 100644 index cc8ef08..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_hand.fsh +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -#define WORLD -#define HAND - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_hand.vsh b/shaders/unknown_dimension_fallback/gbuffers_hand.vsh deleted file mode 100644 index d72528a..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_hand.vsh +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -#define WORLD -#define HAND - -#define FALLBACK_SHADER - -#include "/dimensions/all_solid.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_hand_water.fsh b/shaders/unknown_dimension_fallback/gbuffers_hand_water.fsh deleted file mode 100644 index 4a34bba..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_hand_water.fsh +++ /dev/null @@ -1,6 +0,0 @@ -#version 120 - -#define HAND -#define FALLBACK_SHADER - -#include "/dimensions/all_translucent.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_hand_water.vsh b/shaders/unknown_dimension_fallback/gbuffers_hand_water.vsh deleted file mode 100644 index 1607313..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_hand_water.vsh +++ /dev/null @@ -1,6 +0,0 @@ -#version 120 - -#define HAND -#define FALLBACK_SHADER - -#include "/dimensions/all_translucent.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_skybasic.fsh b/shaders/unknown_dimension_fallback/gbuffers_skybasic.fsh deleted file mode 100644 index 21db346..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_skybasic.fsh +++ /dev/null @@ -1,7 +0,0 @@ -#version 120 - -/* RENDERTARGETS:0 */ - -void main() { - discard; -} diff --git a/shaders/unknown_dimension_fallback/gbuffers_skybasic.vsh b/shaders/unknown_dimension_fallback/gbuffers_skybasic.vsh deleted file mode 100644 index 0a2f94b..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_skybasic.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -void main() { - gl_Position = ftransform(); -} diff --git a/shaders/unknown_dimension_fallback/gbuffers_skytextured.fsh b/shaders/unknown_dimension_fallback/gbuffers_skytextured.fsh deleted file mode 100644 index 21db346..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_skytextured.fsh +++ /dev/null @@ -1,7 +0,0 @@ -#version 120 - -/* RENDERTARGETS:0 */ - -void main() { - discard; -} diff --git a/shaders/unknown_dimension_fallback/gbuffers_skytextured.vsh b/shaders/unknown_dimension_fallback/gbuffers_skytextured.vsh deleted file mode 100644 index 0a2f94b..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_skytextured.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -void main() { - gl_Position = ftransform(); -} diff --git a/shaders/unknown_dimension_fallback/gbuffers_spidereyes.fsh b/shaders/unknown_dimension_fallback/gbuffers_spidereyes.fsh deleted file mode 100644 index 538421d..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_spidereyes.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define SPIDER_EYES - -#include "/dimensions/all_vanilla_emissives.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_spidereyes.vsh b/shaders/unknown_dimension_fallback/gbuffers_spidereyes.vsh deleted file mode 100644 index ad968cc..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_spidereyes.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define SPIDER_EYES - -#include "/dimensions/all_vanilla_emissives.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_terrain.fsh b/shaders/unknown_dimension_fallback/gbuffers_terrain.fsh deleted file mode 100644 index 67a223b..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_terrain.fsh +++ /dev/null @@ -1,7 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#define WORLD - -#include "/dimensions/all_solid.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_terrain.vsh b/shaders/unknown_dimension_fallback/gbuffers_terrain.vsh deleted file mode 100644 index 5b1ecef..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_terrain.vsh +++ /dev/null @@ -1,7 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#define WORLD - -#include "/dimensions/all_solid.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_textured.fsh b/shaders/unknown_dimension_fallback/gbuffers_textured.fsh deleted file mode 100644 index 9f98140..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_textured.fsh +++ /dev/null @@ -1,6 +0,0 @@ -#version 120 - - -#define FALLBACK_SHADER - -#include "/dimensions/all_particles.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_textured.vsh b/shaders/unknown_dimension_fallback/gbuffers_textured.vsh deleted file mode 100644 index c1f0c91..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_textured.vsh +++ /dev/null @@ -1,6 +0,0 @@ -#version 120 - - -#define FALLBACK_SHADER - -#include "/dimensions/all_particles.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_textured_lit.fsh b/shaders/unknown_dimension_fallback/gbuffers_textured_lit.fsh deleted file mode 100644 index 24ea236..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_textured_lit.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/all_particles.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_textured_lit.vsh b/shaders/unknown_dimension_fallback/gbuffers_textured_lit.vsh deleted file mode 100644 index bdb8c12..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_textured_lit.vsh +++ /dev/null @@ -1,8 +0,0 @@ -#version 120 - -// #define WEATHER -#define PARTICLES - -#define FALLBACK_SHADER - -#include "/dimensions/all_particles.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_water.fsh b/shaders/unknown_dimension_fallback/gbuffers_water.fsh deleted file mode 100644 index 7f6c880..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_water.fsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/all_translucent.fsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_water.vsh b/shaders/unknown_dimension_fallback/gbuffers_water.vsh deleted file mode 100644 index faa9544..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_water.vsh +++ /dev/null @@ -1,5 +0,0 @@ -#version 120 - -#define FALLBACK_SHADER - -#include "/dimensions/all_translucent.vsh" \ No newline at end of file diff --git a/shaders/unknown_dimension_fallback/gbuffers_weather.fsh b/shaders/unknown_dimension_fallback/gbuffers_weather.fsh deleted file mode 100644 index f169e8b..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_weather.fsh +++ /dev/null @@ -1,49 +0,0 @@ -#version 120 - - -varying vec4 lmtexcoord; -varying vec4 color; - -uniform sampler2D texture; -uniform sampler2D gaux1; -uniform vec4 lightCol; -uniform vec3 sunVec; - -uniform vec2 texelSize; -uniform float skyIntensityNight; -uniform float skyIntensity; -uniform float rainStrength; - -uniform mat4 gbufferProjectionInverse; - -#define diagonal3(m) vec3((m)[0].x, (m)[1].y, m[2].z) -#define projMAD(m, v) (diagonal3(m) * (v) + (m)[3].xyz) -vec3 toLinear(vec3 sRGB){ - return sRGB * (sRGB * (sRGB * 0.305306011 + 0.682171111) + 0.012522878); -} - - -vec3 toScreenSpaceVector(vec3 p) { - vec4 iProjDiag = vec4(gbufferProjectionInverse[0].x, gbufferProjectionInverse[1].y, gbufferProjectionInverse[2].zw); - vec3 p3 = p * 2. - 1.; - vec4 fragposition = iProjDiag * p3.xyzz + gbufferProjectionInverse[3]; - return normalize(fragposition.xyz); -} -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// - -void main() { -/* DRAWBUFFERS:2 */ - gl_FragData[0] = texture2D(texture, lmtexcoord.xy)*color; - gl_FragData[0].a = clamp(gl_FragData[0].a -0.1,0.0,1.0)*0.5; - vec3 albedo = toLinear(gl_FragData[0].rgb*color.rgb); - vec3 ambient = texture2D(gaux1,(lmtexcoord.zw*15.+0.5)*texelSize).rgb; - - gl_FragData[0].rgb = dot(albedo,vec3(1.0))*ambient*10./3.0/150.*0.1; - - - -} diff --git a/shaders/unknown_dimension_fallback/gbuffers_weather.vsh b/shaders/unknown_dimension_fallback/gbuffers_weather.vsh deleted file mode 100644 index b7c44aa..0000000 --- a/shaders/unknown_dimension_fallback/gbuffers_weather.vsh +++ /dev/null @@ -1,44 +0,0 @@ -#version 120 -#define TAA - -/* -!! DO NOT REMOVE !! -This code is from Chocapic13' shaders -Read the terms of modification and sharing before changing something below please ! -!! DO NOT REMOVE !! -*/ - -varying vec4 lmtexcoord; -varying vec4 color; - -uniform vec2 texelSize; -uniform int framemod8; - const vec2[8] offsets = vec2[8](vec2(1./8.,-3./8.), - vec2(-1.,3.)/8., - vec2(5.0,1.)/8., - vec2(-3,-5.)/8., - vec2(-5.,5.)/8., - vec2(-7.,-1.)/8., - vec2(3,7.)/8., - vec2(7.,-7.)/8.); -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// -//////////////////////////////VOID MAIN////////////////////////////// - -void main() { - - lmtexcoord.xy = (gl_MultiTexCoord0).xy; - - vec2 lmcoord = gl_MultiTexCoord1.xy/255.; - lmtexcoord.zw = lmcoord*lmcoord; - - - gl_Position = ftransform(); - - color = gl_Color; - #ifdef TAA - gl_Position.xy += offsets[framemod8] * gl_Position.w*texelSize; - #endif -} \ No newline at end of file