diff --git a/CREDITS.txt b/CREDITS.txt index da54d3e..ceba16c 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -22,7 +22,7 @@ Credit to the translators: Ruri / nakiriruri (discord) YurgenS / yurgens (discord) CReepa / _CReepa_ (discord) - + Huagege Credit to the people who inspired many changes and ideas, that you NEED to know about: diff --git a/shaders/block.properties b/shaders/block.properties index 4018a21..6cc1200 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -6,7 +6,7 @@ block.8=minecraft:water minecraft:flowing_water tfc:flowing_spring_water tfc:spr block.11=bamboo bamboo_sapling -block.12=minecraft:short_grass +block.12=minecraft:short_grass minecraft:grass block.13=minecraft:small_dripleaf:half=lower minecraft:pitcher_plant:half=lower minecraft:tall_grass:half=lower minecraft:sunflower:half=lower minecraft:large_fern:half=lower minecraft:peony:half=lower minecraft:rose_bush:half=lower minecraft:lilac:half=lower minecraft:tall_seagrass:half=lower \ biomesoplenty:sea_oats:half=lower biomesoplenty:tall_lavender:half=lower biomesoplenty:tall_white_lavender:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:reed:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:eyebulb:half=lower biomesoplenty:blue_hydrangea:half=lower \ diff --git a/shaders/dimensions/DH_translucent.fsh b/shaders/dimensions/DH_translucent.fsh index bd77116..f94575b 100644 --- a/shaders/dimensions/DH_translucent.fsh +++ b/shaders/dimensions/DH_translucent.fsh @@ -48,8 +48,8 @@ varying vec2 lightmapCoords; flat varying int isWater; // uniform float far; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; uniform vec3 previousCameraPosition; // uniform vec3 cameraPosition; @@ -102,17 +102,17 @@ float ld(float dist) { } // float DH_ld(float dist) { -// return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); +// return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); // } // float DH_invLinZ (float lindepth){ -// return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); +// return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); // } float DH_ld(float dist) { - return (2.0 * near) / (dhFarPlane + near - dist * (dhFarPlane - near)); + return (2.0 * near) / (dhVoxyFarPlane + near - dist * (dhVoxyFarPlane - near)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -164,7 +164,7 @@ uniform int framemod8; #include "/lib/TAA_jitter.glsl" float invLdFast(float linearDepth) { - return (dhFarPlane * (dhNearPlane - linearDepth)) / ((dhNearPlane - dhFarPlane) * linearDepth); + return (dhVoxyFarPlane * (dhVoxyNearPlane - linearDepth)) / ((dhVoxyNearPlane - dhVoxyFarPlane) * linearDepth); } #define FORWARD_SSR_QUALITY 30 // [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 200 300 400 500] @@ -176,11 +176,16 @@ vec3 rayTrace(vec3 dir, vec3 position, float dither, float fresnel) { float quality = float(FORWARD_SSR_QUALITY); vec3 clipPosition = DH_toClipSpace3(position); - float rayLength = ((position.z + dir.z * dhFarPlane*sqrt(3.)) > -dhNearPlane) ? - (-dhNearPlane - position.z) / dir.z : dhFarPlane*sqrt(3.); + float rayLength = ((position.z + dir.z * dhVoxyFarPlane*sqrt(3.)) > -dhVoxyNearPlane) ? + (-dhVoxyNearPlane - position.z) / dir.z : dhVoxyFarPlane*sqrt(3.); vec3 direction = DH_toClipSpace3(position + dir * rayLength) - clipPosition; //convert to clip space + #if FORWARD_SSR_QUALITY == 1 + vec3 reflectedTC = vec3((direction.xy + clipPosition.xy) * RENDER_SCALE, 0.999999); + return reflectedTC; + #endif + //get at which length the ray intersects with the edge of the screen vec3 maxLengths = (step(0.0, direction) - clipPosition) / direction; float mult = min(min(maxLengths.x, maxLengths.y), maxLengths.z); @@ -201,7 +206,7 @@ vec3 rayTrace(vec3 dir, vec3 position, float dither, float fresnel) { #endif float sampleDepth = sqrt(texelFetch2D(colortex12, ivec2(spos.xy / (texelSize * 4.0)), 0).a / 65000.0); - float sp = invLdFast(sampleDepth*dhFarPlane); + float sp = invLdFast(sampleDepth*dhVoxyFarPlane); if (sp < max(minZ, maxZ) && sp > min(minZ, maxZ)) { return vec3(spos.xy / RENDER_SCALE, sp); @@ -290,7 +295,7 @@ if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) vec3 viewPos = pos.xyz; vec3 playerPos = mat3(gbufferModelViewInverse) * viewPos + gbufferModelViewInverse[3].xyz; float viewDist = length(playerPos); - float transition = exp(-25* pow(clamp(1.0 - viewDist/(far-8),0.0,1.0),2)); + // float transition = exp(-25* pow(clamp(1.0 - viewDist/(far-8),0.0,1.0),2)); #if DH_CHUNK_FADING > 0 if (!iswater){ diff --git a/shaders/dimensions/DH_translucent.vsh b/shaders/dimensions/DH_translucent.vsh index 993ed0b..396188f 100644 --- a/shaders/dimensions/DH_translucent.vsh +++ b/shaders/dimensions/DH_translucent.vsh @@ -105,7 +105,7 @@ void main() { averageSkyCol_Clouds = texelFetch2D(colortex4,ivec2(0,37),0).rgb; #ifdef OVERWORLD_SHADER - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #endif #ifdef CUSTOM_MOON_ROTATION diff --git a/shaders/dimensions/all_particles.vsh b/shaders/dimensions/all_particles.vsh index 2811599..f1ed2e7 100644 --- a/shaders/dimensions/all_particles.vsh +++ b/shaders/dimensions/all_particles.vsh @@ -101,13 +101,10 @@ void main() { vec3 worldpos = mat3(gbufferModelViewInverse) * position + gbufferModelViewInverse[3].xyz; #ifdef WEATHER - worldpos += cameraPosition; - bool istopv = worldpos.y > cameraPosition.y + 5.0 && lmtexcoord.w > 0.99; + bool istopv = worldpos.y > 5.0 && lmtexcoord.w > 0.99; if(!istopv){ - worldpos.xyz -= cameraPosition - vec3(2.0,0.0,2.0) * min(max(clamp(eyeBrightnessSmooth.y/240.0,0,1)-0.95,0)/0.05,1); - }else{ - worldpos.xyz -= cameraPosition; + worldpos += vec3(2.0,0.0,2.0) * min(max(clamp(eyeBrightnessSmooth.y/240.0,0,1)-0.95,0)/0.05,1); } #endif @@ -145,7 +142,7 @@ void main() { WsunVec = lightCol.a * normalize(mat3(gbufferModelViewInverse) * sunPosition); #endif - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #endif diff --git a/shaders/dimensions/all_solid.fsh b/shaders/dimensions/all_solid.fsh index b4e4446..171dc70 100644 --- a/shaders/dimensions/all_solid.fsh +++ b/shaders/dimensions/all_solid.fsh @@ -385,8 +385,12 @@ void main() { if(!ifPOM) maxdist = 0.0; gl_FragDepth = gl_FragCoord.z; - if (falloff > 0.0 && ISSHADERGRASS == 0) { - + #ifdef SHADER_GRASS + if (falloff > 0.0 && ISSHADERGRASS == 0) + #else + if (falloff > 0.0) + #endif + { float depthmap = readNormal(texcoord.st).a; float used_POM_DEPTH = 1.0; float pomdepth = POM_DEPTH*falloff; @@ -437,7 +441,12 @@ void main() { #ifndef COLORWHEEL vec4 Albedo = color; - if (ISSHADERGRASS < 1) Albedo *= texture2D_POMSwitch(texture, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM, textureLOD); + #ifdef SHADER_GRASS + if (ISSHADERGRASS < 1) + #endif + { + Albedo *= texture2D_POMSwitch(texture, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM, textureLOD); + } #else vec4 Albedo = texture2D_POMSwitch(texture, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM, textureLOD); vec4 overlayColor; @@ -504,7 +513,7 @@ void main() { #if defined WORLD && !defined ENTITIES && !defined HAND float endPortalEmission = 0.0; if(PORTAL > 0) { - float steps = 20; + const float steps = 20; vec3 color = vec3(0.0); float absorbance = 1.0; @@ -619,7 +628,10 @@ void main() { //////////////////////////////// //////////////////////////////// #if defined WORLD && defined MC_NORMAL_MAP - if(ISSHADERGRASS < 1) { + #ifdef SHADER_GRASS + if(ISSHADERGRASS < 1) + #endif + { vec4 NormalTex = texture2D_POMSwitch(normals, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM,textureLOD).xyzw; #ifdef MATERIAL_AO @@ -641,9 +653,13 @@ void main() { #ifdef WORLD vec4 SpecularTex = vec4(0.0); + #ifdef SHADER_GRASS if (ISSHADERGRASS > 0) { SpecularTex = vec4(0.15, 0.025, 1.0, 0.0); - } else { + } else + #endif + { + SpecularTex = texture2D_POMSwitch(specular, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM,textureLOD); } @@ -711,7 +727,10 @@ void main() { normal = viewToWorld(normal); vec3 flatNormals = viewToWorld(FlatNormals); - if (ISSHADERGRASS > 0) {flatNormals = FlatNormals; normal = GrassNormals;} + + #ifdef SHADER_GRASS + if (ISSHADERGRASS > 0) {flatNormals = FlatNormals; normal = GrassNormals;} + #endif vec4 data1 = clamp( encode(normal, PackLightmaps), 0.0, 1.0); diff --git a/shaders/dimensions/all_solid.gsh b/shaders/dimensions/all_solid.gsh index 2aaaabd..c1e61cd 100644 --- a/shaders/dimensions/all_solid.gsh +++ b/shaders/dimensions/all_solid.gsh @@ -1,5 +1,8 @@ layout(triangles) in; -#if !defined ENTITIES && !defined HAND + +#include "/lib/settings.glsl" + +#if !defined ENTITIES && !defined HAND && defined SHADER_GRASS && !defined COLORWHEEL layout(triangle_strip, max_vertices = 24) out; #else layout(triangle_strip, max_vertices = 3) out; @@ -71,7 +74,6 @@ uniform int hideGUI; uniform float aspectRatio; uniform float screenBrightness; -#include "/lib/settings.glsl" #include "/lib/TAA_jitter.glsl" #include "/lib/res_params.glsl" #include "/lib/bokeh.glsl" @@ -285,7 +287,11 @@ void main() { worldUp *= heightMult; - originalVertex -= right*0.25*GRASS_BASE_THICKNESS; + originalVertex -= right*0.0625*GRASS_BASE_THICKNESS; + + vec3 verticies[21]; + float grassHeights[21]; + vec3 GrassNormal[7]; for (j = 0; j < triangle_count; j++) { @@ -312,17 +318,10 @@ void main() { worldOffset2 ); - float grassHeight0 = 0.125 * worldOffset0.y; - float grassHeight1 = 0.125 * worldOffset1.y; - float grassHeight2 = 0.125 * worldOffset2.y; + grassHeights[3*j] = 0.125 * worldOffset0.y; + grassHeights[3*j+1] = 0.125 * worldOffset1.y; + grassHeights[3*j+2] = 0.125 * worldOffset2.y; - float grassHeights[3] = float[]( - grassHeight0, - grassHeight1, - grassHeight2 - ); - - vec3 verticies[3]; vec2 totalRandBend = GRASS_RANDOMNESS*randomDir + edgeBlend; @@ -331,7 +330,7 @@ void main() { vec3 worldOffset = worldOffsets[i]; vertex = originalVertex; - float grassCurvature = smoothstep(0.0, 1.0, grassHeights[i]); + float grassCurvature = smoothstep(0.0, 1.0, grassHeights[3*j+i]); vertex.xz += 0.7*playerDist*vec2(dir2)*grassCurvature; @@ -339,16 +338,19 @@ void main() { vertex += 1.6*calcMovePlants(vertex + cameraPosition)*grassCurvature*grassCurvature; - verticies[i] = vertex + 0.125 * worldOffset; + verticies[3*j+i] = vertex + 0.125 * worldOffset; } - vec3 GrassNormal = calculateNormal(verticies[0], verticies[1], verticies[2]); + GrassNormal[j] = calculateNormal(verticies[3*j], verticies[3*j+1], verticies[3*j+2]); + + } + + for (j = 0; j < triangle_count; j++) { for (i = 0; i < 3; i++) { - - gl_Position = toClipSpace3(mat3(gbufferModelView) * (verticies[i]) + gbufferModelView[3].xyz); + gl_Position = toClipSpace3(mat3(gbufferModelView) * (verticies[3*j+i]) + gbufferModelView[3].xyz); #ifdef TAA_UPSCALING gl_Position.xy = gl_Position.xy * RENDER_SCALE + RENDER_SCALE * gl_Position.w - gl_Position.w; @@ -382,7 +384,7 @@ void main() { gl_Position.xy += hideGUI >= 1 ? totalOffset : vec2(0); #endif - float heightfade = smoothstep(-0.35, 1.0, grassHeights[i]); + float heightfade = smoothstep(-0.35, 1.0, grassHeights[3*j+i]); // vec3 podzolColor = mix(vec3(0.15, 0.26, 0.01), vec3(168, 158, 91)/255., heightfade); @@ -402,12 +404,15 @@ void main() { tangent = vtangent[i]; // FlatNormals = vFlatNormals[i]; - FlatNormals = GrassNormal; + FlatNormals = GrassNormal[j]; - // TODO: MAKE SMOOTH NORMALS - GrassNormals = GrassNormal; + heightfade = smoothstep(0.1, grassHeights[triangle_count], grassHeights[3*j+i]); + GrassNormals = normalize(mix(GrassNormal[0], GrassNormal[triangle_count-1], vec3(heightfade))); #endif + + normalize(mix(GrassNormal[0], GrassNormal[triangle_count-1], vec3(heightfade))); + blockID = vblockID[i]; NameTags = vNameTags[i]; SSSAMOUNT = 1.0; diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh index 4eee921..3171e0a 100644 --- a/shaders/dimensions/all_translucent.fsh +++ b/shaders/dimensions/all_translucent.fsh @@ -134,8 +134,8 @@ uniform float waterEnteredAltitude; #endif #endif -uniform float dhNearPlane; -uniform float dhFarPlane; +uniform float dhVoxyNearPlane; +uniform float dhVoxyFarPlane; #include "/lib/util.glsl" #include "/lib/Shadow_Params.glsl" diff --git a/shaders/dimensions/all_translucent.vsh b/shaders/dimensions/all_translucent.vsh index bfa4959..0ad9b90 100644 --- a/shaders/dimensions/all_translucent.vsh +++ b/shaders/dimensions/all_translucent.vsh @@ -270,7 +270,7 @@ void main() { WsunVec = mix(WmoonVec, WsunVec, clamp(lightCol.a,0,1)); - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #endif diff --git a/shaders/dimensions/begin.csh b/shaders/dimensions/begin.csh index 06a5bad..f4142f6 100644 --- a/shaders/dimensions/begin.csh +++ b/shaders/dimensions/begin.csh @@ -44,12 +44,11 @@ const ivec3 workGroups = ivec3(1, 1, 1); #include "/lib/SSBOs.glsl" uniform vec3 cameraPosition; #if defined END_ISLAND_LIGHT && defined END_SHADER - float NEAR = 15.0; - float FAR = 256.0; + const float NEAR = 15.0; + const float FAR = 256.0; mat4 createPerspectiveMatrix() { - float fov = END_LIGHT_FOV; - float yScale = 1.0 / tan(radians(fov) * 0.5); + float yScale = 1.0 / tan(radians(END_LIGHT_FOV) * 0.5); return mat4( yScale, 0.0, 0.0, 0.0, diff --git a/shaders/dimensions/composite.fsh b/shaders/dimensions/composite.fsh index 9ccb984..3ff6181 100644 --- a/shaders/dimensions/composite.fsh +++ b/shaders/dimensions/composite.fsh @@ -17,6 +17,15 @@ uniform sampler2D depthtex1; #ifdef DISTANT_HORIZONS uniform sampler2D dhDepthTex; uniform sampler2D dhDepthTex1; + #define dhVoxyDepthTex dhDepthTex + #define dhVoxyDepthTex1 dhDepthTex1 +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + uniform sampler2D vxDepthTexTrans; + #define dhVoxyDepthTex vxDepthTexTrans + #define dhVoxyDepthTex1 vxDepthTexOpaque #endif uniform sampler2D colortex1; @@ -68,8 +77,8 @@ uniform float viewHeight; // uniform float far; uniform float near; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; #include "/lib/Shadows.glsl" @@ -230,10 +239,10 @@ vec2 CleanSample( #include "/lib/DistantHorizons_projections.glsl" float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -286,8 +295,8 @@ vec2 SSAO( float sampleDepth = convertHandDepth_2(texelFetch2D(depthtex1, offsetUV, 0).x, hand); - #ifdef DISTANT_HORIZONS - float sampleDHDepth = texelFetch2D(dhDepthTex1, offsetUV, 0).x; + #if defined DISTANT_HORIZONS || defined VOXY + float sampleDHDepth = texelFetch2D(dhVoxyDepthTex1, offsetUV, 0).x; vec3 offsetViewPos = toScreenSpace_DH((offsetUV*texelSize - jitterOffsets) * (1.0/RENDER_SCALE), sampleDepth, sampleDHDepth); #else vec3 offsetViewPos = toScreenSpace(vec3((offsetUV*texelSize - jitterOffsets) * (1.0/RENDER_SCALE), sampleDepth)); @@ -377,9 +386,12 @@ void main() { float z = texelFetch2D(depthtex1,ivec2(gl_FragCoord.xy),0).x; float z0 = texelFetch2D(depthtex0,ivec2(gl_FragCoord.xy),0).x; - #ifdef DISTANT_HORIZONS - float DH_depth1 = texelFetch2D(dhDepthTex1,ivec2(gl_FragCoord.xy),0).x; - float DH_depth0 = texelFetch2D(dhDepthTex,ivec2(gl_FragCoord.xy),0).x; + #if defined DISTANT_HORIZONS || defined VOXY + float DH_depth1 = texelFetch2D(dhVoxyDepthTex1,ivec2(gl_FragCoord.xy),0).x; + float DH_depth0 = texelFetch2D(dhVoxyDepthTex,ivec2(gl_FragCoord.xy),0).x; + #ifdef VOXY + DH_depth0 = min(DH_depth1, DH_depth0); + #endif float swappedDepth = z >= 1.0 ? DH_depth1 : z; #else float DH_depth1 = 1.0; @@ -392,29 +404,29 @@ void main() { float depth = z; float depth0 = z0; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float _near = near; float _far = far*4.0; if (depth >= 1.0) { depth = DH_depth1; - _near = dhNearPlane; - _far = dhFarPlane; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } depth = linearizeDepthFast(depth, _near, _far); - depth = depth / dhFarPlane; + depth = depth / dhVoxyFarPlane; _near = near; _far = far*4.0; if (depth0 >= 1.0) { depth0 = DH_depth0; - _near = dhNearPlane; - _far = dhFarPlane; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } depth0 = linearizeDepthFast(depth0, _near, _far); - depth0 = depth0 / dhFarPlane; + depth0 = depth0 / dhVoxyFarPlane; #endif if(depth < 1.0 || depth0 < 1.0) diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index e87d865..7034abd 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -99,8 +99,17 @@ uniform sampler2D depthtex1; uniform sampler2D depthtex2; #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; -uniform sampler2D dhDepthTex1; + uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex1; + #define dhVoxyDepthTex dhDepthTex + #define dhVoxyDepthTex1 dhDepthTex1 +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + uniform sampler2D vxDepthTexTrans; + #define dhVoxyDepthTex vxDepthTexTrans + #define dhVoxyDepthTex1 vxDepthTexOpaque #endif uniform sampler2D colortex0; //clouds @@ -140,8 +149,8 @@ uniform bool firstPersonCamera; // uniform float far; uniform float near; uniform float farPlane; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; flat varying vec3 zMults; @@ -252,11 +261,11 @@ vec2 decodeVec2(float a){ return fract( a * constant1 ) * constant2 ; } float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -396,8 +405,8 @@ float swapperlinZ(float depth, float _near, float _far) { // float _near = near; float _far = far*4.0; // if (depthCheck) { -// _near = dhNearPlane; -// _far = dhFarPlane; +// _near = dhVoxyNearPlane; +// _far = dhVoxyFarPlane; // } @@ -458,8 +467,8 @@ vec2 SSRT_Shadows(vec3 viewPos, bool depthCheck, vec3 lightDir, float noise, boo float _near = near; float _far = far*4.0; if (depthCheck) { - _near = dhNearPlane; - _far = dhFarPlane; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } vec3 position = toClipSpace3_DH(viewPos, depthCheck) ; @@ -485,8 +494,8 @@ vec2 SSRT_Shadows(vec3 viewPos, bool depthCheck, vec3 lightDir, float noise, boo float sampleDepth = convertHandDepth_2(texelFetch2D(depthtex1, ivec2(newPos.xy/texelSize),0).x,hand); - #ifdef DISTANT_HORIZONS - if(depthCheck) sampleDepth = texelFetch2D(dhDepthTex1, ivec2(newPos.xy/texelSize),0).x; + #if defined DISTANT_HORIZONS || defined VOXY + if(depthCheck) sampleDepth = texelFetch2D(dhVoxyDepthTex1, ivec2(newPos.xy/texelSize),0).x; #endif if(sampleDepth < newPos.z){ @@ -524,8 +533,8 @@ float SSRT_FlashLight_Shadows(vec3 viewPos, bool depthCheck, vec3 lightDir, floa float _near = near; float _far = far*4.0; if (depthCheck) { - _near = dhNearPlane; - _far = dhFarPlane; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } vec3 position = toClipSpace3_DH(viewPos, depthCheck) ; @@ -549,8 +558,8 @@ float SSRT_FlashLight_Shadows(vec3 viewPos, bool depthCheck, vec3 lightDir, floa float samplePos = texelFetch2D(depthtex2, ivec2(newPos.xy/texelSize).xy,0).x; - #ifdef DISTANT_HORIZONS - if(depthCheck) samplePos = texelFetch2D(dhDepthTex1, ivec2(newPos.xy/texelSize),0).x; + #if defined DISTANT_HORIZONS || defined VOXY + if(depthCheck) samplePos = texelFetch2D(dhVoxyDepthTex1, ivec2(newPos.xy/texelSize),0).x; #endif if(samplePos < newPos.z && samplePos > 0.0){// && (samplePos <= max(minZ,maxZ) && samplePos >= min(minZ,maxZ))){ @@ -598,7 +607,7 @@ void doEdgeAwareBlur( ); for(int i = 0; i < 4; i++) { - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float offsetDepth = sqrt(texelFetch2D(depth, UV + OFFSET[i] + UV_NOISE,0).z/65000.0); #else float offsetDepth = ld(convertHandDepth_2(texelFetch2D(depth, UV + OFFSET[i] + UV_NOISE, 0).r,hand)); @@ -632,7 +641,7 @@ vec4 BilateralUpscale_VLFOG(sampler2D tex, sampler2D depth, float referenceDepth vec4 colorSum = vec4(0.0); float edgeSum = 0.0; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float threshold = referenceDepth * mix(0.5, 0.05, min(max(0.1 - referenceDepth,0)/0.1,1)); #else float threshold = referenceDepth * 0.05; @@ -664,7 +673,7 @@ vec4 BilateralUpscale_VLFOG(sampler2D tex, sampler2D depth, float referenceDepth ); for(int i = 0; i < samples; i++) { - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float offsetDepth = sqrt(texelFetch2D(depth, UV_DEPTH + (OFFSET[i] + UV_NOISE) * SCALE,0).a/65000.0); #else float offsetDepth = ld(texelFetch2D(depth, UV_DEPTH + (OFFSET[i] + UV_NOISE) * SCALE, 0).r); @@ -929,19 +938,25 @@ void main() { float z = texelFetch2D(depthtex1, ivec2(gl_FragCoord.xy), 0).x; float swappedDepth = z; + + bool isDHrange = z >= 1.0; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float DH_mixedLinearZ = sqrt(texelFetch2D(colortex12,ivec2(gl_FragCoord.xy), 0).z/65000.0); - float DH_depth0 = texelFetch2D(dhDepthTex,ivec2(gl_FragCoord.xy), 0).x; - float DH_depth1 = texelFetch2D(dhDepthTex1,ivec2(gl_FragCoord.xy), 0).x; + float DH_depth0 = texelFetch2D(dhVoxyDepthTex,ivec2(gl_FragCoord.xy), 0).x; + float DH_depth1 = texelFetch2D(dhVoxyDepthTex1,ivec2(gl_FragCoord.xy), 0).x; + + #ifdef VOXY + DH_depth0 = min(DH_depth0, DH_depth1); + #endif float depthOpaque = z; float depthOpaqueL = linearizeDepthFast(depthOpaque, near, farPlane); - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float dhDepthOpaque = DH_depth1; - float dhDepthOpaqueL = linearizeDepthFast(dhDepthOpaque, dhNearPlane, dhFarPlane); + float dhDepthOpaqueL = linearizeDepthFast(dhDepthOpaque, dhVoxyNearPlane, dhVoxyFarPlane); if (depthOpaque >= 1.0 || (dhDepthOpaqueL < depthOpaqueL && dhDepthOpaque > 0.0)){ depthOpaque = dhDepthOpaque; @@ -987,7 +1002,7 @@ void main() { float LabSSS = clamp((-65.0 + SpecularTex.z * 255.0) / 190.0 ,0.0,1.0); // LabSSS = 1; - vec4 normalAndAO = texture2D(colortex15,texcoord); + vec4 normalAndAO = texelFetch2D(colortex15, ivec2(gl_FragCoord.xy), 0); vec3 FlatNormals = normalize(normalAndAO.rgb * 2.0 - 1.0); vec3 slopednormal = normal; @@ -1012,7 +1027,7 @@ void main() { // 0.9 = entity mask // 0.8 = reflective entities // 0.7 = reflective blocks - float translucentMasks = texture2D(colortex7, texcoord).a; + float translucentMasks = texelFetch2D(colortex7, ivec2(gl_FragCoord.xy), 0).a; bool isWater = translucentMasks > 0.99; // bool isReflectiveEntity = abs(translucentMasks - 0.8) < 0.01; @@ -1033,7 +1048,7 @@ void main() { convertHandDepth(z0); } - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY vec3 viewPos = toScreenSpace_DH(texcoord/RENDER_SCALE - TAA_Offset*texelSize*0.5, z, DH_depth1); #else vec3 viewPos = toScreenSpace(vec3(texcoord/RENDER_SCALE - TAA_Offset*texelSize*0.5, z)); @@ -1127,7 +1142,7 @@ void main() { feetPlayerPos += gbufferModelViewInverse[3].xyz; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY vec3 playerPos0 = mat3(gbufferModelViewInverse) * toScreenSpace_DH(texcoord/RENDER_SCALE-TAA_Offset*texelSize*0.5, z0, DH_depth0) + gbufferModelViewInverse[3].xyz; #else vec3 playerPos0 = mat3(gbufferModelViewInverse) * toScreenSpace(vec3(texcoord/RENDER_SCALE-TAA_Offset*texelSize*0.5,z0)) + gbufferModelViewInverse[3].xyz; @@ -1178,7 +1193,7 @@ void main() { /////////////////////////////////// FILTER STUFF ////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////// - #if defined DISTANT_HORIZONS && defined DH_AMBIENT_OCCLUSION + #if (defined DISTANT_HORIZONS || defined VOXY) && defined DH_AMBIENT_OCCLUSION doEdgeAwareBlur(colortex3, colortex14, colortex12, DH_mixedLinearZ, hand, SSAO_SSS, filteredShadow); #else doEdgeAwareBlur(colortex3, colortex14, depthtex0, ld(z0), hand, SSAO_SSS, filteredShadow); @@ -1280,7 +1295,7 @@ void main() { float sunSSS_density = LabSSS; float SSS_shadow = ShadowAlpha; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY shadowMapFalloff2 = smoothstep(0.0, 1.0, min(max(1.0 - length(feetPlayerPos) / min(shadowDistance, max(far-32.0,32.0)),0.0)*5.0,1.0)); #endif @@ -1698,7 +1713,7 @@ void main() { // water absorbtion will impact ALL light coming up from terrain underwater. gl_FragData[0].rgb *= Absorbtion; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float DH_mixedLinearZ = sqrt(texelFetch2D(colortex12,ivec2(gl_FragCoord.xy),0).a/65000.0); vec4 vlBehingTranslucents = BilateralUpscale_VLFOG(colortex13, colortex12, DH_mixedLinearZ); #else diff --git a/shaders/dimensions/composite1.vsh b/shaders/dimensions/composite1.vsh index 6f2d6e7..bab6df2 100644 --- a/shaders/dimensions/composite1.vsh +++ b/shaders/dimensions/composite1.vsh @@ -94,7 +94,7 @@ void main() { // exposure = texelFetch2D(colortex4,ivec2(10,37),0).r; - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #ifdef TAA TAA_Offset = offsets[framemod8]; diff --git a/shaders/dimensions/composite11.fsh b/shaders/dimensions/composite11.fsh index 30626ec..6174bbf 100644 --- a/shaders/dimensions/composite11.fsh +++ b/shaders/dimensions/composite11.fsh @@ -63,10 +63,16 @@ float ld(float depth) { // uniform sampler2D depthtex0; #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex; + #define dhVoxyDepthTex dhDepthTex #endif -uniform float dhNearPlane; -uniform float dhFarPlane; + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + #define dhVoxyDepthTex vxDepthTexOpaque +#endif +uniform float dhVoxyNearPlane; +uniform float dhVoxyFarPlane; float linearizeDepthFast(const in float depth, const in float near, const in float far) { return (near * far) / (depth * (near - far) + far); @@ -332,14 +338,14 @@ void main() { #endif float depth = texture(depthtex0, texcoord).r; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float _near = near; float _far = far*4.0; if (depth >= 1.0) { - depth = texture2D(dhDepthTex, texcoord).x; - _near = dhNearPlane; - _far = dhFarPlane; + depth = texture2D(dhVoxyDepthTex, texcoord).x; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } depth = linearizeDepthFast(depth, _near, _far); diff --git a/shaders/dimensions/composite2.fsh b/shaders/dimensions/composite2.fsh index 0bb1757..3ec2477 100644 --- a/shaders/dimensions/composite2.fsh +++ b/shaders/dimensions/composite2.fsh @@ -18,8 +18,17 @@ uniform sampler2D depthtex0; uniform sampler2D depthtex1; #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; -uniform sampler2D dhDepthTex1; + uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex1; + #define dhVoxyDepthTex dhDepthTex + #define dhVoxyDepthTex1 dhDepthTex1 +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + uniform sampler2D vxDepthTexTrans; + #define dhVoxyDepthTex vxDepthTexTrans + #define dhVoxyDepthTex1 vxDepthTexOpaque #endif uniform sampler2D colortex0; @@ -38,8 +47,8 @@ uniform float sunElevation; // uniform float far; uniform float near; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; uniform mat4 gbufferPreviousModelView; uniform vec3 previousCameraPosition; @@ -66,7 +75,7 @@ uniform ivec2 eyeBrightnessSmooth; uniform float eyeAltitude; uniform float caveDetection; -// uniform int dhRenderDistance; +// uniform int dhVoxyRenderDistance; #define DHVLFOG #define diagonal3(m) vec3((m)[0].x, (m)[1].y, m[2].z) #define projMAD(m, v) (diagonal3(m) * (v) + (m)[3].xyz) @@ -82,10 +91,10 @@ uniform float caveDetection; #include "/lib/DistantHorizons_projections.glsl" float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -418,8 +427,8 @@ vec4 raymarchTest( float minHeight = 250.0; float maxHeight = minHeight + 100.0; - #if defined DISTANT_HORIZONS - float maxdist = dhFarPlane - 16.0; + #if defined DISTANT_HORIZONS || defined VOXY + float maxdist = dhVoxyFarPlane - 16.0; #else float maxdist = far*4; #endif @@ -515,8 +524,12 @@ void main() { float z0 = depth < 0.56 ? convertHandDepth(depth) : depth; - #ifdef DISTANT_HORIZONS - float DH_z0 = texelFetch2D(dhDepthTex, texcoord,0).x; + #if defined DISTANT_HORIZONS || defined VOXY + float DH_z0 = texelFetch2D(dhVoxyDepthTex, texcoord,0).x; + #ifdef VOXY + float DH_z1= texelFetch2D(dhVoxyDepthTex1, texcoord,0).x; + DH_z0 = min(DH_z0, DH_z1); + #endif #else float DH_z0 = 0.0; #endif diff --git a/shaders/dimensions/composite2.vsh b/shaders/dimensions/composite2.vsh index d8c5b1b..c179b5c 100644 --- a/shaders/dimensions/composite2.vsh +++ b/shaders/dimensions/composite2.vsh @@ -63,7 +63,7 @@ void main() { averageSkyCol = texelFetch2D(colortex4,ivec2(1,37),0).rgb; averageSkyCol_Clouds = texelFetch2D(colortex4,ivec2(0,37),0).rgb; - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #endif #ifdef NETHER_SHADER diff --git a/shaders/dimensions/composite3.fsh b/shaders/dimensions/composite3.fsh index abbc35b..efb9044 100644 --- a/shaders/dimensions/composite3.fsh +++ b/shaders/dimensions/composite3.fsh @@ -15,8 +15,17 @@ uniform sampler2D depthtex0; uniform sampler2D depthtex1; #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; -uniform sampler2D dhDepthTex1; + uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex1; + #define dhVoxyDepthTex dhDepthTex + #define dhVoxyDepthTex1 dhDepthTex1 +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + uniform sampler2D vxDepthTexTrans; + #define dhVoxyDepthTex vxDepthTexTrans + #define dhVoxyDepthTex1 vxDepthTexOpaque #endif uniform sampler2D colortex0; @@ -48,8 +57,8 @@ uniform int frameCounter; uniform float far; uniform float near; uniform float farPlane; -uniform float dhNearPlane; -uniform float dhFarPlane; +uniform float dhVoxyNearPlane; +uniform float dhVoxyFarPlane; uniform mat4 gbufferModelViewInverse; uniform mat4 gbufferModelView; @@ -61,7 +70,7 @@ uniform vec3 cameraPosition; uniform vec3 previousCameraPosition; uniform int hideGUI; -uniform int dhRenderDistance; +uniform int dhVoxyRenderDistance; uniform int isEyeInWater; uniform ivec2 eyeBrightnessSmooth; uniform ivec2 eyeBrightness; @@ -130,7 +139,12 @@ float convertHandDepth(float depth) { } float linearize(float dist) { - return (2.0 * near) / (far + near - dist * (far - near)); + #ifdef VOXY + float _far = far * 3000.0; + #else + float _far = far; + #endif + return (2.0 * near) / (_far + near - dist * (_far - near)); } float luma(vec3 color) { @@ -192,11 +206,11 @@ vec3 normVec (vec3 vec){ } float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -314,8 +328,8 @@ vec3 toClipSpace3Prev(vec3 viewSpacePosition) { vec3 toClipSpace3Prev_DH( vec3 viewSpacePosition, bool depthCheck ) { - #ifdef DISTANT_HORIZONS - mat4 projectionMatrix = depthCheck ? dhPreviousProjection : gbufferPreviousProjection; + #if defined DISTANT_HORIZONS || defined VOXY + mat4 projectionMatrix = depthCheck ? dhVoxyProjectionPrev : gbufferPreviousProjection; return projMAD(projectionMatrix, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; #else return projMAD(gbufferPreviousProjection, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; @@ -326,7 +340,7 @@ vec4 bilateralUpsample(out float outerEdgeResults, float referenceDepth, sampler vec4 colorSum = vec4(0.0); float edgeSum = 0.0; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float threshold = 0.05; #else float threshold = 0.005; @@ -360,7 +374,7 @@ vec4 bilateralUpsample(out float outerEdgeResults, float referenceDepth, sampler for(int i = 0; i < samples; i++) { - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float offsetDepth = sqrt(texelFetch2D(depth, UV_DEPTH + (OFFSET[i] + UV_NOISE) * SCALE,0).z/65000.0); #else float offsetDepth = linearize(texelFetch2D(depth, UV_DEPTH + (OFFSET[i] + UV_NOISE) * SCALE, 0).r); @@ -511,8 +525,8 @@ float getBorderFogDensity(float linearDistance, vec3 playerPos, bool sky){ if(sky) return 0.0; - #ifdef DISTANT_HORIZONS - float borderFogDensity = smoothstep(1.0, 0.0, min(max(1.0 - linearDistance / dhRenderDistance,0.0)*3.0,1.0) ); + #if defined DISTANT_HORIZONS || defined VOXY + float borderFogDensity = smoothstep(1.0, 0.0, min(max(1.0 - linearDistance / dhVoxyRenderDistance,0.0)*3.0,1.0) ); #else float borderFogDensity = smoothstep(1.0, 0.0, min(max(1.0 - linearDistance / far,0.0)*3.0,1.0) ); #endif @@ -542,13 +556,17 @@ void main() { float swappedDepth = z; - #ifdef DISTANT_HORIZONS - float DH_depth0 = texelFetch2D(dhDepthTex, ivec2(gl_FragCoord.xy),0).x; + #if defined DISTANT_HORIZONS || defined VOXY + float DH_depth0 = texelFetch2D(dhVoxyDepthTex, ivec2(gl_FragCoord.xy),0).x; + #ifdef VOXY + float DH_depth1 = texelFetch2D(dhVoxyDepthTex1, ivec2(gl_FragCoord.xy),0).x; + DH_depth0 = min(DH_depth0, DH_depth1); + #endif float depthOpaque = z; float depthOpaqueL = linearizeDepthFast(depthOpaque, near, farPlane); float dhDepthOpaque = DH_depth0; - float dhDepthOpaqueL = linearizeDepthFast(dhDepthOpaque, dhNearPlane, dhFarPlane); + float dhDepthOpaqueL = linearizeDepthFast(dhDepthOpaque, dhVoxyNearPlane, dhVoxyFarPlane); if (depthOpaque >= 1.0 || (dhDepthOpaqueL < depthOpaqueL && dhDepthOpaque > 0.0)){ depthOpaque = dhDepthOpaque; depthOpaqueL = dhDepthOpaqueL; @@ -569,7 +587,7 @@ void main() { float linearDistance_cylinder = length(playerPos.xz); vec3 playerPos_normalized = normalize(playerPos); - #ifndef DISTANT_HORIZONS + #if !defined DISTANT_HORIZONS && !defined VOXY float z2 = texelFetch2D(depthtex1, ivec2(gl_FragCoord.xy),0).x; vec3 viewPos_alt = toScreenSpace(vec3(texcoord/RENDER_SCALE, z2)); vec3 playerPos_alt = mat3(gbufferModelViewInverse) * viewPos_alt + gbufferModelViewInverse[3].xyz; @@ -609,7 +627,7 @@ void main() { bool isEntity = abs(translucentMasks - 0.9) < 0.01 || isReflectiveEntity; ////// --------------- get volumetrics - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float DH_mixedLinearZ = sqrt(texelFetch2D(colortex12,ivec2(gl_FragCoord.xy),0).z/65000.0); vec4 temporallyFilteredVL = VLTemporalFiltering(viewPos, DH_mixedLinearZ, colortex12, hand); #else @@ -648,7 +666,7 @@ void main() { float z0 = depth < 0.56 ? convertHandDepth(depth) : depth; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float DH_z0 = DH_depth0; #else float DH_z0 = 1.0; @@ -780,7 +798,7 @@ void main() { borderFog.rgb = skyFromTex(playerPos_normalized, colortex4)/1200.0 * Sky_Brightness; #endif borderFog *= BorderFogIntensity; - #if !defined DISTANT_HORIZONS + #if !defined DISTANT_HORIZONS && !defined VOXY if(!isWater) color = mix(color, borderFog.rgb, getBorderFogDensity(linearDistance_cylinder_alt, normalize(playerPos_alt), z2 >= 1.0 || TranslucentShader.a <= 0)); #endif #else @@ -810,7 +828,7 @@ void main() { // bloomy rain effect #ifdef OVERWORLD_SHADER - float rainDrops = clamp(texture2D(colortex9,texcoord).a, 0.0,1.0); + float rainDrops = clamp(texture2D(colortex9,texcoord).a, 0.0,1.0); if(hand) rainDrops *= (1.0-TranslucentShader.a); if(rainDrops > 0.0) bloomyFogMult *= clamp(1.0 - pow(rainDrops*5.0,2),0.0,1.0); #endif @@ -827,8 +845,8 @@ void main() { float cosAngle = dot(-WsunVec, playerPos_normalized); if (isEyeInWater == 0 && rainbowAmount > 0.0 && cosAngle < 0.7431448 && cosAngle > 0.7071068) { - #ifdef DISTANT_HORIZONS - float clippingDistance = dhFarPlane; + #if defined DISTANT_HORIZONS || defined VOXY + float clippingDistance = dhVoxyFarPlane; #else float clippingDistance = 4.0 * far; #endif diff --git a/shaders/dimensions/composite3.vsh b/shaders/dimensions/composite3.vsh index 2e671d0..7039e61 100644 --- a/shaders/dimensions/composite3.vsh +++ b/shaders/dimensions/composite3.vsh @@ -21,8 +21,8 @@ flat varying vec3 WmoonVec; uniform float far; uniform float near; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; uniform mat4 gbufferModelViewInverse; uniform vec3 sunPosition; @@ -67,7 +67,7 @@ void main() { #endif #if defined CUMULONIMBUS_LIGHTNING && CUMULONIMBUS > 0 - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #endif #endif diff --git a/shaders/dimensions/composite5.fsh b/shaders/dimensions/composite5.fsh index 1cfb16e..39ccd2f 100644 --- a/shaders/dimensions/composite5.fsh +++ b/shaders/dimensions/composite5.fsh @@ -132,12 +132,19 @@ float convertHandDepth2( float depth) { #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex; + #define dhVoxyDepthTex dhDepthTex #endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + #define dhVoxyDepthTex vxDepthTexOpaque +#endif + uniform float near; uniform float far; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; #include "/lib/DistantHorizons_projections.glsl" @@ -146,10 +153,10 @@ float ld(float dist) { return (2.0 * near) / (far + near - dist * (far - near)); } float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -161,8 +168,8 @@ float invertlinearDepthFast(const in float depth, const in float near, const in vec3 toClipSpace3Prev_DH( vec3 viewSpacePosition, bool depthCheck ) { - #ifdef DISTANT_HORIZONS - mat4 projectionMatrix = depthCheck ? dhPreviousProjection : gbufferPreviousProjection; + #if defined DISTANT_HORIZONS || defined VOXY + mat4 projectionMatrix = depthCheck ? dhVoxyProjectionPrev : gbufferPreviousProjection; return projMAD(projectionMatrix, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; #else return projMAD(gbufferPreviousProjection, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; @@ -174,12 +181,12 @@ vec3 toScreenSpace_DH_special(vec3 POS, bool depthCheck ) { vec4 viewPos = vec4(0.0); vec3 feetPlayerPos = vec3(0.0); vec4 iProjDiag = vec4(0.0); - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY if (depthCheck) { - iProjDiag = vec4(dhProjectionInverse[0].x, dhProjectionInverse[1].y, dhProjectionInverse[2].zw); + iProjDiag = vec4(dhVoxyProjectionInverse[0].x, dhVoxyProjectionInverse[1].y, dhVoxyProjectionInverse[2].zw); feetPlayerPos = POS * 2.0 - 1.0; - viewPos = iProjDiag * feetPlayerPos.xyzz + dhProjectionInverse[3]; + viewPos = iProjDiag * feetPlayerPos.xyzz + dhVoxyProjectionInverse[3]; viewPos.xyz /= viewPos.w; } else { @@ -190,7 +197,7 @@ vec3 toScreenSpace_DH_special(vec3 POS, bool depthCheck ) { viewPos = iProjDiag * feetPlayerPos.xyzz + gbufferProjectionInverse[3]; viewPos.xyz /= viewPos.w; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY } #endif @@ -326,9 +333,9 @@ vec4 computeTAA(vec2 texcoord, bool hand){ // get previous frames position stuff for UV //use velocity from the nearest texel from camera in a 3x3 box in order to improve edge quality in motion - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY bool depthCheck = texture2D(depthtex0,adjTC).x >= 1.0; - vec3 closestToCamera = closestToCamera5taps_DH(adjTC, depthtex0, dhDepthTex, depthCheck); + vec3 closestToCamera = closestToCamera5taps_DH(adjTC, depthtex0, dhVoxyDepthTex, depthCheck); vec3 viewPos = toScreenSpace_DH_special(closestToCamera, depthCheck); #else vec3 closestToCamera = closestToCamera5taps(adjTC, depthtex0); @@ -338,7 +345,7 @@ vec4 computeTAA(vec2 texcoord, bool hand){ vec3 playerPos = mat3(gbufferModelViewInverse) * viewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition); vec3 previousPosition = mat3(gbufferPreviousModelView) * playerPos + gbufferPreviousModelView[3].xyz; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY previousPosition = toClipSpace3Prev_DH(previousPosition, depthCheck); #else previousPosition = toClipSpace3Prev(previousPosition); diff --git a/shaders/dimensions/deferred.fsh b/shaders/dimensions/deferred.fsh index 012b06e..f58e9a8 100644 --- a/shaders/dimensions/deferred.fsh +++ b/shaders/dimensions/deferred.fsh @@ -126,35 +126,35 @@ vec3 toScreenSpace(vec3 p) { } uniform float near; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; #include "/lib/DistantHorizons_projections.glsl" vec3 DH_toScreenSpace(vec3 p) { - vec4 iProjDiag = vec4(dhProjectionInverse[0].x, dhProjectionInverse[1].y, dhProjectionInverse[2].zw); + vec4 iProjDiag = vec4(dhVoxyProjectionInverse[0].x, dhVoxyProjectionInverse[1].y, dhVoxyProjectionInverse[2].zw); vec3 feetPlayerPos = p * 2. - 1.; - vec4 viewPos = iProjDiag * feetPlayerPos.xyzz + dhProjectionInverse[3]; + vec4 viewPos = iProjDiag * feetPlayerPos.xyzz + dhVoxyProjectionInverse[3]; return viewPos.xyz / viewPos.w; } vec3 DH_toClipSpace3(vec3 viewSpacePosition) { - return projMAD(dhProjection, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; + return projMAD(dhVoxyProjection, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; } // float DH_ld(float dist) { -// return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); +// return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); // } // float DH_invLinZ (float lindepth){ -// return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); +// return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); // } float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -241,7 +241,7 @@ float mixhistory = 0.06; if (gl_FragCoord.x > 1 && gl_FragCoord.x < 4 && gl_FragCoord.y > 1 && gl_FragCoord.y < 4){ mixhistory = 10.0 * frameTime; - gl_FragData[0].rgb = writeSceneControllerParameters(gl_FragCoord.xy, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + gl_FragData[0].rgb = writeSceneControllerParameters(gl_FragCoord.xy, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); } /////////////////////////////// diff --git a/shaders/dimensions/deferred.vsh b/shaders/dimensions/deferred.vsh index d563eb5..2a5935d 100644 --- a/shaders/dimensions/deferred.vsh +++ b/shaders/dimensions/deferred.vsh @@ -1,7 +1,7 @@ #include "/lib/settings.glsl" #include "/lib/res_params.glsl" -// uniform int dhRenderDistance; +// uniform int dhVoxyRenderDistance; uniform float frameTimeCounter; #include "/lib/Shadow_Params.glsl" @@ -206,11 +206,11 @@ void main() { // components are split for readability/user friendliness within this function applySceneControllerParameters( - parameters.smallCumulus.x, parameters.smallCumulus.y, - parameters.largeCumulus.x, parameters.largeCumulus.y, - parameters.altostratus.x, parameters.altostratus.y, - parameters.cirrus.x, parameters.cirrus.y, - parameters.fog.x, parameters.fog.y + SC_parameters.smallCumulus.x, SC_parameters.smallCumulus.y, + SC_parameters.largeCumulus.x, SC_parameters.largeCumulus.y, + SC_parameters.altostratus.x, SC_parameters.altostratus.y, + SC_parameters.cirrus.x, SC_parameters.cirrus.y, + SC_parameters.fog.x, SC_parameters.fog.y ); #ifdef Daily_Weather @@ -251,10 +251,10 @@ void main() { vec4 getWeatherProfile_coverage = weatherProfile_cloudCoverage[dayCounter]; vec4 getWeatherProfile_density = weatherProfile_cloudDensity[dayCounter]; - parameters.smallCumulus = vec2(getWeatherProfile_coverage.r, getWeatherProfile_density.r); - parameters.largeCumulus = vec2(getWeatherProfile_coverage.g, getWeatherProfile_density.g); - parameters.altostratus = vec2(getWeatherProfile_coverage.b, getWeatherProfile_density.b); - parameters.cirrus = vec2(getWeatherProfile_coverage.a, getWeatherProfile_density.a); + SC_parameters.smallCumulus = vec2(getWeatherProfile_coverage.r, getWeatherProfile_density.r); + SC_parameters.largeCumulus = vec2(getWeatherProfile_coverage.g, getWeatherProfile_density.g); + SC_parameters.altostratus = vec2(getWeatherProfile_coverage.b, getWeatherProfile_density.b); + SC_parameters.cirrus = vec2(getWeatherProfile_coverage.a, getWeatherProfile_density.a); //----------- fog density vec2 weatherProfile_fogDensity[10] = vec2[]( @@ -270,7 +270,7 @@ void main() { vec2(DAY9_ufog_density, DAY9_cfog_density) ); - parameters.fog = weatherProfile_fogDensity[dayCounter]; + SC_parameters.fog = weatherProfile_fogDensity[dayCounter]; #endif ////////////////////////////// diff --git a/shaders/dimensions/deferred1.fsh b/shaders/dimensions/deferred1.fsh index 5d76a76..d9fea5b 100644 --- a/shaders/dimensions/deferred1.fsh +++ b/shaders/dimensions/deferred1.fsh @@ -9,22 +9,31 @@ uniform sampler2D depthtex0; uniform sampler2D depthtex1; #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; -uniform sampler2D dhDepthTex1; + uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex1; + #define dhVoxyDepthTex dhDepthTex + #define dhVoxyDepthTex1 dhDepthTex1 +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + uniform sampler2D vxDepthTexTrans; + #define dhVoxyDepthTex vxDepthTexOpaque + #define dhVoxyDepthTex1 vxDepthTexTrans #endif uniform float near; uniform float far; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; float linZ(float depth) { return (2.0 * near) / (far + near - depth * (far - near)); } float DH_ld(float dist) { - return (2.0 * dhNearPlane) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_invLinZ (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -57,8 +66,8 @@ void main() { if(hand) convertHandDepth(newTex); - #ifdef DISTANT_HORIZONS - float QuarterResDepth = texelFetch2D(dhDepthTex, ivec2(gl_FragCoord.xy*4), 0).x; + #if defined DISTANT_HORIZONS || defined VOXY + float QuarterResDepth = texelFetch2D(dhVoxyDepthTex, ivec2(gl_FragCoord.xy*4), 0).x; if(newTex == 1.0) { float depth = DH_ld(QuarterResDepth); gl_FragData[0] = vec4(oldTex, 650000.0); @@ -77,12 +86,12 @@ void main() { float _far = far*4.0; if (depth >= 1.0) { depth = QuarterResDepth; - _near = dhNearPlane; - _far = dhFarPlane; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } depth = linearizeDepthFast(depth, _near, _far); - depth = depth / dhFarPlane; + depth = depth / dhVoxyFarPlane; if(depth < 1.0) { gl_FragData[1].a = depth * depth * 65000.0; diff --git a/shaders/dimensions/deferred2.fsh b/shaders/dimensions/deferred2.fsh index fb94659..0b8109e 100644 --- a/shaders/dimensions/deferred2.fsh +++ b/shaders/dimensions/deferred2.fsh @@ -1,7 +1,15 @@ #include "/lib/settings.glsl" uniform sampler2D depthtex0; -uniform sampler2D dhDepthTex; +#ifdef DISTANT_HORIZONS + uniform sampler2D dhDepthTex; + #define dhVoxyDepthTex dhDepthTex +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + #define dhVoxyDepthTex vxDepthTexOpaque +#endif uniform sampler2D colortex1; uniform sampler2D colortex2; uniform vec2 texelSize; @@ -34,8 +42,8 @@ void main() { if( texelFetch2D(depthtex0, ivec2(gl_FragCoord.xy), 0).x < 1.0 - #ifdef DISTANT_HORIZONS - || texelFetch2D(dhDepthTex, ivec2(gl_FragCoord.xy), 0).x < 1.0 + #if defined DISTANT_HORIZONS || defined VOXY + || texelFetch2D(dhVoxyDepthTex, ivec2(gl_FragCoord.xy), 0).x < 1.0 #endif ) { diff --git a/shaders/dimensions/fogBehindTranslucent_pass.fsh b/shaders/dimensions/fogBehindTranslucent_pass.fsh index 61dc566..6c439be 100644 --- a/shaders/dimensions/fogBehindTranslucent_pass.fsh +++ b/shaders/dimensions/fogBehindTranslucent_pass.fsh @@ -16,13 +16,23 @@ flat varying vec3 averageSkyCol; flat varying vec3 averageSkyCol_Clouds; // flat varying float exposure; -// uniform int dhRenderDistance; +// uniform int dhVoxyRenderDistance; uniform sampler2D noisetex; uniform sampler2D depthtex0; uniform sampler2D depthtex1; + #ifdef DISTANT_HORIZONS -uniform sampler2D dhDepthTex; -uniform sampler2D dhDepthTex1; + uniform sampler2D dhDepthTex; + uniform sampler2D dhDepthTex1; + #define dhVoxyDepthTex dhDepthTex + #define dhVoxyDepthTex1 dhDepthTex1 +#endif + +#ifdef VOXY + uniform sampler2D vxDepthTexOpaque; + uniform sampler2D vxDepthTexTrans; + #define dhVoxyDepthTex vxDepthTexTrans + #define dhVoxyDepthTex1 vxDepthTexOpaque #endif uniform sampler2D colortex2; @@ -40,8 +50,8 @@ uniform vec3 sunVec; uniform float sunElevation; // uniform float far; -uniform float dhFarPlane; -uniform float dhNearPlane; +uniform float dhVoxyFarPlane; +uniform float dhVoxyNearPlane; uniform float near; uniform int frameCounter; @@ -75,10 +85,10 @@ uniform vec3 previousCameraPosition; #include "/lib/DistantHorizons_projections.glsl" float DH_ld(float dist) { - return (2.0 * near) / (dhFarPlane + dhNearPlane - dist * (dhFarPlane - dhNearPlane)); + return (2.0 * near) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); } float DH_inv_ld (float lindepth){ - return -((2.0*dhNearPlane/lindepth)-dhFarPlane-dhNearPlane)/(dhFarPlane-dhNearPlane); + return -((2.0*dhVoxyNearPlane/lindepth)-dhVoxyFarPlane-dhVoxyNearPlane)/(dhVoxyFarPlane-dhVoxyNearPlane); } float linearizeDepthFast(const in float depth, const in float near, const in float far) { @@ -278,8 +288,10 @@ void main() { vec2 tc = floor(gl_FragCoord.xy)/VL_RENDER_RESOLUTION*texelSize+0.5*texelSize; - float alpha = texture2D(colortex7,tc).a ; - float blendedAlpha = texture2D(colortex2, tc).a; + ivec2 texcoord = ivec2(tc/texelSize); + + float alpha = texelFetch2D(colortex7, texcoord, 0).a ; + float blendedAlpha = texelFetch2D(colortex2, texcoord, 0).a; bool iswater = alpha > 0.99; @@ -292,21 +304,22 @@ void main() { float noise_1 = R2_dither(); float noise_2 = blueNoise(); - ivec2 texcoord = ivec2(tc/texelSize); - float z0 = texelFetch2D(depthtex0, texcoord, 0 ).x; - #ifdef DISTANT_HORIZONS - float DH_z0 = texelFetch2D(dhDepthTex, texcoord, 0 ).x;//texture2D(dhDepthTex,tc).x; + #if defined DISTANT_HORIZONS || defined VOXY + float DH_z0 = texelFetch2D(dhVoxyDepthTex, texcoord, 0 ).x;//texture2D(dhDepthTex,tc).x; #else float DH_z0 = 0.0; #endif float z = texelFetch2D(depthtex1, texcoord, 0 ).x; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY // float DH_z = texture2D(dhDepthTex1,tc).x; - float DH_z = texelFetch2D(dhDepthTex1, texcoord, 0 ).x;//texture2D(dhDepthTex,tc).x; + float DH_z = texelFetch2D(dhVoxyDepthTex1, texcoord, 0 ).x;//texture2D(dhDepthTex,tc).x; + #ifdef VOXY + DH_z0 = min(DH_z0, DH_z); + #endif #else float DH_z = 0.0; #endif diff --git a/shaders/dimensions/fogBehindTranslucent_pass.vsh b/shaders/dimensions/fogBehindTranslucent_pass.vsh index 3523de6..ebdce1e 100644 --- a/shaders/dimensions/fogBehindTranslucent_pass.vsh +++ b/shaders/dimensions/fogBehindTranslucent_pass.vsh @@ -62,7 +62,7 @@ void main() { averageSkyCol = texelFetch2D(colortex4,ivec2(1,37),0).rgb; averageSkyCol_Clouds = texelFetch2D(colortex4,ivec2(0,37),0).rgb; - readSceneControllerParameters(colortex4, parameters.smallCumulus, parameters.largeCumulus, parameters.altostratus, parameters.cirrus, parameters.fog); + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); #endif #ifdef NETHER_SHADER diff --git a/shaders/dimensions/voxy.json b/shaders/dimensions/voxy.json new file mode 100644 index 0000000..c936732 --- /dev/null +++ b/shaders/dimensions/voxy.json @@ -0,0 +1,108 @@ +{ + "unusedString": " + #include "/lib/settings.glsl" + #include "/lib/res_params.glsl" + ", + "version": 1, + "opaqueDrawBuffers": [1, 8, 15], + "excludeLodsFromVanillaDepth": true, + "translucentDrawBuffers": [2, 7, 14], + #ifdef TAA + "taaOffset": "{ + const vec2[4] offsets = vec2[4]( + vec2(-0.125, -0.875), + vec2( 0.875, -0.125), + vec2( 0.125, 0.875), + vec2(-0.875, 0.125) + ); + return offsets[framemod4_DH]*texelSize; + }", + #endif + #ifdef TAA_UPSCALING + "renderScale": [SCALE_FACTOR, SCALE_FACTOR], + #endif + "blending": {-1:"ONE ONE_MINUS_SRC_ALPHA ONE ONE_MINUS_SRC_ALPHA"}, + "ssbos": {0:"{ + mat4 customShadowMatrixSSBO; + + vec3 customMoonVecSSBO; + + vec3 customMoonVec2SSBO; + + mat4 customShadowPerspectiveSSBO; + + vec3 customSunVecSSBO; + + bool onWaterSurface; + + bool inBoat; + + bool inBoatCurrentFrame; + + bool inBoatLastFrame; + + bool inShip; + + bool inShipCurrentFrame; + + bool inShipLastFrame; + + float lastFrameTimeCount; + + vec3 previousCameraPositionWave; + + vec3 previousCameraPositionWave2; + + bool noSimOngoing; + + bool noSimOngoingCheck; + + }"}, + "uniforms": [ + "framemod4_DH", + "vxModelView", + "vxModelViewPrev", + "vxModelViewInv", + "frameCounter", + "framemod8", + "dhVoxyFarPlane", + "dhVoxyNearPlane", + "vxProj", + "vxProjInv", + "vxProjPrev", + "gbufferModelView", + "gbufferModelViewInverse", + "gbufferProjection", + "gbufferProjectionInverse", + "gbufferPreviousModelView", + "gbufferPreviousProjection", + "shadowModelView", + "shadowModelViewInverse", + "shadowProjection", + "shadowProjectionInverse", + "cameraPosition", + "previousCameraPosition", + "near", + "far", + "frameTimeCounter", + "texelSize", + "sunPosition", + "sunElevation", + "lightningBoltPosition", + "rainStrength", + "unsigned_WsunVecSmooth", + "unsigned_WmoonVecSmooth", + "isEyeInWater" + ], + "samplers": [ + "vxDepthTexOpaque", + "noisetex", + "colortex4", + "colortex5", + "colortex7", + "colortex8", + "colortex12", + "depthtex0", + "depthtex1" + ] +} \ No newline at end of file diff --git a/shaders/dimensions/voxy_solid.glsl b/shaders/dimensions/voxy_solid.glsl new file mode 100644 index 0000000..e69d088 --- /dev/null +++ b/shaders/dimensions/voxy_solid.glsl @@ -0,0 +1,84 @@ +#define VOXY_PROGRAM + +#include "/lib/settings.glsl" +#include "/lib/blocks.glsl" + +layout (location = 0) out vec4 gbuffer_data_0; +layout (location = 1) out vec4 gbuffer_data_1; +layout (location = 2) out vec4 gbuffer_data_2; + +vec4 encode (vec3 n, vec2 lightmaps){ + n.xy = n.xy / dot(abs(n), vec3(1.0)); + n.xy = n.z <= 0.0 ? (1.0 - abs(n.yx)) * sign(n.xy) : n.xy; + vec2 encn = clamp(n.xy * 0.5 + 0.5,-1.0,1.0); + + return vec4(encn,vec2(lightmaps.x,lightmaps.y)); +} + +//encoding by jodie +float encodeVec2(vec2 a){ + const vec2 constant1 = vec2( 1., 256.) / 65535.; + vec2 temp = floor( a * 255. ); + return temp.x*constant1.x+temp.y*constant1.y; +} +float encodeVec2(float x,float y){ + return encodeVec2(vec2(x,y)); +} + + +void voxy_emitFragment(VoxyFragmentParameters parameters) { + + vec4 Albedo; + + Albedo.rgb = parameters.sampledColour.rgb * parameters.tinting.rgb; + + int blockID = int(parameters.customId); + + float SSSAMOUNT = 0.0; + + /////// ----- SSS ON BLOCKS ----- /////// + // strong + if ( + blockID == BLOCK_SSS_STRONG || blockID == BLOCK_SAPLING || blockID == BLOCK_AIR_WAVING + ) { + SSSAMOUNT = 1.0; + } + + // medium + if ( + blockID == BLOCK_GROUND_WAVING || blockID == BLOCK_GROUND_WAVING_VERTICAL + || blockID == BLOCK_GRASS_SHORT || blockID == BLOCK_GRASS_TALL_UPPER || blockID == BLOCK_GRASS_TALL_LOWER + ) { + SSSAMOUNT = 0.5; + } + if ( + blockID == BLOCK_SSS_WEAK || blockID == BLOCK_SSS_WEAK_2 || + blockID == BLOCK_GLOW_LICHEN || blockID == BLOCK_SNOW_LAYERS || blockID == BLOCK_CARPET || + blockID == BLOCK_AMETHYST_BUD_MEDIUM || blockID == BLOCK_AMETHYST_BUD_LARGE || blockID == BLOCK_AMETHYST_CLUSTER || + blockID == BLOCK_BAMBOO || blockID == BLOCK_SAPLING || blockID == BLOCK_VINE + ) { + SSSAMOUNT = 0.5; + } + + // low + #ifdef MISC_BLOCK_SSS + if( + blockID == BLOCK_SSS_WEIRD || blockID == BLOCK_GRASS + ){ + SSSAMOUNT = 0.5; + } + #endif + + Albedo.a = 1.0; + + vec3 normal = vec3(uint((parameters.face>>1)==2), uint((parameters.face>>1)==0), uint((parameters.face>>1)==1)) * (float(int(parameters.face)&1)*2-1); + + vec4 data1 = clamp( encode(normal, parameters.lightMap), 0.0, 1.0); + + gbuffer_data_0 = vec4(encodeVec2(Albedo.x,data1.x), encodeVec2(Albedo.y,data1.y), encodeVec2(Albedo.z,data1.z), encodeVec2(data1.w,Albedo.w)); + + gbuffer_data_1 = vec4(0.0, 0.0, SSSAMOUNT, 0.0); + + gbuffer_data_2 = vec4(normal * 0.5 + 0.5, 0.0); + +} \ No newline at end of file diff --git a/shaders/dimensions/voxy_translucent.glsl b/shaders/dimensions/voxy_translucent.glsl new file mode 100644 index 0000000..9c77431 --- /dev/null +++ b/shaders/dimensions/voxy_translucent.glsl @@ -0,0 +1,346 @@ +#define VOXY_PROGRAM + +layout (location = 0) out vec4 gbuffer_data_0; +layout (location = 1) out vec4 gbuffer_data_1; +layout (location = 2) out vec4 gbuffer_data_2; + +#include "/lib/settings.glsl" +#include "/lib/blocks.glsl" +#include "/lib/waterBump.glsl" +#include "/lib/res_params.glsl" +#include "/lib/TAA_jitter.glsl" + +#ifdef OVERWORLD_SHADER + #include "/lib/scene_controller.glsl" + #define CLOUDSHADOWSONLY + #include "/lib/volumetricClouds.glsl" +#endif + +#ifdef OVERWORLD_SHADER + #define WATER_SUN_SPECULAR +#endif + +#ifndef OVERWORLD_SHADER +#undef WATER_SUN_SPECULAR +#endif + +float GGX(vec3 n, vec3 v, vec3 l, float r, float f0) { + r = max(pow(r,2.5), 0.0001); + + vec3 h = l + v; + float hn = inversesqrt(dot(h, h)); + + float dotLH = clamp(dot(h,l)*hn,0.,1.); + float dotNH = clamp(dot(h,n)*hn,0.,1.) ; + float dotNL = clamp(dot(n,l),0.,1.); + float dotNHsq = dotNH*dotNH; + + float denom = dotNHsq * r - dotNHsq + 1.; + float D = r / (3.141592653589793 * denom * denom); + + float F = f0 + (1. - f0) * exp2((-5.55473*dotLH-6.98316)*dotLH); + float k2 = .25 * r; + + return dotNL * D * F / (dotLH*dotLH*(1.0-k2)+k2); +} + +#define diagonal3(m) vec3((m)[0].x, (m)[1].y, m[2].z) +#define projMAD(m, v) (diagonal3(m) * (v) + (m)[3].xyz) + +vec4 encode (vec3 n, vec2 lightmaps){ + n.xy = n.xy / dot(abs(n), vec3(1.0)); + n.xy = n.z <= 0.0 ? (1.0 - abs(n.yx)) * sign(n.xy) : n.xy; + vec2 encn = clamp(n.xy * 0.5 + 0.5,-1.0,1.0); + + return vec4(encn,vec2(lightmaps.x,lightmaps.y)); +} + + +//encoding by jodie +float encodeVec2(vec2 a){ + const vec2 constant1 = vec2( 1., 256.) / 65535.; + vec2 temp = floor( a * 255. ); + return temp.x*constant1.x+temp.y*constant1.y; +} +float encodeVec2(float x,float y){ + return encodeVec2(vec2(x,y)); +} + +vec3 toLinear(vec3 sRGB){ + return sRGB * (sRGB * (sRGB * 0.305306011 + 0.682171111) + 0.012522878); +} + +float luma(vec3 color) { + return dot(color,vec3(0.21, 0.72, 0.07)); +} + +vec3 worldToView(vec3 worldPos) { + vec4 pos = vec4(worldPos, 0.0); + pos = vxModelView * pos; + return pos.xyz; +} + +vec3 DH_toScreenSpace(vec3 p) { + vec4 iProjDiag = vec4(vxProjInv[0].x, vxProjInv[1].y, vxProjInv[2].zw); + vec3 feetPlayerPos = p * 2. - 1.; + vec4 viewPos = iProjDiag * feetPlayerPos.xyzz + vxProjInv[3]; + return viewPos.xyz / viewPos.w; +} + +float interleaved_gradientNoise_temporal(){ + #ifdef TAA + return fract(52.9829189*fract(0.06711056*gl_FragCoord.x + 0.00583715*gl_FragCoord.y ) + 1.0/1.6180339887 * frameCounter); + #else + return fract(52.9829189*fract(0.06711056*gl_FragCoord.x + 0.00583715*gl_FragCoord.y ) + 1.0/1.6180339887); + #endif +} + +#include "/lib/sky_gradient.glsl" +#include "/lib/Shadow_Params.glsl" + +#define FORWARD_SSR_QUALITY 30 // [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 200 300 400 500] + +#define FORWARD_SPECULAR +#define FORWARD_BACKGROUND_REFLECTION +// #define FORWARD_ROUGH_REFLECTION + +#ifdef FORWARD_ROUGH_REFLECTION +#endif + +vec3 DH_toClipSpace3(vec3 viewSpacePosition) { + return projMAD(vxProj, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; +} + +float invLdFast(float linearDepth) { + return (dhVoxyFarPlane * (dhVoxyNearPlane - linearDepth)) / ((dhVoxyNearPlane - dhVoxyFarPlane) * linearDepth); +} + +float DH_ld(float dist) { + return (2.0 * dhVoxyNearPlane) / (dhVoxyFarPlane + dhVoxyNearPlane - dist * (dhVoxyFarPlane - dhVoxyNearPlane)); +} + +vec3 rayTrace(vec3 dir, vec3 position, float dither, float fresnel) { + + float biasAmount = 0.000015; + + float quality = float(FORWARD_SSR_QUALITY); + vec3 clipPosition = DH_toClipSpace3(position); + + float rayLength = ((position.z + dir.z * dhVoxyFarPlane*sqrt(3.)) > -dhVoxyNearPlane) ? + (-dhVoxyNearPlane - position.z) / dir.z : dhVoxyFarPlane*sqrt(3.); + + vec3 direction = DH_toClipSpace3(position + dir * rayLength) - clipPosition; //convert to clip space + + #if FORWARD_SSR_QUALITY == 1 + vec3 reflectedTC = vec3((direction.xy + clipPosition.xy) * RENDER_SCALE, 0.999999); + return reflectedTC; + #endif + + //get at which length the ray intersects with the edge of the screen + vec3 maxLengths = (step(0.0, direction) - clipPosition) / direction; + float mult = min(min(maxLengths.x, maxLengths.y), maxLengths.z); + vec3 stepv = direction * mult / quality; + + clipPosition.xy *= RENDER_SCALE; + stepv.xy *= RENDER_SCALE; + + vec3 spos = clipPosition + stepv * dither; + spos.xy += offsets[framemod8] * texelSize * 0.5 / RENDER_SCALE; + + float minZ = spos.z - 0.00025 / DH_ld(spos.z); + float maxZ = spos.z; + + for (int i = 0; i <= int(quality); i++) { + #if DEFERRED_SSR_QUALITY != 1 + if(spos.x < 0 || spos.x > 1 || spos.y < 0 || spos.y > 1) return vec3(1.1); + #endif + + float sp = texelFetch(vxDepthTexOpaque, ivec2(spos.xy / texelSize), 0).r; + + if (sp < max(minZ, maxZ) && sp > min(minZ, maxZ)) { + return vec3(spos.xy / RENDER_SCALE, sp); + } + + minZ = maxZ - biasAmount / DH_ld(spos.z); + maxZ += stepv.z; + + spos += stepv; + } + return vec3(1.1); +} + +void voxy_emitFragment(VoxyFragmentParameters parameters) { +if (gl_FragCoord.x * texelSize.x < 1.0 && gl_FragCoord.y * texelSize.y < 1.0 ) { + vec3 viewPos = DH_toScreenSpace(gl_FragCoord.xyz*vec3(texelSize/RENDER_SCALE,1.0)); + + vec3 feetPlayerPos = mat3(vxModelViewInv) * viewPos + vxModelViewInv[3].xyz;; + + gbuffer_data_0 = parameters.sampledColour * parameters.tinting; + + vec3 Albedo = toLinear(gbuffer_data_0.rgb); + float UnchangedAlpha = gbuffer_data_0.a; + + int blockID = int(parameters.customId); + bool isWater = blockID == 8; + + #ifndef WhiteWorld + #ifdef Vanilla_like_water + if (isWater) Albedo *= sqrt(luma(Albedo)); + #else + if (isWater){ + Albedo = vec3(0.0); + gbuffer_data_0.a = 1.0/255.0; + } + #endif + #endif + + vec3 normal = vec3(uint((parameters.face>>1)==2), uint((parameters.face>>1)==0), uint((parameters.face>>1)==1)) * (float(int(parameters.face)&1)*2-1); + + vec4 lightCol; + vec3 WsunVec; + vec3 WsunVec2; + + lightCol.rgb = texelFetch(colortex4,ivec2(6,37),0).rgb; + + vec3 averageSkyCol_Clouds = texelFetch(colortex4,ivec2(0,37),0).rgb; + + #ifdef OVERWORLD_SHADER + readSceneControllerParameters(colortex4, SC_parameters.smallCumulus, SC_parameters.largeCumulus, SC_parameters.altostratus, SC_parameters.cirrus, SC_parameters.fog); + #endif + + #ifdef CUSTOM_MOON_ROTATION + vec3 WmoonVec = customMoonVecSSBO; + + #ifdef SMOOTH_SUN_ROTATION + WsunVec = WsunVecSmooth; + #else + WsunVec = normalize(mat3(vxModelViewInv) * sunPosition); + #endif + WsunVec2 = normalize(sunPosition); + + WsunVec = mix(WmoonVec, WsunVec, float(sunElevation > 1e-5)); + WsunVec2 = mix(normalize(mat3(vxModelView)*WmoonVec), WsunVec2, float(sunElevation > 1e-5)); + #else + lightCol.a = float(sunElevation > 1e-5)*2.0 - 1.0; + #ifdef SMOOTH_SUN_ROTATION + WsunVec = lightCol.a * WsunVecSmooth; + #else + WsunVec = lightCol.a * normalize(mat3(vxModelViewInv) * sunPosition); + #endif + WsunVec2 = lightCol.a * normalize(sunPosition); + #endif + + // diffuse + vec3 Indirect_lighting = vec3(0.0); + // vec3 MinimumLightColor = vec3(1.0); + vec3 Direct_lighting = vec3(0.0); + + #ifdef OVERWORLD_SHADER + vec3 DirectLightColor = lightCol.rgb/2400.0; + + float NdotL = clamp(dot(normal, WsunVec),0.0,1.0); + NdotL = clamp((-15 + NdotL*255.0) / 240.0 ,0.0,1.0); + + float Shadows = 1.0; + + Shadows *= GetCloudShadow(feetPlayerPos + cameraPosition, WsunVec); + + Direct_lighting = DirectLightColor * NdotL * Shadows; + + vec3 AmbientLightColor = averageSkyCol_Clouds/900.0 ; + + vec3 ambientcoefs = normal.xyz / dot(abs(normal.xyz), vec3(1.0)); + float SkylightDir = ambientcoefs.y*1.5; + + float skylight = max(pow(normal.y*0.5+0.5,0.1) + SkylightDir, 0.2); + AmbientLightColor *= skylight; + #endif + + #ifndef OVERWORLD_SHADER + vec3 AmbientLightColor = vec3(0.5); + #endif + + Indirect_lighting = AmbientLightColor; + float indoors = min(max(parameters.lightMap.y-0.5,0.0)/0.4,1.0); + vec3 FinalColor = (Indirect_lighting + Direct_lighting*indoors) * Albedo; + + #ifndef Vanilla_like_water + if(isWater && abs(normal.y) > 0.1){ + vec3 waterPos = (feetPlayerPos+cameraPosition).xzy; + + vec3 bump = normalize(getWaveNormal(waterPos, feetPlayerPos)); + + float bumpmult = WATER_WAVE_STRENGTH; + + bump = bump * vec3(bumpmult, bumpmult, bumpmult) + vec3(0.0f, 0.0f, 1.0f - bumpmult); + + normal.xz = bump.xy; + } + #endif + + vec3 normals = worldToView(normal); + #if defined FORWARD_SPECULAR + vec3 Reflections_Final = vec3(0.0); + vec4 Reflections = vec4(0.0); + vec3 BackgroundReflection = FinalColor; + vec3 SunReflection = vec3(0.0); + float SSR_HIT_SKY_MASK = indoors; + + float roughness = 0.0; + float f0 = 0.02; + // f0 = 0.9; + + vec3 reflectedVector = reflect(normalize(viewPos), normals); + float normalDotEye = dot(normals, normalize(viewPos)); + + float fresnel = pow(clamp(1.0 + normalDotEye, 0.0, 1.0),5.0); + + fresnel = mix(f0, 1.0, fresnel); + + #ifdef SNELLS_WINDOW + if(isEyeInWater == 1) fresnel = pow(clamp(1.5 + normalDotEye,0.0,1.0), 25.0); + #endif + #if FORWARD_SSR_QUALITY > 0 && defined VOXY_REFLECTIONS + vec3 rtPos = rayTrace(reflectedVector, viewPos, interleaved_gradientNoise_temporal(), fresnel); + if (rtPos.z < 0.99999){ + vec3 previousPosition = mat3(gbufferModelViewInverse) * DH_toScreenSpace(rtPos) + gbufferModelViewInverse[3].xyz + cameraPosition-previousCameraPosition; + previousPosition = mat3(gbufferPreviousModelView) * previousPosition + gbufferPreviousModelView[3].xyz; + previousPosition.xy = projMAD(vxProjPrev, previousPosition).xy / -previousPosition.z * 0.5 + 0.5; + if (previousPosition.x > 0.0 && previousPosition.y > 0.0 && previousPosition.x < 1.0 && previousPosition.y < 1.0) { + Reflections.a = 1.0; + Reflections.rgb = texture2D(colortex5, previousPosition.xy).rgb; + } + }else{ + if (rtPos.x > 0.0 && rtPos.y > 0.0 && rtPos.x < 1.0 && rtPos.y < 1.0) SSR_HIT_SKY_MASK = 1.0; + } + #endif + #if defined FORWARD_BACKGROUND_REFLECTION + BackgroundReflection = skyCloudsFromTex(mat3(gbufferModelViewInverse) * reflectedVector, colortex4).rgb / 1200.0; + #endif + #ifdef WATER_SUN_SPECULAR + SunReflection = (DirectLightColor * Shadows) * GGX(normalize(normals), -normalize(viewPos), normalize(WsunVec2), roughness, f0) * (1.0-Reflections.a); + #endif + + Reflections_Final = mix(FinalColor, mix(BackgroundReflection*SSR_HIT_SKY_MASK, Reflections.rgb, Reflections.a), fresnel); + Reflections_Final += SunReflection*indoors; + + gbuffer_data_0.a = gbuffer_data_0.a + (1.0-gbuffer_data_0.a) * fresnel; + + gbuffer_data_0.rgb = 0.1*clamp((Reflections_Final/gbuffer_data_0.a) * 0.1,0.0,65000.0); + + if (gbuffer_data_0.r > 65000.) gbuffer_data_0.rgba = vec4(0.0); + #else + gbuffer_data_0.rgb = FinalColor*0.1; + #endif + + float material = 0.7; + if(isWater) material = 1.0; + + //gbuffer_data_0.rgb = Albedo; + + gbuffer_data_1 = vec4(Albedo, material); + + gbuffer_data_2 = vec4(encodeVec2(parameters.lightMap), 1, 1, 1); + +} +} \ No newline at end of file diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 8e350fb..2683ac5 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -1,6 +1,6 @@ option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - A Bliss Edit prefix.SHADER_VERSION_LABEL = V - value.SHADER_VERSION_LABEL.482 = 4.3.0 + value.SHADER_VERSION_LABEL.482 = 5.0.0 # if you're here to translate, this is not a joke, these do what they say profile.POTATO=§4Potato @@ -96,7 +96,7 @@ screen.DEBUG_STUFF = §cDebug Settings§r screen.LEGACY_STUFF = Legacy Settings screen.Mod_support = Settings For Supported Mods -option.RESOURCEPACK_SKY = Resource Pack Sky §c(slightly bugged) +option.RESOURCEPACK_SKY = Resource Pack Sky - §cWARNING:§r read the description! value.RESOURCEPACK_SKY.0 = Do not use value.RESOURCEPACK_SKY.1 = Sky + Shader sun/moon value.RESOURCEPACK_SKY.2 = Full sky @@ -1127,7 +1127,7 @@ screen.Post_Processing.comment = Configure settings for all post processing effe option.LUMINANCE_CURVE.comment = Enable the tone curve. This is independent from color grading and is applied first. option.COLOR_GRADING_ENABLED.comment = Enable color grading. The RGB sliders will not affect the brightness. This is applied after the tone curve -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.RESOURCEPACK_SKY.comment =§cWARNING: This setting, IF USED, will cause broken rendering for: lead ropes, fishing lines, and possibly some modded entities!§r. 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.SKY_GROUND = Atmosphere Ground option.MATERIAL_AO.comment = Toggle the use of ambient occlusion based on what the resourcepack provides. §aPERFORMANCE COST:§r very low diff --git a/shaders/lang/zh_cn.lang b/shaders/lang/zh_cn.lang index b2b4def..b6976e7 100644 --- a/shaders/lang/zh_cn.lang +++ b/shaders/lang/zh_cn.lang @@ -1,31 +1,183 @@ -option.SHADER_VERSION_LABEL = Bliss In-Dev Commit Number +option.SHADER_VERSION_LABEL = §d§lECLIPSE§r - Bliss 编辑版 + prefix.SHADER_VERSION_LABEL = 版本 + value.SHADER_VERSION_LABEL.482 = 5.0.0 -# if you're here to translate, this is a joke, these don't do what they say -profile.QUALITY=质量 -profile.PERFORMANCE=性能 +# 如果你是来翻译的，这不是玩笑，这些选项的功能正如其名 +profile.POTATO=§4土豆 (极低配置) +profile.VERY_LOW=§c非常低 +profile.LOW=§a低 +profile.MEDIUM=§2中等 §6§l(推荐) +profile.ALTERNATE_MEDIUM=§2中等 §7(替代风格) +profile.HIGH=§b高 §6§l(推荐) +profile.ALTERNATE_HIGH=§b高 §7(替代风格) +profile.HIGH_GRASS=§b高 + 着色器草 +profile.ALTERNATE_HIGH_GRASS=§b高 + 着色器草 §7(替代风格) +profile.VERY_HIGH=§9非常高 +profile.ULTRA=§d极致 -screen.Misc_Settings = 杂项 -screen.Sun_and_Moon_Colors = 日月颜色 +option.OLD_LIGHTLEAK_FIX = 旧版漏光修复 +option.CAVE_DETECTION = 洞穴检测 + value.CAVE_DETECTION.0.0 = 开启 + value.CAVE_DETECTION.1.0 = Y < 62.0 + value.CAVE_DETECTION.2.0 = 关闭 option.sunPathRotation = 太阳角度 -option.sun_illuminance = 阳光照度 -option.moon_illuminance = 月光照度 -option.MOONPHASE_BASED_MOONLIGHT = 月相亮度水平 +suffix.sunPathRotation = ° +option.sun_illuminance = 太阳亮度 +option.moon_illuminance = 月亮亮度 +option.MOONPHASE_BASED_MOONLIGHT = 基于月相的月光亮度 +option.LIGHTLEAKFIX_MODE = "漏光修复"模式 + value.LIGHTLEAKFIX_MODE.0 = 无。 §c阳光会穿透墙壁§r + value.LIGHTLEAKFIX_MODE.1 = 间隙填充/缩放。 §c使阴影呈块状§r + value.LIGHTLEAKFIX_MODE.2 = 使用天空光照图级别。 §c在低光照图级别下无阳光§r -option.RESOURCEPACK_SKY = 资源包天空 +option.colortype = 着色模式 + value.colortype.1 = RGB 颜色 (上方) + option.sunColorR = 太阳颜色: 红 + option.sunColorG = 太阳颜色: 绿 + option.sunColorB = 太阳颜色: 蓝 + option.moonColorR = 月亮颜色: 红 + option.moonColorG = 月亮颜色: 绿 + option.moonColorB = 月亮颜色: 蓝 + + value.colortype.2 = 开尔文色温 (下方) + option.Sun_temp = 太阳色温 + suffix.Sun_temp = K + option.Moon_temp = 月亮色温 + suffix.Moon_temp = K +screen.MoonOptions = 月亮设置 + option.SMOOTH_MOON_ROTATION = 平滑月亮移动 +screen.SunOptions = 太阳设置 + option.SMOOTH_SUN_ROTATION = 平滑太阳移动 +screen.Smoothing_Settings = 平滑设置 +screen.SMOOTHING_DISCLAIMER = §c 如果使用修改白天的模组：请将这些值设置为与模组相同的值 +screen.SMOOTHING_DISCLAIMER2 = §c 否则请勿更改它们 +option.dayStartTick = 白天开始游戏刻 +option.nightStartTick = 夜晚开始游戏刻 +option.daySpeed = 日间速度 +option.nightSpeed = 夜间速度 +screen.CUSTOM_MOON_SETTINGS = 自定义月亮设置 + option.REALMOON = 真实月亮纹理 + option.MOON_NORMALS = 真实月亮法线 §c(需要自定义月亮旋转！)§r + option.CUSTOM_MOON_ROTATION = 自定义月亮旋转 + option.CAELUM_SUPPORT = Caelum (ArdaCraft) 支持 + option.CAELUM_SUPPORT.comment = §c需要自定义月亮旋转。§r 将太阳/月亮投射的光线更改为 Caelum 指定的正确位置。 + option.MOON_SIZE_SETTING = 月亮大小 + option.MOON_LATITUDE = 纬度 + suffix.MOON_LATITUDE = ° + option.MONTH_LENGTH = 月份长度 + value.MONTH_LENGTH.6 = 6 天 + value.MONTH_LENGTH.7 = 7 天 + value.MONTH_LENGTH.8 = 8 天 + value.MONTH_LENGTH.9 = 9 天 + value.MONTH_LENGTH.10 = 10 天 + value.MONTH_LENGTH.11 = 11 天 + value.MONTH_LENGTH.12 = 12 天 + value.MONTH_LENGTH.13 = 13 天 + value.MONTH_LENGTH.14 = 14 天 + value.MONTH_LENGTH.15 = 15 天 + value.MONTH_LENGTH.16 = 16 天 + option.EARTH_ROTATION_TILT = 地球自转倾角 + suffix.EARTH_ROTATION_TILT = ° + screen.CUSTOM_MOON_ROTATION_DISCLAIMER = §c更改以下值可能会阻止日食发生！§r + screen.CUSTOM_MOON_ROTATION_DISCLAIMER2 = §c更改太阳角度可能会阻止日食发生！§r + screen.CUSTOM_MOON_ROTATION_DISCLAIMER3 = §c在 -35° 和 -45° 时，每个游戏年保证发生一次日食！§r + option.MOON_TIME_OFFSET = 月亮时间偏移 (游戏刻) + option.CUSTOM_SHADOWS_QUALITY = 自定义阴影剔除 + value.CUSTOM_SHADOWS_QUALITY.0 = 关闭 + value.CUSTOM_SHADOWS_QUALITY.1 = 快速 + value.CUSTOM_SHADOWS_QUALITY.2 = 精美 + option.CUSTOM_SHADOWS_QUALITY.comment = 指定自定义光源位置（月亮、闪电、末地）的剔除。可能导致一些不应被剔除的阴影被剔除 +screen.EndLighting = 末地光照 + option.END_ISLAND_LIGHT = 主末地岛光源 + option.Max_Filter_Depth_END = 光源大小因子 + option.Min_Shadow_Filter_Radius_END = 最小阴影过滤半径 + +option.STARS_AMOUNT = 星星数量 +option.STARS_BRIGHTNESS = 星星亮度 +screen.Misc_Settings = 其他设置 + +screen.EXPERIMENTAL_STUFF = 实验性功能 +option.BLOOMY_PARTICLES = 粒子泛光 +option.BIOME_TINT_WATER = 群系色调水体 +option.HYPER_DETAILED_WAVES = 超细节水波 +option.LIT_PARTICLE_BRIGHTNESS = 提高粒子亮度 +option.WATER_CAUSTICS_BRIGHTNESS = 水体焦散线亮度 +option.WATER_CAUSTICS_POWER = 水体焦散线强度 +option.FORCE_TRANSLUCENT_GLASS = 强制半透明玻璃 +option.LARGE_WAVE_DISPLACEMENT = 大型波浪 +option.Vanilla_like_water = 原版水体样式 +option.INCLUDE_UNLISTED_ENTITIES = 识别未添加实体 + +screen.DEBUG_STUFF = §c调试设置§r +screen.LEGACY_STUFF = 旧版设置 +option.ORIGINAL_CHOCAPIC_SKY = Chocapic天空 +option.OLD_BLOOM = 旧版泛光 +option.OLD_CAVE_DETECTION = 旧版洞穴检测 +option.OLD_INDIRECT_SSS = 旧版间接屏幕光照 +option.CLOUD_PHASE = 云相 +option.OLD_STARS = 旧版星星 + +option.TRANSLUCENT_ENTITIES = 半透明实体 + +screen.selection_box_outline = 方块选取框 +option.SELECT_BOX = 选取框 +option.SELECT_BOX_COL_R = 红 +option.SELECT_BOX_COL_G = 绿 +option.SELECT_BOX_COL_B = 蓝 + +screen.Mod_support = 支持的模组设置 + +option.RESOURCEPACK_SKY = 资源包天空 §c(略有错误) value.RESOURCEPACK_SKY.0 = 别用这个 - value.RESOURCEPACK_SKY.1 = 天空 + 光影日月 + value.RESOURCEPACK_SKY.1 = 天空 + 着色器太阳/月亮 value.RESOURCEPACK_SKY.2 = 完整天空 + value.RESOURCEPACK_SKY.3 = 着色器天空 + 资源包太阳/月亮 -screen.Waving_Stuff = 摇晃相关 - option.WAVY_PLANTS = 植物摇晃 - option.WAVY_STRENGTH = 摇晃强度 - option.WAVY_SPEED = 摇晃速度 +screen.Foliage = 植被 + option.WAVY_PLANTS = 植物摆动 + option.WAVY_STRENGTH = 摆动强度 + option.WAVY_SPEED = 摆动速度 -screen.Direct_Light = 直接照明 + option.SHADER_GRASS = 着色器草 §c(Iris 1.7+) + option.GRASS_BASE_THICKNESS = 草叶基础厚度 + option.GRASS_THICKNESS_FALLOFF = 草厚度衰减 + option.GRASS_THICKNESS_FALLOFF.comment = 控制每片草叶变窄的速度。1.0 时，它将保持相同厚度直到叶尖 + option.BASE_GRASS_HEIGHT = 草基础高度 + option.BASE_GRASS_HEIGHT.comment = 普通草的高度 + option.SHORT_GRASS_HEIGHT = 矮草高度 + option.SHORT_GRASS_HEIGHT.comment = 被替换的原版矮草的高度 + option.REPLACE_SHORT_GRASS = 替换原版矮草 + option.REPLACE_SHORT_GRASS.comment = 控制如何处理原版矮草 + value.REPLACE_SHORT_GRASS.0 = 否 + value.REPLACE_SHORT_GRASS.1 = 是 + value.REPLACE_SHORT_GRASS.2 = 仅矮草 + option.GRASS_DETECT_FALLOFF = 草底部检测 + option.GRASS_DETECT_FALLOFF.comment = 这会缩短草边缘周围的草叶高度 + option.GRASS_DETECT_INV_FALLOFF = 草侧面检测 + option.GRASS_DETECT_INV_FALLOFF.comment = 如果旁边有方块或矮草，这会增加草叶高度 + option.GRASS_DENSITY = 草密度 + value.GRASS_DENSITY.0 = 低 + value.GRASS_DENSITY.1 = 中 + value.GRASS_DENSITY.2 = 高 + value.GRASS_DENSITY.3 = 非常高 + option.GRASS_QUALITY = 草质量 + option.GRASS_QUALITY.comment = 控制一片草叶可以拥有的最大三角形数量。低：3个三角形。中：5个三角形。高：7个三角形 + value.GRASS_QUALITY.0 = 低 + value.GRASS_QUALITY.1 = 中 + value.GRASS_QUALITY.2 = 高 + option.GRASS_RANGE = 草最远范围 + option.GRASS_WAVY_STRENGTH = 草摆动强度 + option.GRASS_RANDOMNESS = 草随机性强度 + option.GRASS_NOISE1_SCALE = 草随机性噪声1 比例 + option.GRASS_NOISE2_SCALE = 草随机性噪声2 比例 + + +screen.Direct_Light = 直接光照 screen.Shadows = 阴影 - option.TRANSLUCENT_COLORED_SHADOWS = 半透明彩色阴影 + option.TRANSLUCENT_COLORED_SHADOWS = 彩色阴影 option.SCREENSPACE_CONTACT_SHADOWS = 屏幕空间阴影 option.RENDER_ENTITY_SHADOWS = 实体阴影 + option.RENDER_PLAYER_SHADOWS = 玩家阴影 option.shadowMapResolution = 阴影分辨率 option.shadowDistance = 阴影距离 value.shadowDistance.32.0 = 2 区块 @@ -43,25 +195,22 @@ screen.Direct_Light = 直接照明 value.shadowDistance.224.0 = 14 区块 value.shadowDistance.240.0 = 15 区块 value.shadowDistance.256.0 = 16 区块 - value.shadowDistance.272.0 = 17 区块 - value.shadowDistance.288.0 = 18 区块 - value.shadowDistance.304.0 = 19 区块 - value.shadowDistance.320.0 = 20 区块 - value.shadowDistance.336.0 = 21 区块 - value.shadowDistance.352.0 = 22 区块 - value.shadowDistance.368.0 = 23 区块 - value.shadowDistance.384.0 = 24 区块 - value.shadowDistance.512.0 = 32 区块 - value.shadowDistance.768.0 = 48 区块 - value.shadowDistance.1024.0 = 64 区块 - value.shadowDistance.1536.0 = 96 区块 - value.shadowDistance.2048.0 = 128 区块 - value.shadowDistance.4096.0 = 256 区块 - value.shadowDistance.8192.0 = 512 区块 + value.shadowDistance.272.0 = 17 区块 §c不推荐§r + value.shadowDistance.288.0 = 18 区块 §c不推荐§r + value.shadowDistance.304.0 = 19 区块 §c不推荐§r + value.shadowDistance.320.0 = 20 区块 §c不推荐§r + value.shadowDistance.336.0 = 21 区块 §c不推荐§r + value.shadowDistance.352.0 = 22 区块 §c不推荐§r + value.shadowDistance.368.0 = 23 区块 §c不推荐§r + value.shadowDistance.384.0 = 24 区块 §c不推荐§r + value.shadowDistance.512.0 = 32 区块 §c不推荐§r + value.shadowDistance.768.0 = 48 区块 §c不推荐§r + value.shadowDistance.1024.0 = 64 区块 §c不推荐§r + value.shadowDistance.1536.0 = 96 区块 §c不推荐§r + value.shadowDistance.2048.0 = 128 区块 §c不推荐§r + value.shadowDistance.4096.0 = 256 区块 §c不推荐§r + value.shadowDistance.8192.0 = 512 区块 §c不推荐§r - option.OPTIMIZED_SHADOW_DISTANCE = 最大阴影边界 - value.OPTIMIZED_SHADOW_DISTANCE.-1.0 = 无优化 - value.OPTIMIZED_SHADOW_DISTANCE.1.0 = 优化 option.entityShadowDistanceMul = 实体阴影距离 value.entityShadowDistanceMul.0.01 = 阴影距离的 1% value.entityShadowDistanceMul.0.02 = 阴影距离的 2% @@ -80,77 +229,115 @@ screen.Direct_Light = 直接照明 value.entityShadowDistanceMul.0.75 = 阴影距离的 75% value.entityShadowDistanceMul.1.00 = 阴影距离的 100% - screen.Filtering = 阴影过滤设置 - option.SHADOW_FILTER_SAMPLE_COUNT = 阴影过滤采样数 - option.Min_Shadow_Filter_Radius = 最小阴影过滤半径 - option.Variable_Penumbra_Shadows = 可变半阴影 (VPS) - option.VPS_Search_Samples = VPS 检索采样数 - option.Max_Shadow_Filter_Radius = 最大阴影过滤半径 - option.Max_Filter_Depth = 最大过滤深度 + option.LIGHTNING_SHADOWS = 闪电阴影 + value.LIGHTNING_SHADOWS.0 = 关闭 + value.LIGHTNING_SHADOWS.1 = 仅在夜晚 + value.LIGHTNING_SHADOWS.2 = 开启 + + option.LIGHTNING_SHADOWS.comment = 使闪电投射阴影。在闪电活跃时替换月亮和/或太阳阴影。 §c需要自定义月亮旋转§r - screen.LPV = FloodFill - option.LPV_ENABLED = FloodFill - option.LPV_SIZE = LPV 规模 + screen.Sun_and_Moon_Colors = 太阳/月亮颜色 + option.Sun_temp = 太阳色温 + option.Moon_temp = 月亮色温 + + screen.Filtering = 阴影过滤设置 + option.BASIC_SHADOW_FILTER = 基础阴影过滤 + option.SHADOW_FILTER_SAMPLE_COUNT = 基础阴影过滤采样数 + option.Min_Shadow_Filter_Radius = 最小阴影过滤半径 + option.Variable_Penumbra_Shadows = 可变半影阴影 + option.VPS_Search_Samples = VPS 过滤采样数 + option.Max_Shadow_Filter_Radius = 最大阴影过滤半径 + option.Max_Filter_Depth = 太阳大小因子 + + screen.LPV = 泛光填充 (彩色灯光) - §c需要 IRIS§r + option.LPV_ENABLED = 启用 + option.LPV_SIZE = 大小 value.LPV_SIZE.6 = 小 [64] value.LPV_SIZE.7 = 中 [128] value.LPV_SIZE.8 = 大 [256] - option.LPV_NORMAL_OFFSET = 法线偏移 (Normal-Offset) + option.LPV_SATURATION = 光饱和度 + suffix.LPV_SATURATION=% + option.LPV_TINT_SATURATION = 色调饱和度 + suffix.LPV_TINT_SATURATION=% + option.LPV_NORMAL_STRENGTH = 法线强度 + suffix.LPV_NORMAL_STRENGTH = % + value.LPV_NORMAL_STRENGTH.0 = 关闭 option.LPV_ENTITY_LIGHTS = 实体光源 option.LPV_REDSTONE_LIGHTS = 红石光源 option.LPV_COLORED_CANDLES = 彩色蜡烛 - -screen.Subsurface_Scattering = 次表面散射 (SSS) - option.LabSSS_Curve = LabSSS 曲线 - option.MISC_BLOCK_SSS = 随机方块次表面散射 - option.MOB_SSS = 怪物次表面散射 - option.Ambient_SSS = 天空光次表面散射 - option.ambientsss_brightness = 天空光次表面散射亮度 - option.SSS_TYPE = 次表面散射模式 - value.SSS_TYPE.0 = 无 - value.SSS_TYPE.1 = 仅硬编码 - value.SSS_TYPE.2 = 硬编码 + LabSSS - value.SSS_TYPE.3 = 仅 LabSSS + option.LPV_NOSHADOW_HACK = Iris <= 1.7.0 修复 + option.LPV_VL_FOG_ILLUMINATION = 雾光传播 + value.LPV_VL_FOG_ILLUMINATION.0 = 关闭 + value.LPV_VL_FOG_ILLUMINATION.1 = 仅限室内 + value.LPV_VL_FOG_ILLUMINATION.2 = 开启 + option.LPV_VL_FOG_ILLUMINATION_BRIGHTNESS = 雾光传播亮度 + suffix.LPV_VL_FOG_ILLUMINATION_BRIGHTNESS=% + option.VANILLA_LIGHTMAP_MASK = 原版光照图遮罩 + option.LPV_HANDHELD_SHADOWS = 手持物品阴影 + option.LPV_HANDHELD_SHADOWS_STRENGTH = 手持物品阴影强度 + option.LPV_HANDHELD_SHADOWS_QUALITY = 手持物品阴影质量 + value.LPV_HANDHELD_SHADOWS_QUALITY.0 = 低 + value.LPV_HANDHELD_SHADOWS_QUALITY.1 = 高 screen.Ambient_light = 环境光 - option.AO_Strength = 环境光遮蔽强度 - option.GI_Strength = 全局照明强度 - option.HQ_SSGI = 远距 SSGI + option.AO_in_sunlight = AO 日光 + option.AO_Strength = AO 强度 + option.GI_Strength = GI 强度 + option.HQ_SSGI = 长距离行进 + option.UseQuarterResDepth = 采样 1/4 分辨率深度 option.Hand_Held_lights = 手持光源 option.SKY_CONTRIBUTION_IN_SSRT = 高质量环境光 - option.ambientOcclusionLevel = 原版 AO 强度 - option.ambient_brightness = 环境光照明亮度 - option.MIN_LIGHT_AMOUNT = 最小照明强度 - option.indirect_effect = 间接照明模式 - value.indirect_effect.0 = 原版 AO - value.indirect_effect.1 = SSAO - value.indirect_effect.2 = GTAO - value.indirect_effect.3 = RTAO - value.indirect_effect.4 = SSGI + option.ambientOcclusionLevel = 原版 AO 数量 + option.ambient_brightness = 环境光亮度 + option.MIN_LIGHT_AMOUNT = 外部最小光照亮度 + option.MIN_LIGHT_AMOUNT_INSIDE = 内部最小光照亮度 + option.indirect_effect = 间接光照 + value.indirect_effect.VANILLA_AO = 原版 AO + value.indirect_effect.SSAO_FILTERED = SSAO + value.indirect_effect.SSAO_HQ = HQ SSAO + value.indirect_effect.GTAO = GTAO + value.indirect_effect.SSRT_AO = SSRT (仅AO) - §c视觉噪点§r + value.indirect_effect.SSRT_AO_GI = SSRT (AO + GI) - §c视觉噪点§r + option.RAY_COUNT = 光线数量 + option.RAY_COUNT.comment = 有助于减少 SSRT 的视觉噪点。 §a性能消耗：§r 高 + option.HANDHELD_LIGHT_RANGE = 手持光源范围 - screen.Ambient_Colors = 环境光颜色 - option.AmbientLight_R = 环境光红色比重 - option.AmbientLight_G = 环境光绿色比重 - option.AmbientLight_B = 环境光蓝色比重 - option.ambient_colortype = 环境光颜色类型 - value.ambient_colortype.0 = 色温模式 - value.ambient_colortype.1 = RGB 滑块模式 - - screen.Torch_Colors = 照明颜色 - option.TORCH_AMOUNT = 照明强度 - option.TORCH_R = 照明红色比重 - option.TORCH_G = 照明绿色比重 - option.TORCH_B = 照明蓝色比重 - + screen.SSRT_SETTINGS = SSRT 设置 -screen.Fog = 雾气设置 + screen.Ambient_Colors = 环境光颜色 + option.AmbientLight_R = 红色量 + option.AmbientLight_G = 绿色量 + option.AmbientLight_B = 蓝色量 + option.SeparateAmbientColorRain = 雨/雷暴期间使用独立的环境光颜色 + option.AmbientLightRain_R = 红色 (雨天) + option.AmbientLightRain_G = 绿色 (雨天) + option.AmbientLightRain_B = 蓝色 (雨天) + option.AmbientLightThunder_R = 红色 (雷暴) + option.AmbientLightThunder_G = 绿色 (雷暴) + option.AmbientLightThunder_B = 蓝色 (雷暴) + option.AmbientLightEnd_R = 红色 (末地) + option.AmbientLightEnd_G = 绿色 (末地) + option.AmbientLightEnd_B = 蓝色 (末地) + option.ambient_colortype = 着色类型 + value.ambient_colortype.0 = 色温 + value.ambient_colortype.1 = RGB + + screen.Torch_Colors = 火把颜色 + option.TORCH_AMOUNT = 火把亮度 + option.TORCH_R = 红色量 + option.TORCH_G = 绿色量 + option.TORCH_B = 蓝色量 + + +screen.Fog = 雾设置 option.VL_RENDER_RESOLUTION = 体积雾渲染分辨率 - option.VL_SAMPLES = 体积雾采样值 + option.VL_SAMPLES = 雾采样数 + option.FOG_START_HEIGHT = 雾起始高度 option.BLOOMY_FOG = 雾气泛化值 option.Haze_amount = 大气雾霾密度 option.RainFog_amount = 雨雾密度 - option.RAYMARCH_CLOUDS_WITH_FOG = 将云作为雾气渲染 - option.BorderFog = 边界雾 + option.BorderFog = 区块边界雾 screen.TOD_fog = 全天雾气 option.TOD_Fog_mult = 雾气密度倍率 @@ -164,665 +351,935 @@ screen.Fog = 雾气设置 option.Night_Cloudy_Fog =夜 晚 - 云雾密度 option.PER_BIOME_ENVIRONMENT = 群系特色环境 + option.BorderFogIntensity = 边界雾密度 screen.Cave_Fog = 洞穴雾气 - option.Cave_fog = 洞穴雾气 + option.CAVE_FOG = 洞穴雾气 option.CaveFogFallOff = 洞穴雾气渐消曲线 option.CaveFogColor_R = 洞穴雾气红色比重 option.CaveFogColor_G = 洞穴雾气绿色比重 option.CaveFogColor_B = 洞穴雾气蓝色比重 - screen.END_AND_NETHER_FOG = 下界/末地雾气 - option.END_STORM_DENSTIY = 末地风暴强度 + screen.END_AND_NETHER_FOG = 下界/末地雾 + option.END_STORM_DENSTIY = 末地风暴密度 + option.END_LIGHTNING = 末地雾中闪电 + option.END_HAZE_DENSTIY = 末地雾霾密度 option.NETHER_PLUME_DENSITY = 下界烟柱密度 + option.NETHER_CEILING_SMOKE_DENSITY = 下界顶部烟雾密度 + option.NETHER_HAZE_DENSITY = 下界雾霾密度 + + screen.FOG_LIGHTING_COLORS = 雾颜色 + option.VORTEX_LIGHT_COL_R = 主末地岛雾/光 红 + option.VORTEX_LIGHT_COL_G = 主末地岛雾/光 绿 + option.VORTEX_LIGHT_COL_B = 主末地岛雾/光 蓝 + option.END_LIGHTNING_COL_R = 末地闪电 红 + option.END_LIGHTNING_COL_G = 末地闪电 绿 + option.END_LIGHTNING_COL_B = 末地闪电 蓝 -screen.Clouds = 云层设置 +screen.Clouds = 云设置 option.VOLUMETRIC_CLOUDS = 体积云 - option.CLOUDS_QUALITY = 云层分辨率倍数 - option.CLOUDS_SHADOWS = 云影 - option.Cloud_Speed = 云层速度 + option.HQ_CLOUD_UPSAMPLE = 更准确的上采样 + option.HQ_CLOUD_UPSAMPLE.comment = 减少边缘的光泄漏。 §a性能消耗：§r 低 + option.CLOUDS_QUALITY = 云分辨率缩放 + option.CLOUDS_SHADOWS = 云阴影 + option.CLOUD_SHADOW_STRENGTH = 云阴影强度 + option.CLOUD_MOVEMENT_TYPE = 云层移动类型 + value.CLOUD_MOVEMENT_TYPE.0 = 基于世界时间 + value.CLOUD_MOVEMENT_TYPE.1 = 基于真实时间 + option.Cloud_Speed = 云速度 option.Rain_coverage = 雨云覆盖率 - option.Daily_Weather = 周期循环的天气 + option.Thunder_coverage = 雷云覆盖率 + option.Daily_Weather = 每日天气 + value.CLOUD_PHASE.0 = Henyey-Greenstein + value.CLOUD_PHASE.1 = Cornette-Shanks + value.CLOUD_PHASE.2 = Henyey-Greenstein-Draine - option.CloudLayer0 = 小积云 - option.CloudLayer0_coverage = 覆盖率 - option.CloudLayer0_density = 密度 - option.CloudLayer0_height = 高度 + screen.CumulusClouds = 积云 + option.CloudLayer0 = 小积云 + option.CloudLayer0_coverage = 覆盖度 + option.CloudLayer0_density = 密度 + option.CloudLayer0_height = 高度 + option.CloudLayer0_tallness = 垂直厚度 + option.CloudLayer0_scale = 比例 + option.CloudLayer0_detail = 细节 + option.CloudLayer0_distance = 距离 - option.CloudLayer1 = 大积云 - option.CloudLayer1_coverage = 覆盖率 - option.CloudLayer1_density = 密度 - option.CloudLayer1_height = 高度 + option.CloudLayer1 = 大积云 + option.CloudLayer1_coverage = 覆盖度 + option.CloudLayer1_density = 密度 + option.CloudLayer1_height = 高度 + option.CloudLayer1_tallness = 垂直厚度 + option.CloudLayer1_scale = 比例 + option.CloudLayer1_detail = 细节 + option.CloudLayer1_distance = 距离 - option.CloudLayer2 = 高层云 - option.CloudLayer2_coverage = 覆盖率 - option.CloudLayer2_density = 密度 - option.CloudLayer2_height = 高度 + option.CUMULONIMBUS = 积雨云 + value.CUMULONIMBUS.0 = 关闭 + value.CUMULONIMBUS.1 = 雷暴期间/之后 + value.CUMULONIMBUS.2 = 始终开启 + option.CUMULONIMBUS_FADE_TIME = 淡出时间 + value.CUMULONIMBUS_FADE_TIME.0.0 = 无 + value.CUMULONIMBUS_FADE_TIME.0.25 = 15 秒 + value.CUMULONIMBUS_FADE_TIME.0.5 = 30 秒 + value.CUMULONIMBUS_FADE_TIME.0.75 = 45 秒 + value.CUMULONIMBUS_FADE_TIME.1.0 = 60 秒 + value.CUMULONIMBUS_FADE_TIME.1.25 = 75 秒 + value.CUMULONIMBUS_FADE_TIME.1.5 = 90 秒 + value.CUMULONIMBUS_FADE_TIME.1.75 = 105 秒 + value.CUMULONIMBUS_FADE_TIME.2.0 = 2 分钟 + value.CUMULONIMBUS_FADE_TIME.3.0 = 3 分钟 + value.CUMULONIMBUS_FADE_TIME.4.0 = 4 分钟 + value.CUMULONIMBUS_FADE_TIME.5.0 = 5 分钟 + value.CUMULONIMBUS_FADE_TIME.6.0 = 6 分钟 + value.CUMULONIMBUS_FADE_TIME.7.0 = 7 分钟 + value.CUMULONIMBUS_FADE_TIME.8.0 = 8 分钟 + value.CUMULONIMBUS_FADE_TIME.9.0 = 9 分钟 + value.CUMULONIMBUS_FADE_TIME.10.0 = 10 分钟 -screen.DAILY_WEATHER = 周期循环的天气设置 - screen.DAY0_WEATHER = 第 0 天的天气 - option.DAY0_l0_coverage = 小积云覆盖率 + option.CUMULONIMBUS_LIGHTNING = 积雨云闪电 + option.CUMULONIMBUS_LIGHTNING_BRIGHTNESS = 闪电亮度 + suffix.CUMULONIMBUS_LIGHTNING_BRIGHTNESS = % + option.CUMULONIMBUS_LIGHTNING_DELAY = 闪电延迟 + suffix.CUMULONIMBUS_LIGHTNING_DELAY = 秒 + + screen.CUSTOM_LIGHTNING = 自定义闪电 + option.CUSTOM_LIGHTNING_POS = 自定义位置 + //option.CUSTOM_LIGHTNING_POS_X = X + //option.CUSTOM_LIGHTNING_POS_Y = Y + //option.CUSTOM_LIGHTNING_POS_Z = Z + option.CUSTOM_LIGHTNING_R = R + option.CUSTOM_LIGHTNING_G = G + option.CUSTOM_LIGHTNING_B = B + option.CUSTOM_LIGHTNING_SCALE = 比例 + option.CUSTOM_LIGHTNING_TEX = 纹理 + value.CUSTOM_LIGHTNING_TEX.0 = 随机 + + screen.READ_DESCRIPTION = 阅读说明 + screen.READ_DESCRIPTION.comment = 请在着色器配置中设置自定义位置值！ + + screen.HighAltitudeClouds = 高海拔云 + option.CloudLayer2 = 高积云 + option.CloudLayer2_coverage = 覆盖度 + option.CloudLayer2_density = 密度 + option.CloudLayer2_height = 高度 + option.CloudLayer2_scale = 比例 + option.CloudLayer2_distance = 距离 + + option.CloudLayer3 = 卷云 + option.CloudLayer3_coverage = 覆盖度 + option.CloudLayer3_density = 密度 + option.CloudLayer3_height = 高度 + option.CloudLayer3_scale = 比例 + option.CloudLayer3_distance = 距离 + +screen.DAILY_WEATHER = 每日天气设置 +option.CHOOSE_RANDOM_WEATHER_PROFILE = 随机天气配置 + screen.DAY0_WEATHER = 第 0 天天气配置 + option.DAY0_l0_coverage = 小积云覆盖度 option.DAY0_l0_density = 小积云密度 - option.DAY0_l1_coverage = 大积云覆盖率 + option.DAY0_l1_coverage = 大积云覆盖度 option.DAY0_l1_density = 大积云密度 - option.DAY0_l2_coverage = 高层云覆盖率 - option.DAY0_l2_density = 高层云密度 - option.DAY0_ufog_density = 均匀雾气密度 + option.DAY0_l2_coverage = 高积云覆盖度 + option.DAY0_l2_density = 高积云密度 + option.DAY0_l3_coverage = 卷云覆盖度 + option.DAY0_l3_density = 卷云密度 + option.DAY0_ufog_density = 均匀雾密度 option.DAY0_cfog_density = 云雾密度 - screen.DAY1_WEATHER = 第 1 天的天气 - option.DAY1_l0_coverage = 小积云覆盖率 + screen.DAY1_WEATHER = 第 1 天天气配置 + option.DAY1_l0_coverage = 小积云覆盖度 option.DAY1_l0_density = 小积云密度 - option.DAY1_l1_coverage = 大积云覆盖率 + option.DAY1_l1_coverage = 大积云覆盖度 option.DAY1_l1_density = 大积云密度 - option.DAY1_l2_coverage = 高层云覆盖率 - option.DAY1_l2_density = 高层云密度 - option.DAY1_ufog_density = 均匀雾气密度 + option.DAY1_l2_coverage = 高积云覆盖度 + option.DAY1_l2_density = 高积云密度 + option.DAY1_l3_coverage = 卷云覆盖度 + option.DAY1_l3_density = 卷云密度 + option.DAY1_ufog_density = 均匀雾密度 option.DAY1_cfog_density = 云雾密度 - screen.DAY2_WEATHER = 第 2 天的天气 - option.DAY2_l0_coverage = 小积云覆盖率 + screen.DAY2_WEATHER = 第 2 天天气配置 + option.DAY2_l0_coverage = 小积云覆盖度 option.DAY2_l0_density = 小积云密度 - option.DAY2_l1_coverage = 大积云覆盖率 + option.DAY2_l1_coverage = 大积云覆盖度 option.DAY2_l1_density = 大积云密度 - option.DAY2_l2_coverage = 高层云覆盖率 - option.DAY2_l2_density = 高层云密度 - option.DAY2_ufog_density = 均匀雾气密度 + option.DAY2_l2_coverage = 高积云覆盖度 + option.DAY2_l2_density = 高积云密度 + option.DAY2_l3_coverage = 卷云覆盖度 + option.DAY2_l3_density = 卷云密度 + option.DAY2_ufog_density = 均匀雾密度 option.DAY2_cfog_density = 云雾密度 - screen.DAY3_WEATHER = 第 3 天的天气 - option.DAY3_l0_coverage = 小积云覆盖率 + screen.DAY3_WEATHER = 第 3 天天气配置 + option.DAY3_l0_coverage = 小积云覆盖度 option.DAY3_l0_density = 小积云密度 - option.DAY3_l1_coverage = 大积云覆盖率 + option.DAY3_l1_coverage = 大积云覆盖度 option.DAY3_l1_density = 大积云密度 - option.DAY3_l2_coverage = 高层云覆盖率 - option.DAY3_l2_density = 高层云密度 - option.DAY3_ufog_density = 均匀雾气密度 + option.DAY3_l2_coverage = 高积云覆盖度 + option.DAY3_l2_density = 高积云密度 + option.DAY3_l3_coverage = 卷云覆盖度 + option.DAY3_l3_density = 卷云密度 + option.DAY3_ufog_density = 均匀雾密度 option.DAY3_cfog_density = 云雾密度 - screen.DAY4_WEATHER = 第 4 天的天气 - option.DAY4_l0_coverage = 小积云覆盖率 + screen.DAY4_WEATHER = 第 4 天天气配置 + option.DAY4_l0_coverage = 小积云覆盖度 option.DAY4_l0_density = 小积云密度 - option.DAY4_l1_coverage = 大积云覆盖率 + option.DAY4_l1_coverage = 大积云覆盖度 option.DAY4_l1_density = 大积云密度 - option.DAY4_l2_coverage = 高层云覆盖率 - option.DAY4_l2_density = 高层云密度 - option.DAY4_ufog_density = 均匀雾气密度 + option.DAY4_l2_coverage = 高积云覆盖度 + option.DAY4_l2_density = 高积云密度 + option.DAY4_l3_coverage = 卷云覆盖度 + option.DAY4_l3_density = 卷云密度 + option.DAY4_ufog_density = 均匀雾密度 option.DAY4_cfog_density = 云雾密度 - screen.DAY5_WEATHER = 第 5 天的天气 - option.DAY5_l0_coverage = 小积云覆盖率 + screen.DAY5_WEATHER = 第 5 天天气配置 + option.DAY5_l0_coverage = 小积云覆盖度 option.DAY5_l0_density = 小积云密度 - option.DAY5_l1_coverage = 大积云覆盖率 + option.DAY5_l1_coverage = 大积云覆盖度 option.DAY5_l1_density = 大积云密度 - option.DAY5_l2_coverage = 高层云覆盖率 - option.DAY5_l2_density = 高层云密度 - option.DAY5_ufog_density = 均匀雾气密度 + option.DAY5_l2_coverage = 高积云覆盖度 + option.DAY5_l2_density = 高积云密度 + option.DAY5_l3_coverage = 卷云覆盖度 + option.DAY5_l3_density = 卷云密度 + option.DAY5_ufog_density = 均匀雾密度 option.DAY5_cfog_density = 云雾密度 - screen.DAY6_WEATHER = 第 6 天的天气 - option.DAY6_l0_coverage = 小积云覆盖率 + screen.DAY6_WEATHER = 第 6 天天气配置 + option.DAY6_l0_coverage = 小积云覆盖度 option.DAY6_l0_density = 小积云密度 - option.DAY6_l1_coverage = 大积云覆盖率 + option.DAY6_l1_coverage = 大积云覆盖度 option.DAY6_l1_density = 大积云密度 - option.DAY6_l2_coverage = 高层云覆盖率 - option.DAY6_l2_density = 高层云密度 - option.DAY6_ufog_density = 均匀雾气密度 + option.DAY6_l2_coverage = 高积云覆盖度 + option.DAY6_l2_density = 高积云密度 + option.DAY6_l3_coverage = 卷云覆盖度 + option.DAY6_l3_density = 卷云密度 + option.DAY6_ufog_density = 均匀雾密度 option.DAY6_cfog_density = 云雾密度 - screen.DAY7_WEATHER = 第 7 天的天气 - option.DAY7_l0_coverage = 小积云覆盖率 + screen.DAY7_WEATHER = 第 7 天天气配置 + option.DAY7_l0_coverage = 小积云覆盖度 option.DAY7_l0_density = 小积云密度 - option.DAY7_l1_coverage = 大积云覆盖率 + option.DAY7_l1_coverage = 大积云覆盖度 option.DAY7_l1_density = 大积云密度 - option.DAY7_l2_coverage = 高层云覆盖率 - option.DAY7_l2_density = 高层云密度 - option.DAY7_ufog_density = 均匀雾气密度 + option.DAY7_l2_coverage = 高积云覆盖度 + option.DAY7_l2_density = 高积云密度 + option.DAY7_l3_coverage = 卷云覆盖度 + option.DAY7_l3_density = 卷云密度 + option.DAY7_ufog_density = 均匀雾密度 option.DAY7_cfog_density = 云雾密度 - screen.DAY8_WEATHER = 第 8 天的天气 - option.DAY8_l0_coverage = 小积云覆盖率 + screen.DAY8_WEATHER = 第 8 天天气配置 + option.DAY8_l0_coverage = 小积云覆盖度 option.DAY8_l0_density = 小积云密度 - option.DAY8_l1_coverage = 大积云覆盖率 + option.DAY8_l1_coverage = 大积云覆盖度 option.DAY8_l1_density = 大积云密度 - option.DAY8_l2_coverage = 高层云覆盖率 - option.DAY8_l2_density = 高层云密度 - option.DAY8_ufog_density = 均匀雾气密度 + option.DAY8_l2_coverage = 高积云覆盖度 + option.DAY8_l2_density = 高积云密度 + option.DAY8_l3_coverage = 卷云覆盖度 + option.DAY8_l3_density = 卷云密度 + option.DAY8_ufog_density = 均匀雾密度 option.DAY8_cfog_density = 云雾密度 - screen.DAY9_WEATHER = 第 9 天的天气 - option.DAY9_l0_coverage = 小积云覆盖率 + screen.DAY9_WEATHER = 第 9 天天气配置 + option.DAY9_l0_coverage = 小积云覆盖度 option.DAY9_l0_density = 小积云密度 - option.DAY9_l1_coverage = 大积云覆盖率 + option.DAY9_l1_coverage = 大积云覆盖度 option.DAY9_l1_density = 大积云密度 - option.DAY9_l2_coverage = 高层云覆盖率 - option.DAY9_l2_density = 高层云密度 - option.DAY9_ufog_density = 均匀雾气密度 + option.DAY9_l2_coverage = 高积云覆盖度 + option.DAY9_l2_density = 高积云密度 + option.DAY9_l3_coverage = 卷云覆盖度 + option.DAY9_l3_density = 卷云密度 + option.DAY9_ufog_density = 均匀雾密度 option.DAY9_cfog_density = 云雾密度 -screen.Climate = 气候 - option.Seasons = 四季颜色 - option.Season_Length = 季节长度 (以 MC 日为单位) - option.Start_Season = 起始季节 +screen.Climate = 气候设置 +screen.Seasons = 季节 + option.Seasons = 季节颜色 + option.Season_Length = 季节长度 (天数) + option.Start_Season = 起始季节 value.Start_Season.0 = 夏季 (默认) value.Start_Season.1 = 秋季 value.Start_Season.2 = 冬季 value.Start_Season.3 = 春季 - option.Snowy_Winter = 雪冬 + option.Snowy_Winter = 冬季下雪 screen.Summer_colors = 夏季颜色 - option.Summer_R = 植被 - 红 - option.Summer_G = 植被 - 绿 - option.Summer_B = 植被 - 蓝 - option.Summer_Leaf_R = 树叶 - 红 - option.Summer_Leaf_G = 树叶 - 绿 - option.Summer_Leaf_B = 树叶 - 蓝 + option.Summer_R = 红色量 + option.Summer_G = 绿色量 + option.Summer_B = 蓝色量 + option.Summer_Leaf_R = 红色量 (用于树叶) + option.Summer_Leaf_G = 绿色量 (用于树叶) + option.Summer_Leaf_B = 蓝色量 (用于树叶) screen.Fall_colors = 秋季颜色 - option.Fall_R = 植被 - 红 - option.Fall_G = 植被 - 绿 - option.Fall_B = 植被 - 蓝 - option.Fall_Leaf_R = 树叶 - 红 - option.Fall_Leaf_G = 树叶 - 绿 - option.Fall_Leaf_B = 树叶 - 蓝 + option.Fall_R = 红色量 + option.Fall_G = 绿色量 + option.Fall_B = 蓝色量 + option.Fall_Leaf_R = 红色量 (用于树叶) + option.Fall_Leaf_G = 绿色量 (用于树叶) + option.Fall_Leaf_B = 蓝色量 (用于树叶) screen.Winter_colors = 冬季颜色 - option.Winter_R = 植被 - 红 - option.Winter_G = 植被 - 绿 - option.Winter_B = 植被 - 蓝 - option.Winter_Leaf_R = 树叶 - 红 - option.Winter_Leaf_G = 树叶 - 绿 - option.Winter_Leaf_B = 树叶 - 蓝 + option.Winter_R = 红色量 + option.Winter_G = 绿色量 + option.Winter_B = 蓝色量 + option.Winter_Leaf_R = 红色量 (用于树叶) + option.Winter_Leaf_G = 绿色量 (用于树叶) + option.Winter_Leaf_B = 蓝色量 (用于树叶) screen.Spring_colors = 春季颜色 - option.Spring_R = 植被 - 红 - option.Spring_G = 植被 - 绿 - option.Spring_B = 植被 - 蓝 - option.Spring_Leaf_R = 树叶 - 红 - option.Spring_Leaf_G = 树叶 - 绿 - option.Spring_Leaf_B = 树叶 - 蓝 + option.Spring_R = 红色量 + option.Spring_G = 绿色量 + option.Spring_B = 蓝色量 + option.Spring_Leaf_R = 红色量 (用于树叶) + option.Spring_Leaf_G = 绿色量 (用于树叶) + option.Spring_Leaf_B = 蓝色量 (用于树叶) screen.SWAMP = 沼泽 option.SWAMP_ENV = 沼泽环境 - option.SWAMP_UNIFORM_DENSITY = 均匀雾气密度 + option.SWAMP_UNIFORM_DENSITY = 均匀雾密度 option.SWAMP_CLOUDY_DENSITY = 云雾密度 - option.SWAMP_R = 红色比重 - option.SWAMP_G = 绿色比重 - option.SWAMP_B = 蓝色比重 + option.SWAMP_R = 红色量 + option.SWAMP_G = 绿色量 + option.SWAMP_B = 蓝色量 screen.JUNGLE = 丛林 option.JUNGLE_ENV = 丛林环境 - option.JUNGLE_UNIFORM_DENSITY = 均匀雾气密度 + option.JUNGLE_UNIFORM_DENSITY = 均匀雾密度 option.JUNGLE_CLOUDY_DENSITY = 云雾密度 - option.JUNGLE_R = 红色比重 - option.JUNGLE_G = 绿色比重 - option.JUNGLE_B = 蓝色比重 + option.JUNGLE_R = 红色量 + option.JUNGLE_G = 绿色量 + option.JUNGLE_B = 蓝色量 screen.DARKFOREST = 黑森林 option.DARKFOREST_ENV = 黑森林环境 - option.DARKFOREST_UNIFORM_DENSITY = 均匀雾气密度 - option.DARKFOREST_CLOUDY_DENSITY = 均匀雾气密度 - option.DARKFOREST_R = 红色比重 - option.DARKFOREST_G = 绿色比重 - option.DARKFOREST_B = 蓝色比重 + option.DARKFOREST_UNIFORM_DENSITY = 均匀雾密度 + option.DARKFOREST_CLOUDY_DENSITY = 云雾密度 + option.DARKFOREST_R = 红色量 + option.DARKFOREST_G = 绿色量 + option.DARKFOREST_B = 蓝色量 + + option.SNOW_STORMS = 雪暴 + option.SAND_STORMS = 沙尘暴 screen.World = 世界 - screen.Water = 水体设置 - option.WATER_REFLECTIONS = 水面高光反射 - option.SCREENSPACE_REFLECTIONS = 屏幕空间反射 (SSR) - option.SSR_STEPS = SSR 采样值 - option.WATER_SUN_SPECULAR = 日月反射 - option.WATER_BACKGROUND_SPECULAR = 天空/雾气反射 - option.FAKE_REFRACTION_EFFECT = 折射 (水体/玻璃) - option.Dirt_Amount = 水体浑浊程度 - option.Water_Top_Layer = 海平面 Y 轴坐标 - option.WATER_WAVE_STRENGTH = 水波强度 - option.SNELLS_WINDOW = 斯涅尔窗 (Snell's Window) - + screen.Sky_coefficients = 天空系数 + option.Sky_Brightness = 亮度 + option.sky_coefficientRayleighR = 瑞利数红色比重 + option.sky_coefficientRayleighG = 瑞利数绿色比重 + option.sky_coefficientRayleighB = 瑞利数蓝色比重 + option.sky_coefficientMieR = Mie红色比重 + option.sky_coefficientMieG = Mie绿色比重 + option.sky_coefficientMieB = Mie蓝色比重 + + + screen.Water = 水设置 + option.FAKE_REFRACTION_EFFECT = 水/玻璃折射 + option.FAKE_DISPERSION_EFFECT = 水色散 + option.REFRACTION_SMUDGE = 折射模糊 + option.Dirt_Amount = 污垢量 + option.Water_Top_Layer = 海洋 Y 坐标 + option.WATER_WAVE_STRENGTH = 波浪强度 + option.WATER_WAVE_SPEED = 波浪速度 + option.WATER_INTERACTION = 玩家与水互动 + option.WATER_INTERACTION.comment = 指定玩家应如何与水互动。 §a简单§r：摄像机进入/离开水时产生小波浪效果。 §a波浪模拟§r：玩家移动（包括在船上时）会在水上产生波浪。 + value.WATER_INTERACTION.0 = 关闭 + value.WATER_INTERACTION.1 = 简单 + value.WATER_INTERACTION.2 = 波浪模拟 + option.WATER_SIM_SCALE = 波浪模拟分辨率 + option.WATER_SIM_SCALE.comment = 波浪模拟的整体分辨率。 §a性能消耗：§r 中到高 + value.WATER_SIM_SCALE.0 = 50% + value.WATER_SIM_SCALE.1 = 100% + value.WATER_SIM_SCALE.2 = 200% + option.WATER_SIM_DISTANCE = 波浪模拟距离 + option.WATER_SIM_DISTANCE.comment = 从玩家开始模拟波浪的距离。 §a性能消耗：§r 低到高 + value.WATER_SIM_DISTANCE.1 = 50% + value.WATER_SIM_DISTANCE.2 = 100% + value.WATER_SIM_DISTANCE.3 = 150% + value.WATER_SIM_DISTANCE.4 = 200% + option.WATER_SIM_FRAMERATE = 波浪模拟帧率 + option.WATER_SIM_FRAMERATE.comment = 模拟计算所用的帧率。30 FPS 时精度会降低。 §c如果您的游戏内帧率无法跟上，模拟将会变慢。 §c请将其设置为您的游戏总能达到的帧率。 §a性能消耗：§r 低到中 + value.WATER_SIM_FRAMERATE.30 = 30 FPS + value.WATER_SIM_FRAMERATE.60 = 60 FPS + option.PIXELATED_WAVES = 像素化波浪模拟 + option.PIXELATED_WAVES.comment = 波浪是否应该平滑 §a性能消耗：§r 无 + screen.WATER_SIM_DISCLAIMER = §c 如果使用波浪模拟，请阅读这些设置的描述 + option.WATER_SIM_STRENGTH = 波浪模拟强度 + + option.WAVE_DETAIL = 波浪细节 + option.SNELLS_WINDOW = 斯涅尔窗 + option.MINIMUM_WATER_ABSORBANCE = 最小水吸收率 + value.MINIMUM_WATER_ABSORBANCE.-1 = 自动 + + option.FAKE_REFRACTION_AMOUNT = 折射量 + value.FAKE_REFRACTION_AMOUNT.0 = 关闭 + value.FAKE_REFRACTION_AMOUNT.1 = 0.25x + value.FAKE_REFRACTION_AMOUNT.2 = 0.50x + value.FAKE_REFRACTION_AMOUNT.3 = 0.75x + value.FAKE_REFRACTION_AMOUNT.4 = 1.00x + value.FAKE_REFRACTION_AMOUNT.5 = 1.25x + value.FAKE_REFRACTION_AMOUNT.6 = 1.50x + value.FAKE_REFRACTION_AMOUNT.7 = 1.75x + value.FAKE_REFRACTION_AMOUNT.8 = 2.00x + + option.FAKE_DISPERSION_AMOUNT = 色散量 + value.FAKE_DISPERSION_AMOUNT.0 = 关闭 + value.FAKE_DISPERSION_AMOUNT.1 = 0.25x + value.FAKE_DISPERSION_AMOUNT.2 = 0.50x + value.FAKE_DISPERSION_AMOUNT.3 = 0.75x + value.FAKE_DISPERSION_AMOUNT.4 = 1.00x + value.FAKE_DISPERSION_AMOUNT.5 = 1.25x + value.FAKE_DISPERSION_AMOUNT.6 = 1.50x + value.FAKE_DISPERSION_AMOUNT.7 = 1.75x + value.FAKE_DISPERSION_AMOUNT.8 = 2.00x + + option.REFRACTION_SMUDGE_AMOUNT = 模糊量 + value.REFRACTION_SMUDGE_AMOUNT.0 = 关闭 + value.REFRACTION_SMUDGE_AMOUNT.1 = 0.25x + value.REFRACTION_SMUDGE_AMOUNT.2 = 0.50x + value.REFRACTION_SMUDGE_AMOUNT.3 = 0.75x + value.REFRACTION_SMUDGE_AMOUNT.4 = 1.00x + value.REFRACTION_SMUDGE_AMOUNT.5 = 1.25x + value.REFRACTION_SMUDGE_AMOUNT.6 = 1.50x + value.REFRACTION_SMUDGE_AMOUNT.7 = 1.75x + value.REFRACTION_SMUDGE_AMOUNT.8 = 2.00x + screen.Water_fog_color = 水雾设置 - option.Dirt_Scatter_R = 红色扩散 (污物) - option.Dirt_Scatter_G = 绿色扩散 (污物) - option.Dirt_Scatter_B = 蓝色扩散 (污物) - option.Dirt_Absorb_R = 红色吸收 (污物) - option.Dirt_Absorb_G = 绿色吸收 (污物) - option.Dirt_Absorb_B = 蓝色吸收 (污物) - option.Water_Absorb_R = 红色吸收 (水体) - option.Water_Absorb_G = 绿色吸收 (水体) - option.Water_Absorb_B = 蓝色吸收 (水体) + option.Dirt_Scatter_R = 散射 红 (污垢) + option.Dirt_Scatter_G = 散射 绿 (污垢) + option.Dirt_Scatter_B = 散射 蓝 (污垢) + option.Dirt_Absorb_R = 吸收 红 (污垢) + option.Dirt_Absorb_G = 吸收 绿 (污垢) + option.Dirt_Absorb_B = 吸收 蓝 (污垢) + option.Water_Absorb_R = 吸收 红 (水) + option.Water_Absorb_G = 吸收 绿 (水) + option.Water_Absorb_B = 吸收 蓝 (水) screen.Post_Processing = 后期处理 - screen.Tonemapping = 色调映射 - screen.Exposure = 曝光 - screen.DepthOfField = 景深 (DOF) - screen.Purkinje_effect = 柏金赫现象设置 - option.SHARPENING = 锐化强度 + option.TONEMAP = 色调映射算子 + screen.Exposure = 曝光设置 + option.Manual_exposure_value = 手动曝光级别 §a(禁用自动曝光以使用此功能) + option.EXPOSURE_MULTIPLIER = 曝光强度 + option.AUTO_EXPOSURE = 自动曝光 + option.Exposure_Speed = 自动曝光调整速度 + option.EXPOSURE_DARKENING = 曝光变暗 + option.EXPOSURE_BRIGHTENING = 曝光增亮 + screen.DepthOfField = 景深设置 + screen.Purkinje_effect = 浦肯野效应设置 + option.Purkinje_strength = 强度 + option.Purkinje_R = 红 + option.Purkinje_G = 绿 + option.Purkinje_B = 蓝 + option.Purkinje_Multiplier = 乘数 + option.FILM_GRAIN = 胶片颗粒 + option.FILM_GRAIN_STRENGTH = 胶片颗粒强度 + option.SHARPENING = 锐化量 + suffix.SHARPENING = % + value.SHARPENING.0 = 关闭 option.BLOOM_STRENGTH = 泛光强度 screen.TAA_OPTIONS = 抗锯齿设置 option.SCREENSHOT_MODE = 截图模式 - option.TAA = 时间性抗锯齿 (TAA) - option.BLEND_FACTOR = 混合比重 - option.TAA_UPSCALING = TAA 升采样 - option.SCALE_FACTOR = 放大倍率 - screen.COLOR_GRADING = 颜色分级 + option.TAA = TAA + option.RESPONSIVE_TAA = 响应式 TAA §a(使用时间性升采样时请关闭此选项) + option.BLEND_FACTOR = 混合因子 + option.BLEND_FACTOR_DURING_MOVEMENT = 摄像机移动时的混合因子 + option.TAA_UPSCALING = 时间性升采样 + option.SCALE_FACTOR = 比例因子 + prefix.SCALE_FACTOR = §f从窗口分辨率的 + suffix.SCALE_FACTOR = x §f升采样 + screen.COLOR_GRADING = 色彩分级 option.LUMINANCE_CURVE = 色调曲线 option.LOWER_CURVE = 下部曲线 option.UPPER_CURVE = 上部曲线 - option.COLOR_GRADING_ENABLED = 颜色分级 - option.SHADOWS_GRADE_R = 暗部 - §c红色 - option.SHADOWS_GRADE_G = 暗部 - §a绿色 - option.SHADOWS_GRADE_B = 暗部 - §9蓝色 - option.SHADOWS_GRADE_MUL = 暗部 - 亮度 - option.MIDS_GRADE_R = 中性色 - §c红色 - option.MIDS_GRADE_G = 中性色 - §a绿色 - option.MIDS_GRADE_B = 中性色 - §9蓝色 - option.MIDS_GRADE_MUL = 中性色 - 亮度 - option.HIGHLIGHTS_GRADE_R = 亮部 - §c红色 - option.HIGHLIGHTS_GRADE_G = 亮部 - §a绿色 - option.HIGHLIGHTS_GRADE_B = 亮部 - §9蓝色 - option.HIGHLIGHTS_GRADE_MUL = 亮部 - 亮度 + option.COLOR_GRADING_ENABLED=色彩分级 + option.SHADOWS_GRADE_R = 阴影 §c红 + option.SHADOWS_GRADE_G = 阴影 §a绿 + option.SHADOWS_GRADE_B = 阴影 §9蓝 + option.SHADOWS_GRADE_MUL = 阴影亮度 + option.MIDS_GRADE_R = 中间调 §c红 + option.MIDS_GRADE_G = 中间调 §a绿 + option.MIDS_GRADE_B = 中间调 §9蓝 + option.MIDS_GRADE_MUL = 中间调亮度 + option.HIGHLIGHTS_GRADE_R = 高光 §c红 + option.HIGHLIGHTS_GRADE_G = 高光 §a绿 + option.HIGHLIGHTS_GRADE_B = 高光 §9蓝 + option.HIGHLIGHTS_GRADE_MUL = 高光亮度 + + screen.Color_Processing = 色彩处理 + option.SATURATION = 饱和度 + value.SATURATION.0.0 = 0.0 (中性) + option.CROSSTALK = 去饱和度 + value.CROSSTALK.0.0 = 0.0 (中性) + option.WHITE_BALANCE = 白平衡 + value.WHITE_BALANCE.6500 = 6500 (中性) + screen.Camera_Settings = 摄像机设置 + option.CAMERA_GRIDLINES = 摄像机网格线 + option.MOTION_BLUR = 运动模糊 + option.MOTION_BLUR_STRENGTH = 运动模糊量 + option.CHROMATIC_ABERRATION = 色差 + option.CHROMATIC_ABERRATION_STRENGTH = 色差量 + option.VIGNETTE = 暗角 + option.VIGNETTE_STRENGTH = 暗角量 + screen.FLASHLIGHT_SETTING = 手电筒设置 + option.FLASHLIGHT = 手电筒 + option.FLASHLIGHT_SPECULAR = 镜面反射 + option.FLASHLIGHT_BOUNCED_INDIRECT = 光照反射 + option.FLASHLIGHT_FOG_ILLUMINATION = 雾化照明 + option.FLASHLIGHT_RANGE = 光照范围 + option.FLASHLIGHT_SIZE = 光照大小 + option.FLASHLIGHT_SHADOWS = 阴影 + option.FLASHLIGHT_R = 红 + option.FLASHLIGHT_G = 绿 + option.FLASHLIGHT_B = 蓝 + option.FLASHLIGHT_BRIGHTNESS_MULT = 亮度倍数 + option.FLASHLIGHT_BRIGHTNESS_FALLOFF_MULT = 亮度衰减倍数 + option.FLASHLIGHT_SHADOWS_STRENGTH = 阴影强度 + + screen.GAMEPLAY_EFFECTS = 游戏画面效果 + option.MOTION_AMOUNT = 所有游戏效果中的运动量 + option.WATER_ON_CAMERA_EFFECT = 进入/离开水效果 + option.DAMAGE_TAKEN_EFFECT = 受到伤害效果 + option.ON_FIRE_DISTORT_EFFECT = 着火扭曲效果 + option.ON_FIRE_DISTORT_EFFECT_STRENGTH = 着火扭曲效果量 + option.LOW_HEALTH_EFFECT = 低生命值效果 + option.LOW_HEALTH_EFFECT_START = 触发低生命值效果所需的最低生命值 + option.CRITICALLY_LOW_HEALTH_EFFECT_START = 触发严重低生命值效果所需的最低生命值 + option.DROWNING_EFFECT = 溺水效果 -screen.LabResource_Pack_SupportPBR = Lab PBR - screen.Reflections = 高光反射 - option.Specular_Reflections = 高光反射 - option.Screen_Space_Reflections = 屏幕空间反射 (SSR) - option.Rough_reflections = 粗糙反射 - option.Sky_reflection = 天空/雾气反射 - option.Dynamic_SSR_quality = 动态 SSR 质量 - option.Roughness_Threshold = 粗糙反射阀值 - option.Sun_specular_Strength = 太阳反射强度 - option.reflection_quality = SSR 质量 +screen.Resource_Pack_Support = 材质 / 资源包支持 + screen.SPECULAR = 镜面反射 + option.DEFERRED_SPECULAR = 地形反射 + option.DEFERRED_SSR_QUALITY =^ 环境反射 + value.DEFERRED_SSR_QUALITY.0 =§c 关闭 + value.DEFERRED_SSR_QUALITY.1 = 镜像视图模式 + suffix.DEFERRED_SSR_QUALITY = §§ 采样 + option.DEFERRED_BACKGROUND_REFLECTION =^ 背景反射 + option.DEFERRED_ROUGH_REFLECTION =^ 粗糙反射 + option.FORWARD_SPECULAR = 水、玻璃反射 + option.FORWARD_SSR_QUALITY =^ 环境反射 + value.FORWARD_SSR_QUALITY.0 =§c 关闭 + value.FORWARD_SSR_QUALITY.1 = 镜像视图模式 + suffix.FORWARD_SSR_QUALITY = §§ 采样 + option.FORWARD_BACKGROUND_REFLECTION =^ 背景反射 + option.FORWARD_ROUGH_REFLECTION =^ 粗糙反射 + option.SUN_SPECULAR_MULT = 太阳/月亮反射 + value.SUN_SPECULAR_MULT.0 =§c 关闭 + value.SUN_SPECULAR_MULT.1 = 开启 + suffix.SUN_SPECULAR_MULT =x 更亮 + option.ROUGHNESS_THRESHOLD = 反射可见度阈值 + value.ROUGHNESS_THRESHOLD.0.0 = 无阈值 - screen.Emissives = 发光效果 - option.Emissive_Brightness = 发光亮度 + screen.Emissives = 自发光 / 发光纹理 + option.Emissive_Brightness = 自发光亮度 option.Emissive_Curve = 发光曲线 - option.EMISSIVE_TYPE = 发光模式 - value.EMISSIVE_TYPE.0 = 不发光 + option.EMISSIVE_TYPE = 模式 + value.EMISSIVE_TYPE.0 = 无发光 value.EMISSIVE_TYPE.1 = 仅硬编码 - value.EMISSIVE_TYPE.2 = 硬编码 + LabPBR 自发光 - value.EMISSIVE_TYPE.3 = 仅 LabPBR 自发光 + value.EMISSIVE_TYPE.2 = 硬编码 + Lab 发光 + value.EMISSIVE_TYPE.3 = 仅 Lab 发光 -screen.POM = 视差遮蔽映射 (POM) - option.POM = 视差 (POM) - option.MAX_ITERATIONS = 视差质量 - option.POM_DEPTH = 视差深度 - option.MAX_DIST = 视差最大距离 +screen.POM = 视差遮蔽映射 / POM + option.POM = 视差遮蔽映射 + option.MAX_ITERATIONS = 质量 + option.POM_DEPTH = 深度 + option.MAX_DIST = 最远距离 option.Adaptive_Step_length = 动态质量 - option.Horrible_slope_normals = 恐怖的斜坡法线 + option.Horrible_slope_normals = 糟糕的斜坡法线 +screen.Refraction = 折射 -screen.Porosity = 孔隙率/水坑 - option.Porosity = 孔隙率 - option.Puddles = 水坑 - option.Puddle_Size = 水坑大小 +screen.Subsurface_Scattering = 次表面散射 + option.LabSSS_Curve = Lab次表面散射曲线 + option.MISC_BLOCK_SSS = 随机方块的次表面散射 + option.MOB_SSS = 生物的次表面散射 + option.Ambient_SSS = 来自天空的次表面散射 + option.ambientsss_brightness = 天空次表面散射亮度 + option.SSS_TYPE = 模式 + value.SSS_TYPE.0 = 无 + value.SSS_TYPE.1 = 仅硬编码 + value.SSS_TYPE.2 = 硬编码 + Lab次表面散射 + value.SSS_TYPE.3 = 仅 Lab次表面散射 + option.sss_density_multiplier = 次表面散射密度 + option.sss_absorbance_multiplier = 次表面散射吸收 + option.SCREENSPACE_DIRECT_SSS_BLENDING = 屏幕空间次表面散射混合 + +screen.Porosity = 孔隙度 / 水坑 + option.Porosity = 孔隙度 + +screen.Rainbow_Settings = 彩虹设置 + option.RAINBOW = 彩虹 + value.RAINBOW.0 = 关闭 + value.RAINBOW.1 = 雨后 + value.RAINBOW.2 = 始终开启 + option.RAINBOW_BRIGHTNESS = 彩虹亮度 + option.RAINBOW_DISTANCE = 彩虹距离 + option.RAINBOW_TIME = 彩虹淡出时间 (秒) + option.RAINBOW_ONLY_BELOW_CLOUDS = 云上方的彩虹 + +screen.AURORA_SETTINGS = 极光设置 + option.AURORA_LOCATION = 极光 + value.AURORA_LOCATION.0 = 关闭 + value.AURORA_LOCATION.1 = 仅在雪原生物群系 + value.AURORA_LOCATION.2 = 始终开启 + option.AURORA_MOON = 仅当月亮低于地平线时显示极光 + option.AURORA_CHANCE = 极光几率 + suffix.AURORA_CHANCE = % + option.AURORA_BRIGHTNESS = 极光亮度 + option.AURORA_R = 极光 红 + option.AURORA_G = 极光 绿 + option.AURORA_B = 极光 蓝 option.MATERIAL_AO = 材质环境光遮蔽 +option.NORMAL_MAP_MULT = 法线贴图系数 +value.NORMAL_MAP_MULT.1.0 = 默认 1.0 §a资源包期望此值 +suffix.NORMAL_MAP_MULT = §c 资源包不期望此值 -option.DOF_QUALITY=景深 (DOF) +option.DOF_QUALITY=景深 value.DOF_QUALITY.-1=关闭 - value.DOF_QUALITY.0=六边形景深虚化效果 - value.DOF_QUALITY.1=低质量 - value.DOF_QUALITY.2=中质量 - value.DOF_QUALITY.3=高质量 - value.DOF_QUALITY.4=极高质量 + value.DOF_QUALITY.0=六边形 + value.DOF_QUALITY.1=低 + value.DOF_QUALITY.2=中 + value.DOF_QUALITY.3=高 + value.DOF_QUALITY.4=极致 value.DOF_QUALITY.5=抖动 - option.MANUAL_FOCUS=对焦距离 + option.MANUAL_FOCUS=对焦 option.DOF_ANAMORPHIC_RATIO=景深变形比 + option.focal = 焦点大小 + option.fstop = 光圈大小 value.MANUAL_FOCUS.-2=自动对焦 value.MANUAL_FOCUS.-1=亮度滑块 + option.DoF_Adaptation_Speed = 景深自适应速度 + option.FAR_BLUR_ONLY = 仅模糊远景 + option.REMOVE_HAND_BLUR = 移除手部模糊 screen.JITTER_DOF=抖动景深设置 option.JITTER_STRENGTH=抖动强度 - option.FOCUS_LASER_COLOR=聚焦点 - value.FOCUS_LASER_COLOR.0=红 - value.FOCUS_LASER_COLOR.1=绿 - value.FOCUS_LASER_COLOR.2=蓝 - value.FOCUS_LASER_COLOR.3=粉 - value.FOCUS_LASER_COLOR.4=黄 - value.FOCUS_LASER_COLOR.5=白 + option.FOCUS_LASER_COLOR=对焦 + value.FOCUS_LASER_COLOR.0=红 + value.FOCUS_LASER_COLOR.1=绿 + value.FOCUS_LASER_COLOR.2=蓝 + value.FOCUS_LASER_COLOR.3=粉 + value.FOCUS_LASER_COLOR.4=黄 + value.FOCUS_LASER_COLOR.5=白 + option.DOF_DISPERSION_MULT = 景深分散系数 -option.AEROCHROME_MODE=Aerochrome 模式 -option.AEROCHROME_PINKNESS=Aerochrome 模式 红色: 粉色 比例 -option.AEROCHROME_WOOL_ENABLED=Aerochrome 模式作用于羊毛 +option.AEROCHROME_MODE=红外胶片模式 +option.AEROCHROME_PINKNESS=红外胶片 红:粉 比率 +option.AEROCHROME_WOOL_ENABLED=红外胶片影响羊毛 -option.AEROCHROME_MODE.comment=影响画面. 从谷歌浏览器的功能实现方式得到了灵感. -option.AEROCHROME_PINKNESS.comment=选项数值越高 = 越接近粉色. 选项数值越低 = 越接近红色. -option.AEROCHROME_WOOL_ENABLED.comment=技术上,与羊毛相关的方块都会受到影响,但会破坏了大量的建筑外观. 启用后可能会导致更多的技术性错误. +option.AEROCHROME_MODE.comment = 红外胶片。谷歌搜索 "Aerochrome" 了解其效果。 +option.AEROCHROME_PINKNESS.comment = 越高 = 粉红。越低 = 红 +option.AEROCHROME_WOOL_ENABLED.comment = 从技术上讲，羊毛物品应该受到影响，但这会破坏许多建筑。启用以更符合技术正确性。 +option.EMISSIVE_ORES = 发光矿石 +option.EMISSIVE_ORES_STRENGTH = 发光矿石亮度 +option.PLANET_CURVATURE = 行星曲率 +option.CURVATURE_AMOUNT = 曲率量 +screen.scene_controller = 场景控制器 +option.USE_CUSTOM_DIFFUSE_LIGHTING_COLORS = 自定义漫反射颜色 +option.DIRECTLIGHT_DIFFUSE_R = 太阳 R +option.DIRECTLIGHT_DIFFUSE_G = 太阳 G +option.DIRECTLIGHT_DIFFUSE_B = 太阳 B +option.INDIRECTLIGHT_DIFFUSE_R = 环境光 R +option.INDIRECTLIGHT_DIFFUSE_G = 环境光 G +option.INDIRECTLIGHT_DIFFUSE_B = 环境光 B +option.USE_CUSTOM_CLOUD_LIGHTING_COLORS = 自定义云颜色 +option.DIRECTLIGHT_CLOUDS_R = 太阳 R +option.DIRECTLIGHT_CLOUDS_G = 太阳 G +option.DIRECTLIGHT_CLOUDS_B = 太阳 B +option.INDIRECTLIGHT_CLOUDS_R = 环境光 R +option.INDIRECTLIGHT_CLOUDS_G = 环境光 G +option.INDIRECTLIGHT_CLOUDS_B = 环境光 B +option.USE_CUSTOM_FOG_LIGHTING_COLORS = 自定义雾颜色 +option.DIRECTLIGHT_FOG_R = 太阳 R +option.DIRECTLIGHT_FOG_G = 太阳 G +option.DIRECTLIGHT_FOG_B = 太阳 B +option.INDIRECTLIGHT_FOG_R = 环境光 R +option.INDIRECTLIGHT_FOG_G = 环境光 G +option.INDIRECTLIGHT_FOG_B = 环境光 B +option.USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS = 自定义天空地面颜色 +option.SKY_GROUND_R = 地面 R +option.SKY_GROUND_G = 地面 G +option.SKY_GROUND_B = 地面 B +screen.Misc_Settings.comment = 用于调试或其他有趣功能的随机设置。 +screen.Sun_and_Moon_Colors.comment = 配置太阳或月亮的颜色。 +option.sunPathRotation.comment = 配置太阳或月亮的角度 +option.sun_illuminance.comment = 配置太阳的亮度 +option.moon_illuminance.comment = 配置月亮的亮度 +screen.Direct_Light.comment = 配置与太阳和阴影相关的设置。 -screen.Misc_Settings.comment = 用于调试的一些随机选项和有趣的功能. -screen.Sun_and_Moon_Colors.comment = 配置太阳和月亮的颜色. -option.sunPathRotation.comment = 配置太阳和月亮的角度. -option.sun_illuminance.comment = 配置太阳的亮度. -option.moon_illuminance.comment = 配置月亮的亮度. +screen.Shadows.comment = 根据您的喜好配置来自太阳的阴影。 + option.SCREENSPACE_CONTACT_SHADOWS.comment = §b这是什么？§r 这些是用于远处物体和附近小细节的阴影。 §a性能消耗：§r 低到中；分辨率越高越昂贵。 + option.RENDER_ENTITY_SHADOWS.comment = §b这是什么？§r 所有类型实体上的阴影，如生物、箱子、旗帜或标志。 §a性能消耗：§r 低到高；当附近有许多实体时非常昂贵。 + option.shadowMapResolution.comment = 世界上物体投射的太阳阴影的质量。 §a性能消耗：§r 中到非常高；阴影必须从太阳的视角第二次渲染 3D 世界，这就是为什么它会将性能减半。 + option.shadowDistance.comment = 阴影贴图可以渲染的最远距离。 §a性能消耗：§r 中到非常高；如果区块渲染距离高，阴影将变得更加昂贵。 + screen.Filtering.comment = 配置应用于阴影的过滤效果。 + option.SHADOW_FILTER_SAMPLE_COUNT.comment = 基础阴影过滤的质量。此过滤器只是柔化阴影。 §a性能消耗：§r 低到中；增加此值应减少阴影边缘的一些噪点。 + option.Min_Shadow_Filter_Radius.comment = 基础阴影过滤的最大柔和度。 + option.Variable_Penumbra_Shadows.comment = 这种效果使阴影离投射它的物体越远就越柔和。此效果用于创建更高质量的阴影和次表面散射。 §a性能消耗：§r 低到高； + option.VPS_Search_Samples.comment = 可变半影阴影过滤器的质量。 §a性能消耗：§r 低到高；增加此值应减少次表面散射和非常柔和的阴影中的一些噪点。 + option.Max_Shadow_Filter_Radius.comment = 阴影在远离投射它的物体时可以获得的最大柔和度。 + option.Max_Filter_Depth.comment = 配置太阳的大小。如果太阳更大，阴影在靠近投射它们的物体会变得更柔和。 -screen.Direct_Light.comment = 配置和阳光或阴影相关的设置. +screen.Ambient_light.comment = 配置阴影处光照相关的设置 + option.AO_Strength.comment = 配置由 SSAO、GTAO 和 SSRT 产生的环境光遮蔽的强度。 §b这是什么？§r 环境光遮蔽是角落等处的小而柔和的阴影。 + option.GI_Strength.comment = 配置由 SSRT 产生的全局光照的强度。 §b这是什么？§r 这种情况下的全局光照特指光线从表面反弹到其他区域。 + option.HQ_SSGI.comment = 切换长距离屏幕空间光线追踪。这将允许 SSRT 光照从它反弹/投射阴影的地方在场景中传播得更远。 §a性能消耗：§r 非常高 + option.Hand_Held_lights.comment = 切换着色器端的手持光源。 §a性能消耗：§r 非常低 + option.SKY_CONTRIBUTION_IN_SSRT.comment = 允许 SSRT 考虑整个天空和雾，为阴影区域创建高质量的光照。这可能会引入更多噪点。 §a性能消耗：§r 中 -screen.Shadows.comment = 根据喜好配置阳光的阴影. - option.SCREENSPACE_CONTACT_SHADOWS.comment = §b这啥?§r 这是给远处事物的小部分阴影区域补充, 以及对近处小部分阴影区域添加细节. §a性能消耗水平:§r 低偏中; 在更高分辨率下会消耗更多性能. - option.RENDER_ENTITY_SHADOWS.comment = §b这啥?§r 所有类型实体的阴影, 例如怪物, 箱子, 旗帜, 或者告示牌. §a性能消耗水平:§r 低偏中; 在近处有特别多实体的时候消耗的性能会非常的恐怖. - option.shadowMapResolution.comment = 在太阳照射下从世界上的事物投射出来阴影的质量. §a性能消耗水平:§r 中或更高; 阴影需要从太阳的角度进行第二次 3D 世界的渲染, 这就是为什么它会使性能减半. - option.shadowDistance.comment = 阴影可渲染的最大距离 (这不是线性距离). 推荐保持默认, 因为接触阴影能解决远处阴影的渲染需求. §a性能消耗水平:§r 中或更高; 如果渲染距离非常大, 阴影的性能开销会很恐怖. - option.OPTIMIZED_SHADOW_DISTANCE.comment = 仅在围绕以玩家为中心的球体中渲染的阴影, 最大渲染区块由渲染距离进行限制. 无优化选项不会以球体渲染阴影, 且不会被区块限制; 这意味着同样的渲染距离下阴影能覆盖更大的区域. 同样的, 设置为 无优化 时阴影距离不受区块限制. §a性能消耗水平:§r 低偏中. 优化选项更快, 无优化选项更慢. - screen.Filtering.comment = 配置作用于阴影的过滤效果. - option.SHADOW_FILTER_SAMPLE_COUNT.comment = 基础阴影过滤器质量. 过滤器仅用于软化阴影. §a性能消耗水平:§r 低偏中; 拉高本选项数值可以减少阴影边缘的噪点. - option.Min_Shadow_Filter_Radius.comment = 基础阴影过滤器的最大软化程度. - option.Variable_Penumbra_Shadows.comment = 该效果使阴影离投射它的地方距离越远越柔和. 用于渲染更高质量的阴影和次表面散射. §a性能消耗水平:§r 低或高. - option.VPS_Search_Samples.comment = 可变半阴影过滤器质量. §a性能消耗水平:§r 低或高; 拉高本选项数值可以减少次表面散射和其它非常柔和地阴影的噪点. - option.Max_Shadow_Filter_Radius.comment = 离投射它的地方最大半径时阴影柔和程度达到最大. - option.Max_Filter_Depth.comment = 配置太阳大小. 若太阳更大, 阴影越靠近投射它的地方越柔和. + option.ambientOcclusionLevel.comment = 配置来自原版 Minecraft 的环境光遮蔽的强度。 §b这是什么？§r 即使未启用着色器，Minecraft 中也有此环境光遮蔽。 + option.ambient_brightness.comment = 配置阴影处光照的亮度 + option.MIN_LIGHT_AMOUNT.comment = 配置外部阴影处可能存在的最小光照量。 + option.MIN_LIGHT_AMOUNT_INSIDE.comment = 配置内部阴影处可能存在的最小光照量。 + option.indirect_effect.comment = 切换不同类型的特效以提高阴影处光照的质量。 §a性能消耗：§r。原版 AO：非常低。 SSAO：低到中。 HQ SSAO：中。 GTAO：中到高。 SSRT：高到非常高 - GI 更慢 -screen.Ambient_light.comment = 配置和遮蔽处的照明相关的设置. - option.AO_Strength.comment = 配置由 SSAO, GTAO, RTAO, 和 SSGI 渲染的环境光遮蔽强度. §b这啥?§r 环境光遮蔽是指在角落区域的小块柔和阴影. - option.GI_Strength.comment = 配置由 SSGI 渲染的全局照明强度. §b这啥?§r 在该情况下, 全局照明是指光线从一个表面反弹到其他区域的现象. - option.HQ_SSGI.comment = 远距屏幕空间全局照明开关. §a性能消耗水平:§r 非常高. - option.Hand_Held_lights.comment = 动态手持光源 (光影实现) 开关. §a性能消耗水平:§r 非常低. - option.SKY_CONTRIBUTION_IN_SSRT.comment = 允许 RTAO 或 SSGI 计算考虑整个天空和雾气来在遮蔽处创建高质量照明. 但会带来更多噪点. §a性能消耗水平:§r 中 + screen.Ambient_Colors.comment = 配置阴影区域的光线颜色。 + screen.Torch_Colors.comment = 配置火把或其他放置的光源的光线颜色。 - option.ambientOcclusionLevel.comment = 配置原版 Minecraft 的环境光遮蔽强度. §b这啥?§r 原版下该环境光遮蔽默认开启, 无关光影是否开启. - option.ambient_brightness.comment = 配置阴影区域的其他光源照明的亮度. - option.MIN_LIGHT_AMOUNT.comment = 配置阴影区域的最小照明水平. - option.indirect_effect.comment = 切换不同类型的间接照明效果使阴影区域渲染质量更好. §a性能消耗水平:§r. 原版 AO: 非常低. SSAO: 低偏中. GTAO: 中偏高. RTAO or SSGI: 高或更高. - - screen.Ambient_Colors.comment = 配置阴影区域的照明颜色. - screen.Torch_Colors.comment = 配置火把或其它可放置光源的颜色. - -screen.Resource_Pack_Support.comment = 由遵循 LabPBR 格式的资源包提供部分信息的小部分效果. - screen.Reflections.comment = 配置由 LabPBR 格式的资源包所提供信息的反射. - option.Specular_Reflections.comment = LabPBR 资源包所有反射的开关. 本选项同时启用太阳反射, 同时允许以下其它设置启用. §a性能消耗水平:§r 低. - option.Screen_Space_Reflections.comment = 屏幕空间反射开关. §a性能消耗水平:§r 中. - option.Rough_reflections.comment = 开启更精细的粗糙反射以获得更高的反射质量. 开启会导致出现大量可见噪点. §a性能消耗水平:§r 中偏高. - option.Sky_reflection.comment = 反射天空和雾气的开关. §a性能消耗水平:§r 低偏中. - option.Dynamic_SSR_quality.comment = 会基于它们的可见程度降低屏幕空间反射质量. 以降低质量为代价提升性能. - option.Roughness_Threshold.comment = 粗糙度达到阈值后除了太阳反射外所有反射都不渲染. 可提升性能. - option.Sun_specular_Strength.comment = 配置太阳反射亮度. - option.reflection_quality.comment = 配置屏幕空间反射质量. - -screen.Subsurface_Scattering.comment = §b这啥?§r 打个比方, 次表面散射类似于你把你的手盖住一个很亮的光源, 手掌呈现的那种从内部透光的感觉. 阳光实际上对植物, 衣服, 皮肤或者其它事物照耀都可以产生相同的效果. - option.SSS_TYPE.comment = 配置次表面散射如何在世界应用. §b硬编码:§r 由光影决定. §bLabSSS:§r 由资源包决定. §a性能消耗水平:§r 非常低. - option.MOB_SSS.comment = 怪物次表面散射开关. 也包含玩家. §a性能消耗水平:§r 非常低. - option.MISC_BLOCK_SSS.comment = 随机方块的次表面散射开关. 这个一般是指草和沙子. §a性能消耗水平:§r 非常低 - option.Ambient_SSS.comment = §b这啥?§r 天空光的次表面散射开关, 而不是太阳光. §a性能消耗水平:§r 低偏中; 如果启用了 SSAO , 本选项的性能消耗会很小, 反之如果关闭了会消耗得大. - option.ambientsss_brightness.comment = 配置天空光次表面散射亮度. - -screen.Emissives.comment = §b这啥?§r 自发光亮度是指某方块发光量或自发光强度. - option.Emissive_Brightness.comment = 配置自发光纹理发光亮度. - option.EMISSIVE_TYPE.comment = 配置自发光纹理如何在世界应用. §b硬编码:§r 由光影决定. §bLabPBR:§r 由资源包决定. §a性能消耗水平:§r 非常低. - option.Emissive_Curve.comment = 调整自发光纹理达到最高亮度的容易程度/速度. 1.0 是线性. - -screen.POM.comment = 配置由资源包提供信息的视差遮蔽映射的相关设置. - option.POM.comment = §b这啥?§r 通过使用资源包中的特殊图像, 在实际没有的区域渲染出 3D 几何图形. 这种效果基本上只向内凹, 所以大角度观察时, 会存在一些伪影. §a性能消耗水平:§r 中偏高. - option.MAX_ITERATIONS.comment = 配置视差效果的质量. 如果近距离仅看到了部分层, 则需要提高本项数值, 不然很难看到. §a性能消耗水平:§r 高. - option.POM_DEPTH.comment = 视差效果表面凹陷程度. §a性能消耗水平:§r 非常低. - option.MAX_DIST.comment = 视差效果以镜头为起点开始渲染的最远距离. §a性能消耗水平:§r 高. - option.Adaptive_Step_length.comment = 本选项可在不实际意义上提高质量的情况下提高视觉质量. 如果在非常近距离观察, 或者读取了陡峭的高度图, 会导致产生一些伪影. - option.Horrible_slope_normals.comment = 糟糕的实现, 给视差贴图的两侧提供表面. §a性能消耗水平:§r 低. + option.LPV_SIZE.comment = 配置彩色光照体积的大小（以方块为单位）。 + option.LPV_SATURATION.comment = 配置彩色光照的强度。 + option.LPV_TINT_SATURATION.comment = 配置半透明方块对彩色光照着色的强度。 + option.LPV_NORMAL_STRENGTH.comment = 配置表面法线将影响光照方向的程度。 + option.LPV_ENTITY_LIGHTS.comment = 允许实体贡献彩色光照。 + option.LPV_REDSTONE_LIGHTS.comment = 允许红石块贡献彩色光照。 + option.LPV_COLORED_CANDLES.comment = 允许彩色蜡烛发出匹配的彩色光照。 + option.LPV_NOSHADOW_HACK.comment = Iris 1.7.0 及更低版本的修复！允许泛光填充在下界和末地工作，但禁用实体和掉落物光源。 + option.LPV_VL_FOG_ILLUMINATION.comment = 允许彩色光照照亮其周围的空气。为室外启用它可能在雾采样数低时看起来奇怪。 + option.LPV_VL_FOG_ILLUMINATION_BRIGHTNESS.comment = 配置被照亮的雾的亮度。 -screen.Porosity.comment = 配置和湿度, 水坑相关的设置. - option.Porosity.comment = §b这啥?§r 孔隙率是对某种材料的多孔性的描述, 也可以说是它容纳水的能力. 例如, 海绵是非常多孔的; 大量吸附水时, 会使它变黑. §a性能消耗水平:§r 低. - option.Puddles.comment = 雨天时水坑的开关. §a性能消耗水平:§r 低. - option.Puddle_Size.comment = 配置水坑大小. - -screen.Fog.comment = 配置和光线行进体积雾, 基于距离的雾气相关的设置. - option.VL_RENDER_RESOLUTION.comment = 配置体积雾分辨率. §a性能消耗水平:§r 高. - option.VL_SAMPLES.comment = 配置体积雾质量. §a性能消耗水平:§r 高 - option.BLOOMY_FOG.comment = 配置作用于雾气的泛化强度. §b这啥?§r 本选项的效果使雾气看起来更柔和, 同时有助于隐藏部分噪点. 但可能会导致在细节边缘出现一些明显的闪烁. §a性能消耗水平:§r 非常低. - option.Haze_amount.comment = 配置周遭的大气密度. §b这啥?§r 在远处看到的蓝色雾霾. - option.RainFog_amount.comment = 配置雨天时的雾气密度. - option.RAYMARCH_CLOUDS_WITH_FOG.comment = 进入云层内或靠近云层周围时, 更细致的雾气的开关. §a性能消耗水平:§r 中偏高. - option.BorderFog.comment = §b这啥?§r 雾气开关, 目的是尝试隐藏区块边界. 但因为四周都是天空, 所以很难做好. §a性能消耗水平:§r 非常非常低. - - screen.TOD_fog.comment = 配置一天中特定时间出现的雾气的密度. - option.TOD_Fog_mult.comment = 配置一天中特定时间出现的总体雾气量. 本选项不影响大气雾霾密度. - - screen.Cave_Fog.comment = 配置仅出现在黑暗区域的雾气设置, 例如洞穴. - option.Cave_Fog.comment = 仅出现在黑暗区域的雾气. 因为光影不可能准确地判断出你是否在一个洞穴里, 所以这种雾气可能会出现在不是洞穴的地方. §a性能消耗水平:§r 低. - option.CaveFogFallOff.comment = 配置雾化淡出梯度达到最亮部分的容易程度/速度. - -screen.Clouds.comment = 配置和光线步进体积云相关的设置. - option.VOLUMETRIC_CLOUDS.comment = 云层开关. §a性能消耗水平:§r 中偏高. - option.CLOUDS_QUALITY.comment = 配置体积云分辨率. §a性能消耗水平:§r 高. - option.CLOUDS_SHADOWS.comment = 从云层或雾气投射到地面的阴影的开关. §a性能消耗水平:§r 低偏中. - option.Daily_Weather.comment = 按周期循环的天气功能开关. 有八种天气预设, 每天光影会循环启用它们. 启用本选项后, 不能改变任何云层覆盖率设置. §a性能消耗水平:§r 低. - option.Cloud_Speed.comment = 配置日常时间云层的移动速度. - option.Rain_coverage.comment = 配置雨天时云层的覆盖率. - -screen.World.comment = 配置多种会在主世界发生的效果, 从摇摆植物到水体相关的设置等. - screen.Water.comment = 配置和水体相关的设置. - option.WATER_REFLECTIONS.comment = 所有半透明方块反射的开关. 本选项允许以下其它设置启用. §a性能消耗水平:§r 低. - option.SCREENSPACE_REFLECTIONS.comment = 半透明方块的屏幕空间反射开关. §a性能消耗水平:§r 中. - option.SSR_STEPS.comment = 配置半透明方块的屏幕空间反射质量. §a性能消耗水平:§r 中偏高. - option.WATER_SUN_SPECULAR.comment = 半透明方块的日月反射开关. §a性能消耗水平:§r 低. - option.WATER_BACKGROUND_SPECULAR.comment = 半透明方块的天空和雾气反射开关. §a性能消耗水平:§r 低偏中. - option.FAKE_REFRACTION_EFFECT.comment = 半透明折射开关. §b这啥?§r 如果你观察水体, 可以看到光的折射会扭曲了水中的内容. §a性能消耗水平:§r 低. - option.Dirt_Amount.comment = 配置水中污物含量. 这可以控制水雾量. - option.Water_Top_Layer.comment = 配置海平面在世界中的 Y 坐标. +screen.Resource_Pack_Support.comment = 一些使用资源包提供信息的特效。 + screen.SPECULAR.comment = 配置反射。它们可以使用 LabPBR 资源包提供的信息。 + option.DEFERRED_SPECULAR.comment = 在所有固体对象上切换详细反射。 §b这是什么？§r "固体"指任何您无法看透的东西，如石头、木头、草、树叶 + option.FORWARD_SPECULAR.comment = 在所有半透明对象上切换详细反射。 §b这是什么？§r "半透明"指您可以看透的东西，如玻璃、水、冰、黏液 - screen.Water_fog_color.comment = 配置水雾颜色. + option.DEFERRED_SSR_QUALITY.comment = 配置在地形上可见的周围世界反射的质量。 §b这是什么？§r 配置 SSR/屏幕空间反射为创建世界反射所采用的采样数。 §b"镜像视图模式"§r 字面上就是您看到的图像，但在每个表面上镜像 - 质量极低。 §a性能消耗：§r 低到非常高 + option.FORWARD_SSR_QUALITY.comment = 配置在水、玻璃和其他半透明物体上可见的周围世界反射的质量。 §b这是什么？§r 配置 SSR/屏幕空间反射为创建世界反射所采用的采样数。 §b"镜像视图模式"§r 字面上就是您看到的图像，但在每个表面上镜像 - 质量极低。 §a性能消耗：§r 低到非常高 -screen.Climate.comment = 配置和气候相关的设置, 例如四季颜色, 周期循环的天气, 以及群系特定雾气. - screen.Seasons.comment = 循环往复的四季颜色, 夏秋冬春. - option.Seasons.comment = 循环往复的四季颜色, 夏秋冬春. §a性能消耗水平:§r 低. - option.Season_Length.comment = 控制单个季节的持续时间, 单位: MC 日. - option.Snowy_Winter.comment = 冬季积雪开关. §a性能消耗水平:§r 低. - screen.Summer_colors.comment = 配置夏季植被的颜色. - screen.Fall_colors.comment = 配置秋季植被的颜色. - screen.Winter_colors.comment = 配置冬季植被的颜色. - screen.Spring_colors.comment = 配置春季植被的颜色. + option.DEFERRED_BACKGROUND_REFLECTION.comment = 切换在地形上可见的天空、云或雾的反射。 §b这是什么？§r 天空、云和雾等事物的反射。 §a性能消耗：§r 低 + option.FORWARD_BACKGROUND_REFLECTION.comment = 切换在水、玻璃和其他半透明物体上可见的天空、云或雾的反射。 §b这是什么？§r 天空、云和雾等事物的反射。 §a性能消耗：§r 低 + + option.DEFERRED_ROUGH_REFLECTION.comment = 切换在地形上可见的粗糙反射。 §b这是什么？§r 这是基于表面"光滑"程度的反射"散布"程度，非常不光滑的表面会大量散射反射，而光滑的表面看起来像镜子。 §a性能消耗：§r 中 + option.FORWARD_ROUGH_REFLECTION.comment = 切换在水、玻璃和其他半透明物体上可见的粗糙反射。 §b这是什么？§r 这是基于表面"光滑"程度的反射"散布"程度，非常不光滑的表面会大量散射反射，而光滑的表面看起来像镜子。 §a性能消耗：§r 中 + + option.ROUGHNESS_THRESHOLD.comment = 配置环境和背景反射停止可见的阈值。 §b这不影响太阳/月亮反射§r。 §a性能消耗：§r 高阈值可以提高性能 - 低阈值可能降低性能 + option.SUN_SPECULAR_MULT.comment = 切换太阳或月亮的反射，或使它们更亮。 §b即使环境和背景反射都禁用，这仍然可见§r。 §a性能消耗：§r 非常低 + + +screen.Subsurface_Scattering.comment = §b这是什么？§r 次表面散射是当您将强光放在手上时，它开始发光的情况。太阳实际上对植物、布料、皮肤和其他东西也有同样的效果。 + option.SSS_TYPE.comment = 配置次表面散射如何应用于世界。 §b硬编码：§r 着色器决定什么获得它。 §bLabSSS：§r 资源包决定什么获得它。 §a性能消耗：§r 非常低 + option.MOB_SSS.comment = 为生物切换次表面散射。包括玩家。 §a性能消耗：§r 非常低 + option.MISC_BLOCK_SSS.comment = 为可能不适合的随机方块切换次表面散射。这主要用于草和沙。 §a性能消耗：§r 非常低 + option.Ambient_SSS.comment = §b这是什么？§r 来自天空的光线而不是太阳的次表面散射。 §a性能消耗：§r 非常低到中；如果启用了 SSAO，则成本非常低，但如果 SSAO 关闭则成本更高 + option.ambientsss_brightness.comment = 配置来自天空光线的次表面散射的亮度 + +screen.Emissives.comment = §b这是什么？§r 自发光就是某物发出多少光，或者某物发光的程度。 + option.Emissive_Brightness.comment = 配置纹理发光的亮度。 + option.EMISSIVE_TYPE.comment = 配置纹理发光如何应用于世界。 §b硬编码：§r 着色器决定什么获得它。 §bLabSSS：§r 资源包决定什么获得它。 §a性能消耗：§r 非常低 + option.Emissive_Curve.comment = 这决定了发光纹理达到其最亮点的速度。1.0 是线性的。 + +screen.POM.comment = 配置使用资源包提供信息的视差遮蔽映射相关的设置。 + option.POM.comment = §b这是什么？§r 这种效果尝试通过使用资源包中的特殊图像在先前没有 3D 几何图形的地方创建 3D 几何图形。这种效果基本上只向内推，所以在看陡峭角度时可能存在一些伪影。 §a性能消耗：§r 中到高 + option.MAX_ITERATIONS.comment = 配置视差遮蔽映射效果的质量。如果您在近距离观看时看到单独的层，增加此值会创建更多层，因此它们将变得更难看到。 §a性能消耗：§r 高 + option.POM_DEPTH.comment = 视差遮蔽映射效果可以进入表面的深度。 §a性能消耗：§r 非常低 + option.MAX_DIST.comment = 视差遮蔽映射效果可以渲染的离摄像机最远距离。 §a性能消耗：§r 高 + option.Adaptive_Step_length.comment = 这将增加视觉质量，而无需增加实际质量。如果您看得非常近，或者有一个非常复杂且高度变化剧烈的高度图，这会导致一些伪影。 + option.Horrible_slope_normals.comment = 这是一个实现不佳的功能，用于为视差遮蔽映射的侧面提供表面。我不推荐这个。 §a性能消耗：§r 低 - option.PER_BIOME_ENVIRONMENT.comment = 开关仅出现在特定群系的所有特色环境效果. §a性能消耗水平:§r 低. +screen.Porosity.comment = 配置与湿度和水坑相关的设置 + option.Porosity.comment = §b这是什么？§r 孔隙度是对某种材料多孔程度的描述，或者本质上它可以容纳多少水。例如，海绵非常多孔；水包含在其中并因此使其变暗。 §a性能消耗：§r 低 + option.PUDDLE_MODE.comment = 切换下雨时的水坑。 §a性能消耗：§r 低 + option.Puddle_Size.comment = 配置水坑的大小。 - screen.SWAMP.comment = 配置此群系类型的环境效果. - option.SWAMP_ENV.comment = 开关此群系类型的环境效果. 即使此项禁用, 其他群系的环境效果仍保持激活状态.. +option.FAKE_REFRACTION_AMOUNT.comment = 配置折射将产生的失真量。 §b这是什么？§r 您可以将折射视为光在穿过水或玻璃时弯曲，使透过它们观看的东西看起来被拉伸、挤压、扭曲。 §a性能消耗：§r 非常低 +option.FAKE_DISPERSION_AMOUNT.comment = 配置折射内的色散量。 §b这是什么？§r 当发生折射时，真正扭曲的部分会得到"色差"，模拟彩虹或光棱镜的外观。 §a性能消耗：§r 非常低 +option.REFRACTION_SMUDGE_AMOUNT.comment = 配置折射内的模糊量。 §b这是什么？§r 当发生折射时，真正扭曲的部分会变得模糊。 §c会导致折射内的视觉噪点。 §a性能消耗：§r 非常低 - screen.JUNGLE.comment = 配置此群系类型的环境效果. - option.JUNGLE_ENV.comment = 开关此群系类型的环境效果. 即使此项禁用, 其他群系的环境效果仍保持激活状态.. +screen.Fog.comment = 配置与光线行进体积雾或基于距离的雾相关的设置。 + option.VL_RENDER_RESOLUTION.comment = 配置体积雾和云的分辨率。 §a性能消耗：§r 高 + option.VL_SAMPLES.comment = 配置体积雾的质量。 §a性能消耗：§r 高 + option.BLOOMY_FOG.comment = 配置应用于雾的泛光强度。 §b这是什么？§r 这种效果使雾看起来柔和，它也有助于隐藏一点噪点。可能导致详细边缘上出现一些可见的闪烁。 §a性能消耗：§r 非常低 + option.Haze_amount.comment = 配置您周围大气的密度。 §b这是什么？§r 这是您在远处看到的蓝色雾霾。 + option.RainFog_amount.comment = 配置下雨时雾的密度。 + option.RAYMARCH_CLOUDS_WITH_FOG.comment = §c警告§r：此设置是实验性的，制作得不是很好！您需要增加雾采样数以使其与普通云匹配。当您进入或围绕云时切换详细雾。 §a性能消耗：§r 高。 + option.BorderFog.comment = §b这是什么？§r 切换一种试图隐藏区块加载的雾。但因为天空无处不在，所以很难做好。 §a性能消耗：§r 非常非常低 - screen.DARKFOREST.comment = 配置此群系类型的环境效果. - option.DARKFOREST_ENV.comment = 开关此群系类型的环境效果. 即使此项禁用, 其他群系的环境效果仍保持激活状态.. + screen.TOD_fog.comment = 配置在一天中特定时间出现的雾的密度。 + option.TOD_Fog_mult.comment = 配置在一天中特定时间出现的雾的总量。这不影响大气雾霾。 + + screen.Cave_Fog.comment = 配置当您在非常黑暗的地方（如洞穴）时出现的雾的设置。 + option.Cave_Fog.comment = 切换在黑暗地方出现的雾。使用着色器无法准确判断您何时在洞穴中，因此此雾可能出现在不是洞穴的地方。 §a性能消耗：§r 低 + option.CaveFogFallOff.comment = 配置雾梯度达到其最亮部分的速度。 + +screen.Clouds.comment = 配置与光线行进体积云相关的设置。 + option.VOLUMETRIC_CLOUDS.comment = 切换云。 §a性能消耗：§r 中到高 + option.CLOUDS_QUALITY.comment = 配置体积云的分辨率。 §a性能消耗：§r 高 + option.CLOUDS_SHADOWS.comment = 切换从云投射到地面及其下方雾上的阴影。 §a性能消耗：§r 低到中 + option.Daily_Weather.comment = 切换每天变化的天气。 §b这是什么？§r 有 10 个天气配置，着色器每天循环使用。启用此功能后，您无法更改任何云覆盖设置。 §a性能消耗：§r 低 + option.CHOOSE_RANDOM_WEATHER_PROFILE.comment = §b这是什么？§r 配置着色器从下面的某一天中随机选择天气。关闭此选项时，着色器将按顺序选择日期。 + option.Cloud_Speed.comment = 配置随着时间推移云移动的速度。 + option.Rain_coverage.comment = 配置雨天时云层的覆盖率 + option.Thunder_coverage.comment = 配置雷暴天时云层的覆盖率。（也会增加降雨覆盖！） -screen.Waving_Stuff.comment = 配置和摇摆相关的设置. - option.WAVY_PLANTS.comment = 植物摇摆开关. §a性能消耗水平:§r 非常低. - option.WAVY_STRENGTH.comment = 配置摇摆效果强度. - option.WAVY_SPEED.comment = 配置植物摇摆速度. +screen.World.comment = 配置世界中发生的各种事物的设置，从摆动的植物到与水相关的设置。 + screen.Water.comment = 配置与水相关的设置。 + option.Dirt_Amount.comment = 配置水中的污垢量。这控制水内有多少雾。 + option.Water_Top_Layer.comment = 配置世界中海洋应处的 Y 坐标。 + screen.Water_fog_color.comment = 配置水雾的颜色。 -screen.Post_Processing.comment = 配置所有后处理效果设置, 从抗锯齿到色调映射等. - screen.Tonemapping.comment = 配置和颜色或色调相关的设置. - screen.Exposure.comment = 配置和曝光相关的设置. - screen.DepthOfField.comment = 配置和景深相关的设置. - screen.Purkinje_effect.comment = 配置和柏金赫现象相关的设置. 柏金赫现象: 人类眼睛对高度照明灵敏，而在低照明水平时，往光谱高频蓝端迁移的现象 (来源于百度百科). - option.SHARPENING.comment = 配置对比度自适应锐化作用于图像的强度. 本选项可以有效带出因抗锯齿和升分辨率产生的细节损失. - option.BLOOM_STRENGTH.comment = 配置作用于图像的泛光强度. §b这啥?§r 泛光是指柔和所有发光事物的效果, 用来描述某物是否明亮. - screen.TAA_OPTIONS.comment = 配置和抗锯齿相关的设置. - option.SCREENSHOT_MODE.comment = 开启帧数积累以获得少噪点高质量的图像. §b这啥?§r 将已发生的帧叠加到生成的下一帧上, 类似于长曝光图像. - option.TAA.comment = 时间性抗锯齿 (TAA) 开关. 这可以去除大部分内容的锯齿状边缘, 软化图像, 并有助于去除许多效果产生的噪点. 但会导致拖影, 因为它使用过去的帧来获取世界额外信息. §a性能消耗水平:§r 低. - option.BLEND_FACTOR.comment = 配置历史帧使用比重. 更高的数值意味着依赖更少的历史帧, 所以可能会看起来很闪烁和多噪点. 较低的数值意味着以来更多的历史帧, 所以可能会看起来更少噪点但是更多拖影和显得有点脏. - option.TAA_UPSCALING.comment = 时间性升分辨率. 升分辨率时, 可以从低分辨率的图像中保留大多数质量. 因此与常规升分辨率相比, 可以开启一个看起来很高的分辨率的同时也能有更好的性能. - option.SCALE_FACTOR.comment = 配置以原有分辨率的多大一部分来开始升分辨率. 不推荐低于0.5, 只把它作为一个选项, 因为它很有趣. :P - screen.COLOR_GRADING.comment = 高级调色选项. - option.LUMINANCE_CURVE.comment = 启用色调曲线. 独立于颜色分级且首先应用. - option.COLOR_GRADING_ENABLED.comment = 启用颜色分级. RGB 滑块不会影响亮度. 在色调曲线之后应用. + screen.World_Effects = 世界天气效果 + option.PUDDLE_MODE = 水坑 + value.PUDDLE_MODE.0 = 无湿润 + value.PUDDLE_MODE.1 = 水坑 + 完全湿润 + value.PUDDLE_MODE.2 = 仅水坑 + value.PUDDLE_MODE.3 = 仅完全湿润 + option.Puddle_Size = 水坑大小 + option.Puddle_Reflection_Sharpness = 水坑反射清晰度 + option.Puddle_Reflection_Sharpness.comment = 控制水坑的模糊程度。1.0 表示像镜子一样 + option.ShaderSnow = 着色器雪效果 + value.ShaderSnow.0 = 关闭 + value.ShaderSnow.1 = 下雪时 + value.ShaderSnow.2 = 在雪原生物群系时 + value.ShaderSnow.3 = 始终开启 + option.ShaderSnowStrength = 着色器雪强度 + option.RIPPLE_WATER = 水面涟漪 + option.RIPPLE_PUDDLES = 水坑涟漪 + option.RIPPLE_INTENSITY = 涟漪强度 + option.RIPPLE_STRENGTH = 水涟漪强度 -option.RESOURCEPACK_SKY.comment = 开关资源包天空支持. 配置设置来使用完整的资源包天空, 或保持光影的日月. §a性能消耗水平:§r 非常低. -option.SKY_GROUND = 地天 +screen.Climate.comment = 配置与气候相关的设置，如季节颜色、每日天气和特定生物群系的雾。 + screen.Seasons.comment = 循环变化的季节颜色，夏季、秋季、冬季和春季。 + option.Seasons.comment = 循环变化的季节颜色，夏季、秋季、冬季和春季。 §a性能消耗：§r 低 + option.Season_Length.comment = 控制单个季节持续的时间，以 Minecraft 天数为单位。 + option.Snowy_Winter.comment = 切换冬季下雪。 §a性能消耗：§r 低 + screen.Summer_colors.comment = 配置夏季植被的颜色。 + screen.Fall_colors.comment = 配置秋季植被的颜色。 + screen.Winter_colors.comment = 配置冬季植被的颜色。 + screen.Spring_colors.comment = 配置春季植被的颜色。 + + option.PER_BIOME_ENVIRONMENT.comment = 切换所有仅出现在某些生物群系中的特殊环境。 §a性能消耗：§r 低 -option.MATERIAL_AO.comment = 开关基于资源包提供的内容应用环境光遮蔽的功能. §a性能消耗水平:§r 非常低. -option.WATER_WAVE_STRENGTH.comment = 配置出现的水波强度. -option.MOONPHASE_BASED_MOONLIGHT.comment = §b这啥?§r 每晚月亮有不同的照度. 此选项根据月相来调整发出的月光亮度. §a性能消耗水平:§r 近乎于无. + screen.SWAMP.comment = 配置此生物群系类型的环境。 + option.SWAMP_ENV.comment = 仅切换此生物群系类型的环境。即使禁用此环境，其他生物群系环境仍保持活动状态。 -option.END_STORM_DENSTIY.comment = §b这啥?§r 这是末地的一层暗色云雾. 配置末地风暴的密度. -option.NETHER_PLUME_DENSITY.comment = §b这啥?§r 这是下界中那些浓密的发光烟柱. 配置下界烟柱的密度. + screen.JUNGLE.comment = 配置此生物群系类型的环境。 + option.JUNGLE_ENV.comment = 仅切换此生物群系类型的环境。即使禁用此环境，其他生物群系环境仍保持活动状态。 -option.CloudLayer0.comment = 较小积云层的开关. §a性能消耗水平:§r 中. -option.CloudLayer0_coverage.comment = 配置云覆盖天空的程度. -option.CloudLayer0_density.comment = 配置云层的密度或者说厚度. -option.CloudLayer0_height.comment = 配置云层飘浮处的高度. - -option.CloudLayer1.comment = 较大积云层的开关. §a性能消耗水平:§r 中. -option.CloudLayer1_coverage.comment = 配置云覆盖天空的程度. -option.CloudLayer1_density.comment = 配置云层的密度或者说厚度. -option.CloudLayer1_height.comment = 配置云层飘浮处的高度. §c不能低于小积云层§r - -option.CloudLayer2.comment = 较高且薄的云层的开关. §a性能消耗水平:§r 低. -option.CloudLayer2_coverage.comment = 配置云覆盖天空的程度. -option.CloudLayer2_density.comment = 配置云层的密度或者说厚度. -option.CloudLayer2_height.comment = 配置云层飘浮处的高度. §c不能低于大积云层§r - -option.SKY_GROUND.comment = §b这啥?§r 天空的暗色下半部分, 若 Minecraft 有无限渲染距离, 则这是地面. §a性能消耗水平:§r 非常非常低. §c由于额外的函数计算, 禁用本选项会比启用消耗消耗更多性能.§r -option.SNELLS_WINDOW.comment = §b这啥?§r 这是在水下看到的黑色反射圆圈. 这是对现实水下会发生的情况的模拟, 称为 "全内反射". §a性能消耗水平:§r 非常非常非常低. -option.entityShadowDistanceMul.comment = §b这啥?§r 配置实体阴影的生效距离. 如果想保留实体阴影开启又想提高有巨量实体的区域的性能, 本选项会十分有用. - -screen.DISTANT_HORIZONS_SETTINGS = §2Distant Horizons §f设置 - -option.DH_KNOWN_ISSUES =DH 支持已知问题 -value.DH_KNOWN_ISSUES.0 = §c 点击此处文本循环查看已知问题列表 -value.DH_KNOWN_ISSUES.1 = §a LOD 区域的 GTAO, RTAO, 和 SSGI 不生效 - 未能实现对 DH 的支持 - -option.DISTANT_HORIZONS_SHADOWMAP = §c(如果不知道本选项作用, 请不要开启)§r DH 阴影图支持 -option.DISTANT_HORIZONS_SHADOWMAP.comment = §c此选项会降低性能, 会使阴影看起来呈块状, 闪烁且会降低阴影细节§r. 将阴影距离设置为 32 区块 (或更多). 设置阴影分辨率为 4096 (或更大) -option.TOGGLE_VL_FOG = 体积雾 -option.TOGGLE_VL_FOG.comment = 一个快速关闭所有雾气的开关. - -option.TRANSLUCENT_COLORED_SHADOWS.comment = §b这啥?§r 本选项的效果可以使像染色玻璃这样的半透明方块对穿过的光线染色. §a性能消耗水平:§r 中. - -#Additional Options / 附加选项 -#Direct Light - option.BASIC_SHADOW_FILTER=基础阴影过滤 - - option.sunColorR=太阳 - 红色比重 - option.sunColorG=太阳 - 绿色比重 - option.sunColorB=太阳 - 蓝色比重 - option.moonColorR=月亮 - 红色比重 - option.moonColorG=月亮 - 绿色比重 - option.moonColorB=月亮 - 蓝色比重 - option.colortype=颜色模式 - option.colortype.comment=1 = RGB 模式滑块. 2 = 黑体模式. - value.colortype.1= RGB 模式滑块 - value.colortype.2= 黑体模式 - option.Sun_temp=阳光色温 - suffix.Sun_temp=K - option.Moon_temp=月光色温 - suffix.Moon_temp=K - - suffix.sunPathRotation=° - suffix.sun_illuminance=LX - suffix.moon_illuminance=LX - option.OLD_LIGHTLEAK_FIX=旧版阳光泄露修复 + screen.DARKFOREST.comment = 配置此生物群系类型的环境。 + option.DARKFOREST_ENV.comment = 仅切换此生物群系类型的环境。即使禁用此环境，其他生物群系环境仍保持活动状态。 -#World - option.Vanilla_like_water=原版水体样式 - option.WATER_WAVE_SPEED=水体摇晃速度 +screen.Foliage.comment = 配置与植被相关的设置。 + option.WAVY_PLANTS.comment = 切换植物摆动。 §a性能消耗：§r 非常低 + option.WAVY_STRENGTH.comment = 配置植物摆动的量。 + option.WAVY_SPEED.comment = 配置植物摆动的速度。 -#Ambient_light - option.HANDHELD_LIGHT_RANGE=手持光源范围 +screen.Post_Processing.comment = 配置所有后期处理效果的设置，从抗锯齿到色调映射。 + screen.Tonemapping.comment = 配置与颜色和色调映射相关的设置。 + screen.Exposure.comment = 配置与曝光相关的设置。 + screen.DepthOfField.comment = 配置与景深相关的设置。 + screen.Purkinje_effect.comment = 配置与浦肯野效应相关的设置。 + option.SHARPENING.comment = 配置应用于图像的对比度自适应锐化的量。这可以真正带出因抗锯齿或升采样而丢失的细节。 + option.BLOOM_STRENGTH.comment = 配置应用于图像的泛光量。 §b这是什么？§r 泛光是万物上的柔和辉光，用来描述某物是否明亮。 + screen.TAA_OPTIONS.comment = 配置与抗锯齿相关的设置。 + option.SCREENSHOT_MODE.comment = §a这不会以任何方式改变图形质量§r。 切换帧累积以获得低噪点图像。 §b这是什么？§r 它将发生的帧堆叠到生成的下一帧上，所以它就像一张长曝光照片。 + option.TAA.comment = 切换时间性抗锯齿。这会消除物体上的所有锯齿边缘，柔化图像，并有助于消除许多效果的噪点。这将导致重影或拖尾，因为它使用过去的帧来获取世界的额外信息。 §a性能消耗：§r 低 + option.BLEND_FACTOR.comment = 配置使用了多少帧历史。高数字意味着它较少依赖帧历史，因此可能看起来闪烁且有噪点。低数字更依赖帧历史，因此可能看起来噪点更少，但更模糊且拖尾更多。 + option.TAA_UPSCALING.comment = 切换时间性升采样。这在从较低分辨率图像升采样时保留了大量的质量。因此，与典型的上采样相比，您仍然可以拥有高外观分辨率，并且仍然具有更好的性能。 + option.SCALE_FACTOR.comment = 配置从您分辨率的多少分之一进行升采样 - §a不建议低于 0.50x，仅允许用于娱乐！§r + + screen.COLOR_GRADING.comment = 高级色彩分级选项 + option.LUMINANCE_CURVE.comment = 启用色调曲线。这独立于色彩分级并首先应用。 + option.COLOR_GRADING_ENABLED.comment = 启用色彩分级。RGB 滑块不会影响亮度。这在色调曲线之后应用。 -#Fog - option.FOG_START_HEIGHT=雾气起始高度 +option.RESOURCEPACK_SKY.comment = 切换资源包天空支持。配置设置以使用整个资源包天空，或保留着色器的太阳和月亮。 §a性能消耗：§r 非常低 +option.SKY_GROUND = 大气地面 - option.CAVE_FOG=洞穴雾气 +option.MATERIAL_AO.comment = 切换基于资源包提供的环境光遮蔽的使用。 §a性能消耗：§r 非常低 +option.WATER_WAVE_STRENGTH.comment = 配置波浪出现的强度。 +option.MOONPHASE_BASED_MOONLIGHT.comment = §b这是什么？§r 每个夜晚，月亮都有不同的光照。此设置根据月亮发光的部分调整月光亮度。当启用"自定义月亮旋转"时，此设置无效。 §a性能消耗：§r 几乎为零 +option.END_STORM_DENSTIY.comment = §b这是什么？§r 这是末地中黑暗多云的雾。配置末地风暴的密度。 +option.NETHER_PLUME_DENSITY.comment = §b这是什么？§r 这是下界中 thick, glowing smoke towers。配置下界烟雾的密度。 -#Post_Processing - option.TONEMAP=色调映射方法 - option.USE_ACES_COLORSPACE_APPROXIMATION=启用 ACES 色彩空间的近似值拟合 - option.SATURATION=饱和度 - option.CROSSTALK=去饱和度 - option.CONTRAST=对比度 +option.CloudLayer0.comment = 切换小云层。 §a性能消耗：§r 中 +option.CloudLayer0_coverage.comment = 配置这些云覆盖天空的多少。 +option.CloudLayer0_density.comment = 配置这些云的密度或厚度。 +option.CloudLayer0_height.comment = 配置这些云飞行的高度。 - option.AUTO_EXPOSURE=自动曝光 - option.EXPOSURE_MULTIPLIER=曝光强度 - option.Exposure_Speed=曝光速度 - option.Manual_exposure_value=手动曝光值 +option.CloudLayer1.comment = 切换大云层。 §a性能消耗：§r 中 +option.CloudLayer1_coverage.comment = 配置这些云覆盖天空的多少。 +option.CloudLayer1_density.comment = 配置这些云的密度或厚度。 +option.CloudLayer1_height.comment = 配置这些云飞行的高度。 §c这些不能低于小云§r - option.focal=焦距 - option.aperture=光圈 - option.DoF_Adaptation_Speed=景深虚化自适应速度 - option.FAR_BLUR_ONLY=仅虚化远处 +option.CloudLayer2.comment = 切换非常高且薄的云层。 §a性能消耗：§r 低 +option.CloudLayer2_coverage.comment = 配置这些云覆盖天空的多少。 +option.CloudLayer2_density.comment = 配置这些云的密度或厚度。 +option.CloudLayer2_height.comment = 配置这些云飞行的高度。 §c这些不能低于大云§r - option.Purkinje_strength=柏金赫现象强度 - option.Purkinje_R=柏金赫 - 红色 - option.Purkinje_G=柏金赫 - 绿色 - option.Purkinje_B=柏金赫 - 蓝色 - option.Purkinje_Multiplier=柏金赫现象倍率 +option.SKY_GROUND.comment = §b这是什么？§r 这是天空的黑暗下半部分，如果 Minecraft 有无限渲染距离，那将是地面。 §a性能消耗：§r 非常非常低。 §c由于额外的数学运算，禁用此功能比启用它稍慢一些。§r +option.SNELLS_WINDOW.comment = §b这是什么？§r 这是您在水下时看到的黑暗反射圈。这是对现实中发生的称为"全内反射"的事物的近似。 §a性能消耗：§r 非常非常非常小。 +option.entityShadowDistanceMul.comment = §b这是什么？§r 配置实体阴影应工作的距离。如果您想在高实体区域保留实体阴影并提高性能，这很有用。 - screen.GAMEPLAY_EFFECTS=游玩效果设置 - option.MOTION_AMOUNT=Motion Amount - option.DAMAGE_TAKEN_EFFECT=受伤效果 - option.LOW_HEALTH_EFFECT=低生命值效果 +screen.PHYSICS_MOD_OCEAN = 物理模组 - §c阅读按钮描述§r +screen.PHYSICS_MOD_OCEAN.comment = 支持物理模组的海洋。该模组在 §b游戏选项 -> 物理设置 -> 海洋§r 中有其自己的设置。 -#Clouds -option.CLOUD_SHADOW_STRENGTH=云影强度 +screen.DISTANT_HORIZONS_SETTINGS = 遥远地平线 - §c需要 IRIS§r +option.DH_OVERDRAW_PREVENTION = 过度绘制预防 +option.OVERDRAW_MAX_DISTANCE = 过度绘制预防的最大距离 + value.OVERDRAW_MAX_DISTANCE.0 = 无限 + value.OVERDRAW_MAX_DISTANCE.32 = 2 区块 + value.OVERDRAW_MAX_DISTANCE.48 = 3 区块 + value.OVERDRAW_MAX_DISTANCE.64 = 4 区块 + value.OVERDRAW_MAX_DISTANCE.80 = 5 区块 + value.OVERDRAW_MAX_DISTANCE.96 = 6 区块 + value.OVERDRAW_MAX_DISTANCE.112 = 7 区块 + value.OVERDRAW_MAX_DISTANCE.128 = 8 区块 + value.OVERDRAW_MAX_DISTANCE.144 = 9 区块 + value.OVERDRAW_MAX_DISTANCE.160 = 10 区块 + value.OVERDRAW_MAX_DISTANCE.176 = 11 区块 + value.OVERDRAW_MAX_DISTANCE.192 = 12 区块 + value.OVERDRAW_MAX_DISTANCE.208 = 13 区块 + value.OVERDRAW_MAX_DISTANCE.224 = 14 区块 + value.OVERDRAW_MAX_DISTANCE.240 = 15 区块 + value.OVERDRAW_MAX_DISTANCE.256 = 16 区块 +option.DH_CHUNK_FADING = 区块淡入淡出 + value.DH_CHUNK_FADING.0 = 关闭 + value.DH_CHUNK_FADING.1 = 地形 + value.DH_CHUNK_FADING.2 = 地形 + 阴影 +option.DH_AMBIENT_OCCLUSION = LOD 区块上的环境光遮蔽 +option.DH_SUBSURFACE_SCATTERING = LOD 区块上的次表面散射 +option.DH_SCREENSPACE_REFLECTIONS = LOD 区块上的屏幕空间反射 +option.DH_TAA_JITTER = DH 时间性抗锯齿 +option.DH_NOISE_TEXTURE = DH 噪声图 +option.NOISE_RESOLUTION = 噪声分辨率 +option.NOISE_INTENSITY = 噪声强度 +option.NOISE_DROPOFF = 噪声衰减 -#LabPBR +option.DISTANT_HORIZONS_SHADOWMAP = §c(如果您不知道这是什么，请勿使用)§r DH 阴影贴图支持 +option.DISTANT_HORIZONS_SHADOWMAP.comment = §c此设置将破坏性能，将使阴影呈块状、闪烁且细节低§r。将阴影距离设置为 32 区块（或更多）。将阴影分辨率设置为 4096（或更多）。 +option.TOGGLE_VL_FOG = 切换体积雾 +option.TOGGLE_VL_FOG.comment = 一个大按钮来关闭所有雾。 - option.sss_density_multiplier=次表面散射强度倍率 - option.sss_absorbance_multiplier=次表面散射吸光倍率 +option.TRANSLUCENT_COLORED_SHADOWS.comment = §b这是什么？§r 此效果允许半透明物体（如染色玻璃）在阳光穿过时为其着色。 §a性能消耗：§r 中 +option.MINIMUM_WATER_ABSORBANCE.comment = §b这是什么？§r 这控制浅水区水的"清澈"程度。自动允许户外水清澈，但在室内调整为最小值 7，以使其清晰可见。 §d此设置不影响水下视觉效果。 - -#Climate Settings - - -#Misc Settings - screen.the_orb=末地球形天体 - option.THE_ORB=球形天体 - option.THE_ORB.comment=§c实测请保持关闭该选项, 以下配置选项暂不能调节该天体效果. - option.ORB_X=天体位置 - X轴坐标 - option.ORB_Y=天体位置 - Y轴坐标 - option.ORB_Z=天体位置 - Z轴坐标 - option.ORB_ColMult=天体颜色倍率 - option.ORB_R=天体颜色 - 红色 - option.ORB_G=天体颜色 - 绿色 - option.ORB_B=天体颜色 - 蓝色 - - screen.lightning_color=闪电颜色 - option.Lightning_R=闪电 - 红色 - option.Lightning_G=闪电 - 绿色 - option.Lightning_B=闪电 - 蓝色 - - option.DEBUG_VIEW=调试视图 - value.DEBUG_VIEW.debug_OFF=关闭 - value.DEBUG_VIEW.debug_SHADOWMAP=阴影图 - value.DEBUG_VIEW.debug_NORMALS=法线 - value.DEBUG_VIEW.debug_SPECULAR=高光 - value.DEBUG_VIEW.debug_INDIRECT=间接照明 - value.DEBUG_VIEW.debug_DIRECT=直接照明 - value.DEBUG_VIEW.debug_VIEW_POSITION=View Position - value.DEBUG_VIEW.debug_DH_WATER_BLENDING=DH 水体混合 - option.display_LUT=显示 LUT - option.WhiteWorld=全白世界 - option.WhiteWorld.comment=用于调试的视图. 易于观察环境光遮蔽的效果. 易于观察模拟全局光照 (绿光) 的效果. - option.SSS_view=次表面散射视图 - option.ambientLight_only=仅启用环境光 - option.ambientLight_only.comment=用于调试的视图. 关闭太阳光. 此选项不会影响性能,阴影依旧会在后台工作. - option.Glass_Tint=玻璃色调 - option.Glass_Tint.comment=背景通过混合玻璃本身的颜色获得强烈的色调. - option.LIGHTNING_FLASH=闪电闪烁 - option.HURT_AND_DEATH_EFFECT=死伤效果 - option.LIT_PARTICLE_BRIGHTNESS=提高粒子亮度 - option.PLANET_GROUND_BRIGHTNESS=行星地表亮度 - option.BLOOMY_PARTICLES=泛光粒子 - option.ORIGINAL_CHOCAPIC_SKY=原始 Chocapic 天空 - option.BIOME_TINT_WATER=群系色调水体 - option.CLOUDS_INFRONT_OF_WORLD=云层在世界前渲染 - option.SELECT_BOX=选择框 - option.DENOISE_SSS_AND_SSAO=对 SSS和 SSAOO 降噪 - option.WATER_CAUSTICS_BRIGHTNESS=水体焦散线亮度 - option.HYPER_DETAILED_WAVES=超细节水波 - option.OLD_BLOOM=旧版泛光 - - -#Climate - screen.Seasons=季节 - suffix.Season_Length=MC日 - -#DH settings - option.DH_OVERDRAW_PREVENTION=防止过度绘制 \ No newline at end of file +option.SATURATION.comment = §b这是什么？§r 这控制图像的"色彩鲜艳"程度。负值带走颜色 - 正值使它们更强烈。 +option.CROSSTALK.comment = §b这是什么？§r 这是饱和度的修饰符 - 它偏移图像明亮部分的饱和度。 +option.WHITE_BALANCE.comment = §b这是什么？§r 这控制图像看起来是暖还是冷 - 它平衡蓝色和红色。 +option.TAA_MODE.comment = §b标准：§r 具有最好的抗锯齿能力 - 使用更多的抖动偏移，但需要更多的帧历史（设置较低的混合因子），它会闪烁更多并有更多的运动伪影。 §b响应式：§r 具有最差的抗锯齿能力 - 使用较少的抖动偏移，需要较少的帧历史（设置较高的混合因子），因此它可以有较少的运动伪影。 §b时间性升采样：§r 以较低的窗口分辨率渲染着色器，然后缩放回适合屏幕的大小以获得更好的性能 - 有许多伪影。 +option.MOTION_BLUR.comment = §b这是什么？§r 此效果使整个屏幕在您移动摄像机或在世界中移动的任何方向模糊。 §a性能消耗：§r 非常低 +option.CHROMATIC_ABERRATION.comment = §b这是什么？§r 此效果使屏幕边缘出现红色和蓝色的色彩偏移。 §a性能消耗：§r 非常非常低 +option.VIGNETTE.comment = §b这是什么？§r 此效果使屏幕边缘越靠近边缘越暗。 §a性能消耗：§r 非常非常低 +option.TONEMAP.comment = §b这是什么？§r 这将内部 HDR 或着色器正在进行的任何颜色范围适配到您的 SDR 显示器上看起来不错。它将控制一般的色彩处理 - 对比度、饱和度、白点、黑点、色调偏移、到白色的路径等 - 每个都有不同的外观。 \ No newline at end of file diff --git a/shaders/lib/DistantHorizons_projections.glsl b/shaders/lib/DistantHorizons_projections.glsl index e8ba75c..eec40a4 100644 --- a/shaders/lib/DistantHorizons_projections.glsl +++ b/shaders/lib/DistantHorizons_projections.glsl @@ -4,13 +4,27 @@ uniform mat4 dhPreviousProjection; uniform mat4 dhProjectionInverse; uniform mat4 dhProjection; +uniform mat4 vxProj; +uniform mat4 vxProjInv; +uniform mat4 vxProjPrev; + +#ifdef DISTANT_HORIZONS + #define dhVoxyProjection dhProjection + #define dhVoxyProjectionInverse dhProjectionInverse + #define dhVoxyProjectionPrev dhPreviousProjection +#else + #define dhVoxyProjection vxProj + #define dhVoxyProjectionInverse vxProjInv + #define dhVoxyProjectionPrev vxProjPrev +#endif + vec3 toScreenSpace_DH( vec2 texcoord, float depth, float DHdepth ) { vec4 viewPos = vec4(0.0); vec3 feetPlayerPos = vec3(0.0); vec4 iProjDiag = vec4(0.0); - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY if (depth < 1.0) { #endif iProjDiag = vec4(gbufferProjectionInverse[0].x, gbufferProjectionInverse[1].y, gbufferProjectionInverse[2].zw); @@ -19,12 +33,12 @@ vec3 toScreenSpace_DH( vec2 texcoord, float depth, float DHdepth ) { viewPos = iProjDiag * feetPlayerPos.xyzz + gbufferProjectionInverse[3]; viewPos.xyz /= viewPos.w; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY } else { - iProjDiag = vec4(dhProjectionInverse[0].x, dhProjectionInverse[1].y, dhProjectionInverse[2].zw); + iProjDiag = vec4(dhVoxyProjectionInverse[0].x, dhVoxyProjectionInverse[1].y, dhVoxyProjectionInverse[2].zw); feetPlayerPos = vec3(texcoord, DHdepth) * 2.0 - 1.0; - viewPos = iProjDiag * feetPlayerPos.xyzz + dhProjectionInverse[3]; + viewPos = iProjDiag * feetPlayerPos.xyzz + dhVoxyProjectionInverse[3]; viewPos.xyz /= viewPos.w; } #endif @@ -33,8 +47,8 @@ vec3 toScreenSpace_DH( vec2 texcoord, float depth, float DHdepth ) { } vec3 toClipSpace3_DH( vec3 viewSpacePosition, bool depthCheck ) { - #ifdef DISTANT_HORIZONS - mat4 projectionMatrix = depthCheck ? dhProjection : gbufferProjection; + #if defined DISTANT_HORIZONS || defined VOXY + mat4 projectionMatrix = depthCheck ? dhVoxyProjection : gbufferProjection; return projMAD(projectionMatrix, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; #else return projMAD(gbufferProjection, viewSpacePosition) / -viewSpacePosition.z * 0.5 + 0.5; @@ -48,8 +62,8 @@ mat4 DH_shadowProjectionTweak( in mat4 projection){ float _far = (3.0 * far); - #ifdef DISTANT_HORIZONS - _far = 2.0 * dhFarPlane; + #if defined DISTANT_HORIZONS || defined VOXY + _far = 2.0 * dhVoxyFarPlane; #endif mat4 newProjection = projection; diff --git a/shaders/lib/Shadow_Params.glsl b/shaders/lib/Shadow_Params.glsl index 409ae2e..3621056 100644 --- a/shaders/lib/Shadow_Params.glsl +++ b/shaders/lib/Shadow_Params.glsl @@ -1,5 +1,7 @@ +#ifndef VOXY_PROGRAM uniform float far; -uniform int dhRenderDistance; +uniform int dhVoxyRenderDistance; +#endif const float k = 1.8; const float d0 = 0.04 + (1.0-clamp(shadowDistance-64.0, 0.0,1.0)) * 0.1; @@ -9,7 +11,7 @@ float b = (exp(d1)-a)*150./128.0; // thank you Espen // #ifdef DISTANT_HORIZONS_SHADOWMAP -// float b = (exp(d1)-a)*min(dhRenderDistance, shadowDistance)/shadowDistance; +// float b = (exp(d1)-a)*min(dhVoxyRenderDistance, shadowDistance)/shadowDistance; // #else // float b = (exp(d1)-a)*min(far+16.0*3.5, shadowDistance)/shadowDistance; // #endif diff --git a/shaders/lib/diffuse_lighting.glsl b/shaders/lib/diffuse_lighting.glsl index ca8efb8..846ba07 100644 --- a/shaders/lib/diffuse_lighting.glsl +++ b/shaders/lib/diffuse_lighting.glsl @@ -24,8 +24,8 @@ float _near = near; float _far = far*4.0; if (depthCheck) { - _near = dhNearPlane; - _far = dhFarPlane; + _near = dhVoxyNearPlane; + _far = dhVoxyFarPlane; } vec3 position = toClipSpace3_DH(viewPos, depthCheck) ; @@ -49,8 +49,8 @@ float samplePos = texelFetch2D(depthtex2, ivec2(newPos.xy/texelSize).xy,0).x; - #ifdef DISTANT_HORIZONS - if(depthCheck) samplePos = texelFetch2D(dhDepthTex1, ivec2(newPos.xy/texelSize),0).x; + #if defined DISTANT_HORIZONS || defined VOXY + if(depthCheck) samplePos = texelFetch2D(dhVoxyDepthTex1, ivec2(newPos.xy/texelSize),0).x; #endif if(samplePos < newPos.z && samplePos > 0.0){// && (samplePos <= max(minZ,maxZ) && samplePos >= min(minZ,maxZ))){ diff --git a/shaders/lib/indirect_lighting_effects.glsl b/shaders/lib/indirect_lighting_effects.glsl index 8f41922..1676bda 100644 --- a/shaders/lib/indirect_lighting_effects.glsl +++ b/shaders/lib/indirect_lighting_effects.glsl @@ -62,7 +62,7 @@ vec4 BilateralUpscale_SSAO(sampler2D tex, sampler2D depth, vec2 coord, float ref // ivec2(0,-1), // ivec2(-1,0) // ); - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float diffThreshold = 0.0005 ; #else float diffThreshold = 0.005; @@ -74,7 +74,7 @@ vec4 BilateralUpscale_SSAO(sampler2D tex, sampler2D depth, vec2 coord, float ref for (int i = 0; i < 4; i++) { ivec2 radius = getRadius[i]; - #ifdef DISTANT_HORIZONS + #if defined DISTANT_HORIZONS || defined VOXY float offsetDepth = sqrt(texelFetch2D(depth, posDepth + radius * scaling + pos * scaling,0).a/65000.0); #else float offsetDepth = ld(texelFetch2D(depth, posDepth + radius * scaling + pos * scaling, 0).r); diff --git a/shaders/lib/overworld_fog.glsl b/shaders/lib/overworld_fog.glsl index 493b11b..daf521d 100644 --- a/shaders/lib/overworld_fog.glsl +++ b/shaders/lib/overworld_fog.glsl @@ -42,7 +42,7 @@ float cloudVol(in vec3 pos, float maxDistance ){ medium_gradientFog = mix(medium_gradientFog, 1.0, sandStorm+snowStorm); } - FogDensities(medium_gradientFog, cloudyFog, rainyFog, maxDistance, parameters.fog.x, parameters.fog.y); + FogDensities(medium_gradientFog, cloudyFog, rainyFog, maxDistance, SC_parameters.fog.x, SC_parameters.fog.y); return uniformFog + medium_gradientFog + cloudyFog + rainyFog; } @@ -105,8 +105,8 @@ vec4 GetVolumetricFog( vec3 dV = fragposition - start; vec3 dVWorld = wpos - gbufferModelViewInverse[3].xyz; - #ifdef DISTANT_HORIZONS - float maxLength = min(length(dVWorld), max(far, dhRenderDistance))/length(dVWorld); + #if defined DISTANT_HORIZONS || defined VOXY + float maxLength = min(length(dVWorld), max(far, dhVoxyRenderDistance))/length(dVWorld); #else float maxLength = min(length(dVWorld), far)/length(dVWorld); #endif diff --git a/shaders/lib/scene_controller.glsl b/shaders/lib/scene_controller.glsl index 10a09c8..6216050 100644 --- a/shaders/lib/scene_controller.glsl +++ b/shaders/lib/scene_controller.glsl @@ -190,13 +190,23 @@ void applySceneControllerParameters( // fog = (uniform fog density, cloudy fog density) // ... and more, eventually -flat varying struct sceneController { - vec2 smallCumulus; - vec2 largeCumulus; - vec2 altostratus; - vec2 cirrus; - vec2 fog; -} parameters; +#ifndef VOXY_PROGRAM + flat varying struct sceneController { + vec2 smallCumulus; + vec2 largeCumulus; + vec2 altostratus; + vec2 cirrus; + vec2 fog; + } SC_parameters; +#else + struct sceneController { + vec2 smallCumulus; + vec2 largeCumulus; + vec2 altostratus; + vec2 cirrus; + vec2 fog; + } SC_parameters; +#endif vec3 writeSceneControllerParameters( vec2 uv, @@ -250,10 +260,10 @@ void readSceneControllerParameters( // in colortex4, read the data stored within the 3 components of the sampled pixels, and pass it to the fragment stage // 4th compnent/alpha is storing 1/4 res depth so i cant store there lol - vec3 data1 = texelFetch2D(colortex,ivec2(1,3),0).rgb/150.0; - vec3 data2 = texelFetch2D(colortex,ivec2(2,3),0).rgb/150.0; - vec3 data3 = texelFetch2D(colortex,ivec2(3,3),0).rgb/150.0; - vec3 data4 = texelFetch2D(colortex,ivec2(2,1),0).rgb/150.0; + vec3 data1 = texelFetch(colortex,ivec2(1,3),0).rgb/150.0; + vec3 data2 = texelFetch(colortex,ivec2(2,3),0).rgb/150.0; + vec3 data3 = texelFetch(colortex,ivec2(3,3),0).rgb/150.0; + vec3 data4 = texelFetch(colortex,ivec2(2,1),0).rgb/150.0; smallCumulus = vec2(data1.x,data1.y); largeCumulus = vec2(data1.z,data2.x); diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 618617d..9677dc6 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -420,10 +420,13 @@ uniform int moonPhase; #define daySpeed 1.0 // [0.1 0.125 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 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.5 3.0 3.5 4.0 4.5 5.0] #define nightSpeed 1.0 // [0.1 0.125 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 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.5 3.0 3.5 4.0 4.5 5.0] +#ifndef VOXY_PROGRAM uniform vec3 unsigned_WsunVecSmooth; +uniform vec3 unsigned_WmoonVecSmooth; +#endif + #define WsunVecSmooth normalize(unsigned_WsunVecSmooth) -uniform vec3 unsigned_WmoonVecSmooth; #define WmoonVecSmooth normalize(unsigned_WmoonVecSmooth) #define SKY_GROUND @@ -1055,6 +1058,17 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) #ifdef LPV_HANDHELD_SHADOWS #endif + +////////////////////////////////// +// ----- VOXY SETTINGS ----- // +////////////////////////////////// + +#define VOXY_REFLECTIONS + +#ifdef VOXY_REFLECTIONS +#endif + + //////////////////////////////// // ----- DEBUG SETTINGS ----- // //////////////////////////////// @@ -1155,4 +1169,5 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) #if CUMULONIMBUS == 0 && !defined CloudLayer0 && !defined CloudLayer1 && !defined CloudLayer2 && !defined CloudLayer3 #undef VOLUMETRIC_CLOUDS #undef CLOUDS_SHADOWS -#endif \ No newline at end of file +#endif + diff --git a/shaders/lib/sky_gradient.glsl b/shaders/lib/sky_gradient.glsl index 09e0f1b..fadd287 100644 --- a/shaders/lib/sky_gradient.glsl +++ b/shaders/lib/sky_gradient.glsl @@ -175,11 +175,11 @@ vec3 skyFromTex(vec3 pos,sampler2D sampler){ return texture2D(sampler,p*texelSize*256.+vec2(18.5,1.5)*texelSize).rgb; } -vec3 skyFromTexLOD(vec3 pos,sampler2D sampler, float LOD){ - vec2 p = sphereToCarte(pos); - - return texture2DLod(sampler,p*texelSize*256.+vec2(18.5,1.5)*texelSize,LOD).rgb; -} +// vec3 skyFromTexLOD(vec3 pos,sampler2D sampler, float LOD){ +// vec2 p = sphereToCarte(pos); +// +// return texture2DLod(sampler,p*texelSize*256.+vec2(18.5,1.5)*texelSize,LOD).rgb; +// } vec4 skyCloudsFromTex(vec3 pos,sampler2D sampler){ @@ -231,5 +231,5 @@ vec4 volumetricsFromTex(vec3 pos,sampler2D sampler, float LOD){ vec2 uv = p*texelSize*256. + vec2(256.0 - 256.0*0.12,1.5)*texelSize; - return texture2DLod(sampler, uv, LOD); + return texture2D(sampler, uv, LOD); } \ No newline at end of file diff --git a/shaders/lib/specular.glsl b/shaders/lib/specular.glsl index 72bec4b..4b7a89d 100644 --- a/shaders/lib/specular.glsl +++ b/shaders/lib/specular.glsl @@ -1,6 +1,6 @@ #if defined DISTANT_HORIZONS && defined DH_SCREENSPACE_REFLECTIONS float invLinZ_DH (float lindepth){ - return -((2.0*near/lindepth)-dhFarPlane-near)/(dhFarPlane-near); + return -((2.0*near/lindepth)-dhVoxyFarPlane-near)/(dhVoxyFarPlane-near); } #endif @@ -103,22 +103,6 @@ float shlickFresnelRoughness(float XdotN, float roughness){ return shlickFresnel; } -//vec2 directionToSphericalUV(vec3 direction) { -// vec3 dir = normalize(direction); -// -// float phi = atan(dir.z, dir.x); -// float theta = acos(clamp(dir.y, -1.0, 1.0)); -// -// float u = (phi + 3.1415926535) / (2.0 * 3.1415926535); -// float v = theta / 3.1415926535; -// v = 1.0 - v; -// -// return vec2(clamp(u, 0.0, 1.0), clamp(v, 0.0, 1.0)); -//} -// -// -//layout (rgba32f) uniform image2D reflectionSphere; -// #if defined DISTANT_HORIZONS && defined DH_SCREENSPACE_REFLECTIONS uniform vec4 combined_projection_matrix_0; uniform vec4 combined_projection_matrix_1; @@ -127,7 +111,7 @@ float shlickFresnelRoughness(float XdotN, float roughness){ #define combined_projection_matrix mat4(combined_projection_matrix_0, combined_projection_matrix_1, combined_projection_matrix_2, combined_projection_matrix_3) float invertLinearizeDepthFast(const in float z) { - return (dhFarPlane * (z - near)) / (z * (dhFarPlane - near)); + return (dhVoxyFarPlane * (z - near)) / (z * (dhVoxyFarPlane - near)); } #endif @@ -187,7 +171,7 @@ vec3 rayTraceSpeculars(vec3 dir, vec3 position, float dither, float quality, boo float sampleDepth = texelFetch2D(colortex12, ivec2(spos.xy/texelSize/4.0),0).a/65000.0; #endif - float sp = invertLinearizeDepthFast(sqrt(sampleDepth)*dhFarPlane); + float sp = invertLinearizeDepthFast(sqrt(sampleDepth)*dhVoxyFarPlane); #else float sampleDepth = texelFetch2D(colortex4, ivec2(spos.xy/texelSize/4.0),0).a/65000.0; float sp = invLinZ(sqrt(sampleDepth)); diff --git a/shaders/lib/volumetricClouds.glsl b/shaders/lib/volumetricClouds.glsl index 84faa52..f6ae3dd 100644 --- a/shaders/lib/volumetricClouds.glsl +++ b/shaders/lib/volumetricClouds.glsl @@ -130,7 +130,7 @@ float getCloudShape(int LayerIndex, int LOD, in vec3 position, float minHeight, default : { break; } case CIRRUS_LAYER: { - coverage = parameters.cirrus.x; + coverage = SC_parameters.cirrus.x; vec2 coord = position.zx + 6.0*cloud_movement; @@ -166,7 +166,7 @@ float getCloudShape(int LayerIndex, int LOD, in vec3 position, float minHeight, break; } case ALTOSTRATUS_LAYER: { - coverage = parameters.altostratus.x; + coverage = SC_parameters.altostratus.x; coverage += Rain_coverage * rainStrength; coverage += Thunder_coverage * thunderStrength; @@ -185,7 +185,7 @@ float getCloudShape(int LayerIndex, int LOD, in vec3 position, float minHeight, break; } case LARGECUMULUS_LAYER: { - coverage = parameters.largeCumulus.x; + coverage = SC_parameters.largeCumulus.x; coverage += Rain_coverage * rainStrength; coverage += Thunder_coverage * thunderStrength; @@ -201,7 +201,7 @@ float getCloudShape(int LayerIndex, int LOD, in vec3 position, float minHeight, break; } case SMALLCUMULUS_LAYER: { - coverage = parameters.smallCumulus.x; + coverage = SC_parameters.smallCumulus.x; coverage += Rain_coverage * rainStrength; coverage += Thunder_coverage * thunderStrength; @@ -420,15 +420,15 @@ float GetCloudShadow(vec3 playerPos, vec3 sunVector){ #ifdef CloudLayer0 startPosition = playerPos + startOffset * max((CloudLayer0_height + 20.0) - playerPos.y, 0.0); - cloudShadows = getCloudShape(SMALLCUMULUS_LAYER, 0, startPosition, CloudLayer0_height, CloudLayer0_height + CloudLayer0_tallness/CloudLayer0_scale)*(getRainDensity(parameters.smallCumulus.y)); + cloudShadows = getCloudShape(SMALLCUMULUS_LAYER, 0, startPosition, CloudLayer0_height, CloudLayer0_height + CloudLayer0_tallness/CloudLayer0_scale)*(getRainDensity(SC_parameters.smallCumulus.y)); #endif #ifdef CloudLayer1 startPosition = playerPos + startOffset * max((CloudLayer1_height + 30.0) - playerPos.y, 0.0); - cloudShadows += getCloudShape(LARGECUMULUS_LAYER, 0, startPosition, CloudLayer1_height, CloudLayer1_height + CloudLayer1_tallness/CloudLayer1_scale)*(getRainDensity(parameters.largeCumulus.y)); + cloudShadows += getCloudShape(LARGECUMULUS_LAYER, 0, startPosition, CloudLayer1_height, CloudLayer1_height + CloudLayer1_tallness/CloudLayer1_scale)*(getRainDensity(SC_parameters.largeCumulus.y)); #endif #ifdef CloudLayer2 startPosition = playerPos + startOffset * max(CloudLayer2_height - playerPos.y, 0.0); - cloudShadows += getCloudShape(ALTOSTRATUS_LAYER, 0, startPosition, CloudLayer2_height, CloudLayer2_height + 5.0)*parameters.altostratus.y * (1.0-abs(WsunVec.y)); + cloudShadows += getCloudShape(ALTOSTRATUS_LAYER, 0, startPosition, CloudLayer2_height, CloudLayer2_height + 5.0)*SC_parameters.altostratus.y * (1.0-abs(sunVector.y)); #endif #if CUMULONIMBUS > 0 float distanceFactor = clamp(degrees(acos(dot(vec3(0.0, 1.0, 0.0), sunVector))), 45.0, 90.0) - 45.0; @@ -656,10 +656,10 @@ vec4 raymarchCloud( vec3 newPos = rayPosition - cameraPosition; if(LayerIndex == ALTOSTRATUS_LAYER) { - density = parameters.altostratus.y; + density = SC_parameters.altostratus.y; density *= smoothstep(CloudLayer2_distance, CloudLayer2_distance*0.5, length(newPos)); } else { - density = parameters.cirrus.y; + density = SC_parameters.cirrus.y; density *= smoothstep(CloudLayer3_distance, CloudLayer3_distance*0.5, length(newPos)); } if (density == 0.0) return vec4(color, totalAbsorbance); @@ -713,13 +713,13 @@ vec4 raymarchCloud( vec3 newPos = rayPosition - cameraPosition; - float densityLarge = getRainDensity(parameters.largeCumulus.y); + float densityLarge = getRainDensity(SC_parameters.largeCumulus.y); float density = 0.0; - if(LayerIndex == SMALLCUMULUS_LAYER) density = getRainDensity(parameters.smallCumulus.y) * smoothstep(CloudLayer0_distance, CloudLayer0_distance*0.5, length(newPos)); + if(LayerIndex == SMALLCUMULUS_LAYER) density = getRainDensity(SC_parameters.smallCumulus.y) * smoothstep(CloudLayer0_distance, CloudLayer0_distance*0.5, length(newPos)); - if(LayerIndex == LARGECUMULUS_LAYER) density = getRainDensity(parameters.largeCumulus.y) * smoothstep(CloudLayer1_distance, CloudLayer1_distance*0.5, length(newPos)); + if(LayerIndex == LARGECUMULUS_LAYER) density = getRainDensity(SC_parameters.largeCumulus.y) * smoothstep(CloudLayer1_distance, CloudLayer1_distance*0.5, length(newPos)); if(LayerIndex == CUMULONIMBUS_LAYER) density = 0.8; @@ -818,7 +818,7 @@ vec4 raymarchCloud( // altostratus layer -> all cumulus layers #ifdef CloudLayer2 shadowStartPos = rayPosition + mainLightVec / abs(mainLightVec.y) * max(CloudLayer2_height - rayPosition.y, 0.0); - sunShadowMask += getCloudShape(ALTOSTRATUS_LAYER, 0, shadowStartPos, CloudLayer2_height, CloudLayer2_height) * parameters.altostratus.y * (1.0-abs(mainLightVec.y)); + sunShadowMask += getCloudShape(ALTOSTRATUS_LAYER, 0, shadowStartPos, CloudLayer2_height, CloudLayer2_height) * SC_parameters.altostratus.y * (1.0-abs(mainLightVec.y)); #endif vec3 lighting = getCloudLighting(LayerIndex, shapeWithDensity, shapeWithDensityFaded, sunShadowMask, sunScattering, moonScattering, indirectShadowMask, skyScattering*skylightOcclusion, rayPosition, backScatterPhase, phaseLevels, backScatterPhase2, phaseLevels2); @@ -937,8 +937,8 @@ vec4 GetVolumetricClouds( float heightRelativeToClouds = clamp(1.0 - max(cameraPosition.y - minHeight,0.0) / 100.0 ,0.0,1.0); - #if defined DISTANT_HORIZONS - float maxdist = dhFarPlane - 16.0; + #if defined DISTANT_HORIZONS || defined VOXY + float maxdist = dhVoxyFarPlane - 16.0; #else float maxdist = far + 16.0*5.0; #endif @@ -985,8 +985,8 @@ vec4 GetVolumetricClouds( // setup for getting distance vec3 playerPos = mat3(gbufferModelViewInverse) * viewPos; - #ifdef DISTANT_HORIZONS - float maxLength = min(length(playerPos), max(far, dhRenderDistance))/length(playerPos); + #if defined DISTANT_HORIZONS || defined VOXY + float maxLength = min(length(playerPos), max(far, dhVoxyRenderDistance))/length(playerPos); #else float maxLength = min(length(playerPos), far)/length(playerPos); #endif diff --git a/shaders/shaders.properties b/shaders/shaders.properties index 929d4fb..4fc735c 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -29,14 +29,6 @@ beacon.beam.depth = true iris.features.optional = ENTITY_TRANSLUCENT REVERSED_CULLING COMPUTE_SHADERS CUSTOM_IMAGES BLOCK_EMISSION_ATTRIBUTE SSBO TESSELLATION_SHADERS -#if RESOURCEPACK_SKY == 2 || RESOURCEPACK_SKY == 3 - sun=true - moon=true -#else - sun=false - moon=false -#endif - #ifdef REALMOON customTexture.moon = texture/moon.png #ifdef MOON_NORMALS @@ -101,6 +93,19 @@ iris.features.optional = ENTITY_TRANSLUCENT REVERSED_CULLING COMPUTE_SHADERS CUS separateEntityDraws = false #endif +#if RESOURCEPACK_SKY == 2 || RESOURCEPACK_SKY == 3 + sun=true + moon=true +#else + sun=false + moon=false +#endif + +#if RESOURCEPACK_SKY != 0 + particles.before.deferred=false + particles.ordering=after +#endif + program.world0/gbuffers_entities_translucent.enabled = TRANSLUCENT_ENTITIES && IS_IRIS program.world0/gbuffers_block_translucent.enabled = TRANSLUCENT_ENTITIES && IS_IRIS @@ -144,6 +149,12 @@ program.world0/composite5.enabled = TAA_UPSCALING program.world1/composite5.enabled = TAA_UPSCALING program.world-1/composite5.enabled = TAA_UPSCALING +#if RESOURCEPACK_SKY == 0 + program.world0/deferred2.enabled = false + program.world1/deferred2.enabled = false + program.world-1/deferred2.enabled = false +#endif + # SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO # SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE_MINUS_DST_ALPHA ONE #Get the correct alpha value : S_A*(1-DST_A)+DST_A @@ -502,11 +513,12 @@ SHADER_VERSION_LABEL \ ######## MOD SUPPORT SETTINGS - screen.Mod_support = [DISTANT_HORIZONS_SETTINGS] [PHYSICS_MOD_OCEAN] CAELUM_SUPPORT + screen.Mod_support = [DISTANT_HORIZONS_SETTINGS] [PHYSICS_MOD_OCEAN] [VOXY_SETTINGS] CAELUM_SUPPORT screen.DISTANT_HORIZONS_SETTINGS.columns = 1 screen.DISTANT_HORIZONS_SETTINGS = DH_OVERDRAW_PREVENTION OVERDRAW_MAX_DISTANCE DH_CHUNK_FADING DH_AMBIENT_OCCLUSION DH_SUBSURFACE_SCATTERING DH_SCREENSPACE_REFLECTIONS DH_TAA_JITTER DH_NOISE_TEXTURE NOISE_RESOLUTION NOISE_INTENSITY NOISE_DROPOFF DISTANT_HORIZONS_SHADOWMAP shadowDistance shadowMapResolution TOGGLE_VL_FOG VOLUMETRIC_CLOUDS + screen.VOXY_SETTINGS = VOXY_REFLECTIONS ######## MISC SETTINGS screen.Misc_Settings.columns = 2 @@ -800,7 +812,7 @@ uniform.vec2.texelSize = vec2(texelSizeX,texelSizeY) uniform.int.framemod8 = frameCounter%8 #endif -#if defined DISTANT_HORIZONS +#if defined DISTANT_HORIZONS || defined VOXY uniform.int.framemod4_DH = frameCounter%4 #endif @@ -913,6 +925,18 @@ uniform.float.worldTimeSmooth = if(worldTime > 200 || worldDayTime > 0, worldTim # # uniform.float.shadowMaxProj = 150.0/abs(sunPosY) +#ifdef VOXY +uniform.float.dhVoxyNearPlane = 16.0 +uniform.float.dhVoxyFarPlane = 48000.0 +uniform.int.dhVoxyRenderDistance = vxRenderDistance*16 +#else +uniform.float.dhVoxyNearPlane = dhNearPlane +uniform.float.dhVoxyFarPlane = dhFarPlane +uniform.int.dhVoxyRenderDistance = dhRenderDistance +#endif + +uniform.vec2.taa_offset = vec2(0.0, 0.0) + ############################### ####### FLOODFILL STUFF ####### @@ -956,11 +980,11 @@ uniform.float.worldTimeSmooth = if(worldTime > 200 || worldDayTime > 0, worldTim #endif uniform.float.combined_near = near -uniform.float.combined_far = dhFarPlane +uniform.float.combined_far = 48000 uniform.vec4.combined_projection_matrix_0 = vec4(gbufferProjection.0.0, 0.0, 0.0, 0.0) uniform.vec4.combined_projection_matrix_1 = vec4(0.0, gbufferProjection.1.1, 0.0, 0.0) -uniform.vec4.combined_projection_matrix_2 = vec4(gbufferProjection.2.0, gbufferProjection.2.1, -((near + dhFarPlane) / (dhFarPlane - near)), 0.0) -uniform.vec4.combined_projection_matrix_3 = vec4(0.0, 0.0, -((2.0 * dhFarPlane * near) / (dhFarPlane - near)), 0.0) +uniform.vec4.combined_projection_matrix_2 = vec4(gbufferProjection.2.0, gbufferProjection.2.1, -((near + combined_far) / (combined_far - near)), 0.0) +uniform.vec4.combined_projection_matrix_3 = vec4(0.0, 0.0, -((2.0 * combined_far * near) / (combined_far - near)), 0.0) #if defined CUSTOM_MOON_ROTATION || defined END_ISLAND_LIGHT bufferObject.0 = 512 diff --git a/shaders/world-1/composite.fsh b/shaders/world-1/composite.fsh index b3d9094..66f6ab3 100644 --- a/shaders/world-1/composite.fsh +++ b/shaders/world-1/composite.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite.vsh b/shaders/world-1/composite.vsh index 600a069..ef2263a 100644 --- a/shaders/world-1/composite.vsh +++ b/shaders/world-1/composite.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite1.fsh b/shaders/world-1/composite1.fsh index 4bf5740..4e6acd9 100644 --- a/shaders/world-1/composite1.fsh +++ b/shaders/world-1/composite1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite1.vsh b/shaders/world-1/composite1.vsh index 4f8641f..3aa12de 100644 --- a/shaders/world-1/composite1.vsh +++ b/shaders/world-1/composite1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite10.fsh b/shaders/world-1/composite10.fsh index a9a8cf0..be766ae 100644 --- a/shaders/world-1/composite10.fsh +++ b/shaders/world-1/composite10.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite10.vsh b/shaders/world-1/composite10.vsh index 689d9f1..32fcdd6 100644 --- a/shaders/world-1/composite10.vsh +++ b/shaders/world-1/composite10.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite11.fsh b/shaders/world-1/composite11.fsh index a3aa2b5..1fb434c 100644 --- a/shaders/world-1/composite11.fsh +++ b/shaders/world-1/composite11.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite11.vsh b/shaders/world-1/composite11.vsh index 8d94ad6..6e6ea8e 100644 --- a/shaders/world-1/composite11.vsh +++ b/shaders/world-1/composite11.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite12.fsh b/shaders/world-1/composite12.fsh index 142fcad..af1dff7 100644 --- a/shaders/world-1/composite12.fsh +++ b/shaders/world-1/composite12.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite12.vsh b/shaders/world-1/composite12.vsh index b00a4f3..4856d8d 100644 --- a/shaders/world-1/composite12.vsh +++ b/shaders/world-1/composite12.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite13.fsh b/shaders/world-1/composite13.fsh index 64dbb70..2127413 100644 --- a/shaders/world-1/composite13.fsh +++ b/shaders/world-1/composite13.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite13.vsh b/shaders/world-1/composite13.vsh index 5e3c539..71581ac 100644 --- a/shaders/world-1/composite13.vsh +++ b/shaders/world-1/composite13.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite2.fsh b/shaders/world-1/composite2.fsh index 458d02b..0a48520 100644 --- a/shaders/world-1/composite2.fsh +++ b/shaders/world-1/composite2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite2.vsh b/shaders/world-1/composite2.vsh index 477b9a3..55e8c83 100644 --- a/shaders/world-1/composite2.vsh +++ b/shaders/world-1/composite2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite3.fsh b/shaders/world-1/composite3.fsh index 0c105dd..403f5ba 100644 --- a/shaders/world-1/composite3.fsh +++ b/shaders/world-1/composite3.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite3.vsh b/shaders/world-1/composite3.vsh index 2243611..41c9380 100644 --- a/shaders/world-1/composite3.vsh +++ b/shaders/world-1/composite3.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite4.fsh b/shaders/world-1/composite4.fsh index b0e8151..036f70b 100644 --- a/shaders/world-1/composite4.fsh +++ b/shaders/world-1/composite4.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite4.vsh b/shaders/world-1/composite4.vsh index 1052c38..976e9d0 100644 --- a/shaders/world-1/composite4.vsh +++ b/shaders/world-1/composite4.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite5.fsh b/shaders/world-1/composite5.fsh index 1d7100a..0575956 100644 --- a/shaders/world-1/composite5.fsh +++ b/shaders/world-1/composite5.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite5.vsh b/shaders/world-1/composite5.vsh index 280db08..24292ed 100644 --- a/shaders/world-1/composite5.vsh +++ b/shaders/world-1/composite5.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite6.fsh b/shaders/world-1/composite6.fsh index 084e8c2..395f8e7 100644 --- a/shaders/world-1/composite6.fsh +++ b/shaders/world-1/composite6.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite6.vsh b/shaders/world-1/composite6.vsh index 1216033..30961fd 100644 --- a/shaders/world-1/composite6.vsh +++ b/shaders/world-1/composite6.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite7.fsh b/shaders/world-1/composite7.fsh index 323f7ce..e4c7c3c 100644 --- a/shaders/world-1/composite7.fsh +++ b/shaders/world-1/composite7.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite7.vsh b/shaders/world-1/composite7.vsh index 5542785..0ace78a 100644 --- a/shaders/world-1/composite7.vsh +++ b/shaders/world-1/composite7.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite8.fsh b/shaders/world-1/composite8.fsh index d900121..a4bddbc 100644 --- a/shaders/world-1/composite8.fsh +++ b/shaders/world-1/composite8.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite8.vsh b/shaders/world-1/composite8.vsh index 3d8cd0d..5580b1e 100644 --- a/shaders/world-1/composite8.vsh +++ b/shaders/world-1/composite8.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite9.fsh b/shaders/world-1/composite9.fsh index 0842798..44736bf 100644 --- a/shaders/world-1/composite9.fsh +++ b/shaders/world-1/composite9.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/composite9.vsh b/shaders/world-1/composite9.vsh index 05e41c8..c0d9dab 100644 --- a/shaders/world-1/composite9.vsh +++ b/shaders/world-1/composite9.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/deferred.fsh b/shaders/world-1/deferred.fsh index d1988d8..1dc2793 100644 --- a/shaders/world-1/deferred.fsh +++ b/shaders/world-1/deferred.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/deferred.vsh b/shaders/world-1/deferred.vsh index 9aac366..06a1708 100644 --- a/shaders/world-1/deferred.vsh +++ b/shaders/world-1/deferred.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/deferred1.fsh b/shaders/world-1/deferred1.fsh index e53788a..b7c908a 100644 --- a/shaders/world-1/deferred1.fsh +++ b/shaders/world-1/deferred1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/deferred1.vsh b/shaders/world-1/deferred1.vsh index 6087ec2..fff8dc8 100644 --- a/shaders/world-1/deferred1.vsh +++ b/shaders/world-1/deferred1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/dh_terrain.fsh b/shaders/world-1/dh_terrain.fsh index 9aa08e4..4c6bccf 100644 --- a/shaders/world-1/dh_terrain.fsh +++ b/shaders/world-1/dh_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/dh_terrain.vsh b/shaders/world-1/dh_terrain.vsh index 1d895e6..0921e72 100644 --- a/shaders/world-1/dh_terrain.vsh +++ b/shaders/world-1/dh_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/dh_water.fsh b/shaders/world-1/dh_water.fsh index 0fcd550..e56a776 100644 --- a/shaders/world-1/dh_water.fsh +++ b/shaders/world-1/dh_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/dh_water.vsh b/shaders/world-1/dh_water.vsh index 005e77e..42b86a9 100644 --- a/shaders/world-1/dh_water.vsh +++ b/shaders/world-1/dh_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/final.fsh b/shaders/world-1/final.fsh index fec1fb4..7f0a39e 100644 --- a/shaders/world-1/final.fsh +++ b/shaders/world-1/final.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/final.vsh b/shaders/world-1/final.vsh index ad4b530..7a3f1ba 100644 --- a/shaders/world-1/final.vsh +++ b/shaders/world-1/final.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_armor_glint.fsh b/shaders/world-1/gbuffers_armor_glint.fsh index 5e405a5..0d736cc 100644 --- a/shaders/world-1/gbuffers_armor_glint.fsh +++ b/shaders/world-1/gbuffers_armor_glint.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world-1/gbuffers_armor_glint.vsh b/shaders/world-1/gbuffers_armor_glint.vsh index 328a320..01a4c43 100644 --- a/shaders/world-1/gbuffers_armor_glint.vsh +++ b/shaders/world-1/gbuffers_armor_glint.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world-1/gbuffers_basic.fsh b/shaders/world-1/gbuffers_basic.fsh index b5ff73e..1c095a4 100644 --- a/shaders/world-1/gbuffers_basic.fsh +++ b/shaders/world-1/gbuffers_basic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_basic.vsh b/shaders/world-1/gbuffers_basic.vsh index 558df94..bc5dd5b 100644 --- a/shaders/world-1/gbuffers_basic.vsh +++ b/shaders/world-1/gbuffers_basic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_beaconbeam.fsh b/shaders/world-1/gbuffers_beaconbeam.fsh index de7e25b..9b43c38 100644 --- a/shaders/world-1/gbuffers_beaconbeam.fsh +++ b/shaders/world-1/gbuffers_beaconbeam.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world-1/gbuffers_beaconbeam.vsh b/shaders/world-1/gbuffers_beaconbeam.vsh index ef2815b..38f7ac2 100644 --- a/shaders/world-1/gbuffers_beaconbeam.vsh +++ b/shaders/world-1/gbuffers_beaconbeam.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world-1/gbuffers_block.fsh b/shaders/world-1/gbuffers_block.fsh index c43cbc5..f1a5cfe 100644 --- a/shaders/world-1/gbuffers_block.fsh +++ b/shaders/world-1/gbuffers_block.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world-1/gbuffers_block.vsh b/shaders/world-1/gbuffers_block.vsh index 5a960bb..abd351a 100644 --- a/shaders/world-1/gbuffers_block.vsh +++ b/shaders/world-1/gbuffers_block.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world-1/gbuffers_block_translucent.fsh b/shaders/world-1/gbuffers_block_translucent.fsh index 4d1e3a7..bfa892e 100644 --- a/shaders/world-1/gbuffers_block_translucent.fsh +++ b/shaders/world-1/gbuffers_block_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_block_translucent.vsh b/shaders/world-1/gbuffers_block_translucent.vsh index 868aee9..8d6e2ff 100644 --- a/shaders/world-1/gbuffers_block_translucent.vsh +++ b/shaders/world-1/gbuffers_block_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_damagedblock.fsh b/shaders/world-1/gbuffers_damagedblock.fsh index fb5a0e8..2d583cc 100644 --- a/shaders/world-1/gbuffers_damagedblock.fsh +++ b/shaders/world-1/gbuffers_damagedblock.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_damagedblock.vsh b/shaders/world-1/gbuffers_damagedblock.vsh index c2676b1..2f4ab0b 100644 --- a/shaders/world-1/gbuffers_damagedblock.vsh +++ b/shaders/world-1/gbuffers_damagedblock.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_entities.fsh b/shaders/world-1/gbuffers_entities.fsh index 46b0b7f..f856477 100644 --- a/shaders/world-1/gbuffers_entities.fsh +++ b/shaders/world-1/gbuffers_entities.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define ENTITIES diff --git a/shaders/world-1/gbuffers_entities.vsh b/shaders/world-1/gbuffers_entities.vsh index 49788a3..d3c9514 100644 --- a/shaders/world-1/gbuffers_entities.vsh +++ b/shaders/world-1/gbuffers_entities.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility // #define WORLD diff --git a/shaders/world-1/gbuffers_entities_glowing.fsh b/shaders/world-1/gbuffers_entities_glowing.fsh index c2a8ff2..9ed3c10 100644 --- a/shaders/world-1/gbuffers_entities_glowing.fsh +++ b/shaders/world-1/gbuffers_entities_glowing.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world-1/gbuffers_entities_glowing.vsh b/shaders/world-1/gbuffers_entities_glowing.vsh index 9588c1a..dd19f6b 100644 --- a/shaders/world-1/gbuffers_entities_glowing.vsh +++ b/shaders/world-1/gbuffers_entities_glowing.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world-1/gbuffers_entities_translucent.fsh b/shaders/world-1/gbuffers_entities_translucent.fsh index ffb65b1..ab8c433 100644 --- a/shaders/world-1/gbuffers_entities_translucent.fsh +++ b/shaders/world-1/gbuffers_entities_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_entities_translucent.vsh b/shaders/world-1/gbuffers_entities_translucent.vsh index a63f9e2..bb401a2 100644 --- a/shaders/world-1/gbuffers_entities_translucent.vsh +++ b/shaders/world-1/gbuffers_entities_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_hand.fsh b/shaders/world-1/gbuffers_hand.fsh index 541db01..b555781 100644 --- a/shaders/world-1/gbuffers_hand.fsh +++ b/shaders/world-1/gbuffers_hand.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world-1/gbuffers_hand.vsh b/shaders/world-1/gbuffers_hand.vsh index 960526b..f80abac 100644 --- a/shaders/world-1/gbuffers_hand.vsh +++ b/shaders/world-1/gbuffers_hand.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world-1/gbuffers_hand_water.fsh b/shaders/world-1/gbuffers_hand_water.fsh index d9c8ac8..b3a77a5 100644 --- a/shaders/world-1/gbuffers_hand_water.fsh +++ b/shaders/world-1/gbuffers_hand_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_hand_water.vsh b/shaders/world-1/gbuffers_hand_water.vsh index 0b12897..9a87227 100644 --- a/shaders/world-1/gbuffers_hand_water.vsh +++ b/shaders/world-1/gbuffers_hand_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_lightning.fsh b/shaders/world-1/gbuffers_lightning.fsh index a03a061..7ba4bf6 100644 --- a/shaders/world-1/gbuffers_lightning.fsh +++ b/shaders/world-1/gbuffers_lightning.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_lightning.vsh b/shaders/world-1/gbuffers_lightning.vsh index 88c2f5c..98ceff6 100644 --- a/shaders/world-1/gbuffers_lightning.vsh +++ b/shaders/world-1/gbuffers_lightning.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_skybasic.fsh b/shaders/world-1/gbuffers_skybasic.fsh index 17c2182..2ece8fa 100644 --- a/shaders/world-1/gbuffers_skybasic.fsh +++ b/shaders/world-1/gbuffers_skybasic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility /* RENDERTARGETS:0 */ diff --git a/shaders/world-1/gbuffers_skybasic.vsh b/shaders/world-1/gbuffers_skybasic.vsh index 6cf9c57..4d7379d 100644 --- a/shaders/world-1/gbuffers_skybasic.vsh +++ b/shaders/world-1/gbuffers_skybasic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world-1/gbuffers_skytextured.fsh b/shaders/world-1/gbuffers_skytextured.fsh index c6e242e..85dc748 100644 --- a/shaders/world-1/gbuffers_skytextured.fsh +++ b/shaders/world-1/gbuffers_skytextured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { diff --git a/shaders/world-1/gbuffers_skytextured.vsh b/shaders/world-1/gbuffers_skytextured.vsh index bd73477..c47b076 100644 --- a/shaders/world-1/gbuffers_skytextured.vsh +++ b/shaders/world-1/gbuffers_skytextured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world-1/gbuffers_spidereyes.fsh b/shaders/world-1/gbuffers_spidereyes.fsh index 15cdcc2..ee5e2a7 100644 --- a/shaders/world-1/gbuffers_spidereyes.fsh +++ b/shaders/world-1/gbuffers_spidereyes.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world-1/gbuffers_spidereyes.vsh b/shaders/world-1/gbuffers_spidereyes.vsh index adf4440..1574d95 100644 --- a/shaders/world-1/gbuffers_spidereyes.vsh +++ b/shaders/world-1/gbuffers_spidereyes.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world-1/gbuffers_terrain.fsh b/shaders/world-1/gbuffers_terrain.fsh index 6b252f2..369f3b2 100644 --- a/shaders/world-1/gbuffers_terrain.fsh +++ b/shaders/world-1/gbuffers_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_terrain.vsh b/shaders/world-1/gbuffers_terrain.vsh index 2c06296..b1c046c 100644 --- a/shaders/world-1/gbuffers_terrain.vsh +++ b/shaders/world-1/gbuffers_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_textured.fsh b/shaders/world-1/gbuffers_textured.fsh index e7c715e..3cbd5b5 100644 --- a/shaders/world-1/gbuffers_textured.fsh +++ b/shaders/world-1/gbuffers_textured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_textured.vsh b/shaders/world-1/gbuffers_textured.vsh index 169a61c..e0b7c60 100644 --- a/shaders/world-1/gbuffers_textured.vsh +++ b/shaders/world-1/gbuffers_textured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world-1/gbuffers_textured_lit.fsh b/shaders/world-1/gbuffers_textured_lit.fsh index 062371e..e9d5e80 100644 --- a/shaders/world-1/gbuffers_textured_lit.fsh +++ b/shaders/world-1/gbuffers_textured_lit.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world-1/gbuffers_textured_lit.vsh b/shaders/world-1/gbuffers_textured_lit.vsh index 399cf88..50a548a 100644 --- a/shaders/world-1/gbuffers_textured_lit.vsh +++ b/shaders/world-1/gbuffers_textured_lit.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world-1/gbuffers_water.fsh b/shaders/world-1/gbuffers_water.fsh index 5d2f6af..7695349 100644 --- a/shaders/world-1/gbuffers_water.fsh +++ b/shaders/world-1/gbuffers_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER diff --git a/shaders/world-1/gbuffers_water.vsh b/shaders/world-1/gbuffers_water.vsh index 9e37f1f..5db6f32 100644 --- a/shaders/world-1/gbuffers_water.vsh +++ b/shaders/world-1/gbuffers_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define NETHER diff --git a/shaders/world-1/gbuffers_weather.fsh b/shaders/world-1/gbuffers_weather.fsh index 0183f80..feea247 100644 --- a/shaders/world-1/gbuffers_weather.fsh +++ b/shaders/world-1/gbuffers_weather.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define NETHER_SHADER diff --git a/shaders/world-1/gbuffers_weather.vsh b/shaders/world-1/gbuffers_weather.vsh index eec3f66..672c78a 100644 --- a/shaders/world-1/gbuffers_weather.vsh +++ b/shaders/world-1/gbuffers_weather.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define NETHER_SHADER diff --git a/shaders/world-1/shadow.fsh b/shaders/world-1/shadow.fsh index be6b343..c87b7cc 100644 --- a/shaders/world-1/shadow.fsh +++ b/shaders/world-1/shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" diff --git a/shaders/world-1/shadow.vsh b/shaders/world-1/shadow.vsh index 0719bdb..0bc3c6c 100644 --- a/shaders/world-1/shadow.vsh +++ b/shaders/world-1/shadow.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #extension GL_ARB_explicit_attrib_location: enable #extension GL_ARB_shader_image_load_store: enable diff --git a/shaders/world0/clrwl_shadow.vsh b/shaders/world0/clrwl_shadow.vsh index 5caaaeb..9ca4318 100644 --- a/shaders/world0/clrwl_shadow.vsh +++ b/shaders/world0/clrwl_shadow.vsh @@ -129,7 +129,7 @@ bool intersectCone(float coneHalfAngle, vec3 coneTip , vec3 coneAxis, vec3 rayOr // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world0/composite.fsh b/shaders/world0/composite.fsh index 10276d6..873ad77 100644 --- a/shaders/world0/composite.fsh +++ b/shaders/world0/composite.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite.vsh b/shaders/world0/composite.vsh index 8ffc97e..633d168 100644 --- a/shaders/world0/composite.vsh +++ b/shaders/world0/composite.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite1.fsh b/shaders/world0/composite1.fsh index 75e8406..a57b438 100644 --- a/shaders/world0/composite1.fsh +++ b/shaders/world0/composite1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite1.vsh b/shaders/world0/composite1.vsh index 971ef89..86a67c7 100644 --- a/shaders/world0/composite1.vsh +++ b/shaders/world0/composite1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite10.fsh b/shaders/world0/composite10.fsh index 8a16e53..f71ab7e 100644 --- a/shaders/world0/composite10.fsh +++ b/shaders/world0/composite10.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite10.vsh b/shaders/world0/composite10.vsh index be8f736..7c7f700 100644 --- a/shaders/world0/composite10.vsh +++ b/shaders/world0/composite10.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite11.fsh b/shaders/world0/composite11.fsh index 15d8918..efc8a4d 100644 --- a/shaders/world0/composite11.fsh +++ b/shaders/world0/composite11.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite11.vsh b/shaders/world0/composite11.vsh index 7b0fb69..2b446a4 100644 --- a/shaders/world0/composite11.vsh +++ b/shaders/world0/composite11.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite12.fsh b/shaders/world0/composite12.fsh index c11b9a4..3096ea0 100644 --- a/shaders/world0/composite12.fsh +++ b/shaders/world0/composite12.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite12.vsh b/shaders/world0/composite12.vsh index 4be0999..ca8fe63 100644 --- a/shaders/world0/composite12.vsh +++ b/shaders/world0/composite12.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite13.fsh b/shaders/world0/composite13.fsh index 46ba8ae..bffc98f 100644 --- a/shaders/world0/composite13.fsh +++ b/shaders/world0/composite13.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite13.vsh b/shaders/world0/composite13.vsh index dd71d25..0d48cc0 100644 --- a/shaders/world0/composite13.vsh +++ b/shaders/world0/composite13.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite2.fsh b/shaders/world0/composite2.fsh index a805f6a..926a3d5 100644 --- a/shaders/world0/composite2.fsh +++ b/shaders/world0/composite2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite2.vsh b/shaders/world0/composite2.vsh index 9d06b94..e1444bc 100644 --- a/shaders/world0/composite2.vsh +++ b/shaders/world0/composite2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite3.fsh b/shaders/world0/composite3.fsh index 57d39a6..712641b 100644 --- a/shaders/world0/composite3.fsh +++ b/shaders/world0/composite3.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite3.vsh b/shaders/world0/composite3.vsh index 7fd2fb9..0ce7970 100644 --- a/shaders/world0/composite3.vsh +++ b/shaders/world0/composite3.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite4.fsh b/shaders/world0/composite4.fsh index 0adc382..b52ce05 100644 --- a/shaders/world0/composite4.fsh +++ b/shaders/world0/composite4.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite4.vsh b/shaders/world0/composite4.vsh index bc5147f..5a18679 100644 --- a/shaders/world0/composite4.vsh +++ b/shaders/world0/composite4.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite5.fsh b/shaders/world0/composite5.fsh index 3fe2d67..46e46f1 100644 --- a/shaders/world0/composite5.fsh +++ b/shaders/world0/composite5.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite5.vsh b/shaders/world0/composite5.vsh index d0761c2..f9a8d5e 100644 --- a/shaders/world0/composite5.vsh +++ b/shaders/world0/composite5.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite6.fsh b/shaders/world0/composite6.fsh index fa48f1e..5e1a4ba 100644 --- a/shaders/world0/composite6.fsh +++ b/shaders/world0/composite6.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite6.vsh b/shaders/world0/composite6.vsh index 75b7eb9..d3f49a3 100644 --- a/shaders/world0/composite6.vsh +++ b/shaders/world0/composite6.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite7.fsh b/shaders/world0/composite7.fsh index a5553b4..48d1324 100644 --- a/shaders/world0/composite7.fsh +++ b/shaders/world0/composite7.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite7.vsh b/shaders/world0/composite7.vsh index a05b0bf..78d6b78 100644 --- a/shaders/world0/composite7.vsh +++ b/shaders/world0/composite7.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite8.fsh b/shaders/world0/composite8.fsh index 4c34ad9..8c4930f 100644 --- a/shaders/world0/composite8.fsh +++ b/shaders/world0/composite8.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite8.vsh b/shaders/world0/composite8.vsh index 8b02c82..610f432 100644 --- a/shaders/world0/composite8.vsh +++ b/shaders/world0/composite8.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite9.fsh b/shaders/world0/composite9.fsh index 9e0e0bf..1be5604 100644 --- a/shaders/world0/composite9.fsh +++ b/shaders/world0/composite9.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/composite9.vsh b/shaders/world0/composite9.vsh index 46368f9..d8a1fe0 100644 --- a/shaders/world0/composite9.vsh +++ b/shaders/world0/composite9.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/deferred.fsh b/shaders/world0/deferred.fsh index 933af3d..828acb8 100644 --- a/shaders/world0/deferred.fsh +++ b/shaders/world0/deferred.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/deferred.vsh b/shaders/world0/deferred.vsh index 9ba70bc..b797cea 100644 --- a/shaders/world0/deferred.vsh +++ b/shaders/world0/deferred.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/deferred1.fsh b/shaders/world0/deferred1.fsh index 984b4a1..ac45cfd 100644 --- a/shaders/world0/deferred1.fsh +++ b/shaders/world0/deferred1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/deferred1.vsh b/shaders/world0/deferred1.vsh index 85b95cc..015d03f 100644 --- a/shaders/world0/deferred1.vsh +++ b/shaders/world0/deferred1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/deferred2.fsh b/shaders/world0/deferred2.fsh index 1e5d001..374eed8 100644 --- a/shaders/world0/deferred2.fsh +++ b/shaders/world0/deferred2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/deferred2.vsh b/shaders/world0/deferred2.vsh index d4d76e2..e435565 100644 --- a/shaders/world0/deferred2.vsh +++ b/shaders/world0/deferred2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/dh_generic.fsh b/shaders/world0/dh_generic.fsh index fc96742..a339b28 100644 --- a/shaders/world0/dh_generic.fsh +++ b/shaders/world0/dh_generic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/dh_generic.vsh b/shaders/world0/dh_generic.vsh index 8eb5666..6740c58 100644 --- a/shaders/world0/dh_generic.vsh +++ b/shaders/world0/dh_generic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/dh_shadow.fsh b/shaders/world0/dh_shadow.fsh index 3e03705..e278729 100644 --- a/shaders/world0/dh_shadow.fsh +++ b/shaders/world0/dh_shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility //#extension GL_ARB_shader_texture_lod : disable #include "/lib/settings.glsl" diff --git a/shaders/world0/dh_shadow.vsh b/shaders/world0/dh_shadow.vsh index 6837d25..cc99d4c 100644 --- a/shaders/world0/dh_shadow.vsh +++ b/shaders/world0/dh_shadow.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility /* !! DO NOT REMOVE !! @@ -33,7 +29,7 @@ flat varying int water; #define projMAD(m, v) (diagonal3(m) * (v) + (m)[3].xyz) // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world0/dh_terrain.fsh b/shaders/world0/dh_terrain.fsh index daf604d..cbfb09b 100644 --- a/shaders/world0/dh_terrain.fsh +++ b/shaders/world0/dh_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/dh_terrain.vsh b/shaders/world0/dh_terrain.vsh index 154c60d..5072fcf 100644 --- a/shaders/world0/dh_terrain.vsh +++ b/shaders/world0/dh_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/dh_water.fsh b/shaders/world0/dh_water.fsh index 1d23a84..d3257b7 100644 --- a/shaders/world0/dh_water.fsh +++ b/shaders/world0/dh_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/dh_water.vsh b/shaders/world0/dh_water.vsh index d446b05..013232b 100644 --- a/shaders/world0/dh_water.vsh +++ b/shaders/world0/dh_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/final.fsh b/shaders/world0/final.fsh index 5133b98..2c56d1b 100644 --- a/shaders/world0/final.fsh +++ b/shaders/world0/final.fsh @@ -1,7 +1,3 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/dimensions/final.fsh" \ No newline at end of file diff --git a/shaders/world0/final.vsh b/shaders/world0/final.vsh index e274265..4d80407 100644 --- a/shaders/world0/final.vsh +++ b/shaders/world0/final.vsh @@ -1,7 +1,3 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/dimensions/final.vsh" \ No newline at end of file diff --git a/shaders/world0/gbuffers_armor_glint.fsh b/shaders/world0/gbuffers_armor_glint.fsh index 5e405a5..0d736cc 100644 --- a/shaders/world0/gbuffers_armor_glint.fsh +++ b/shaders/world0/gbuffers_armor_glint.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world0/gbuffers_armor_glint.vsh b/shaders/world0/gbuffers_armor_glint.vsh index 328a320..01a4c43 100644 --- a/shaders/world0/gbuffers_armor_glint.vsh +++ b/shaders/world0/gbuffers_armor_glint.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world0/gbuffers_basic.fsh b/shaders/world0/gbuffers_basic.fsh index cf2c84e..9aca44f 100644 --- a/shaders/world0/gbuffers_basic.fsh +++ b/shaders/world0/gbuffers_basic.fsh @@ -1,12 +1,4 @@ -#ifdef MC_OS_MAC - #ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif -#else - #version 430 compatibility -#endif +#version 430 compatibility #define LINES diff --git a/shaders/world0/gbuffers_basic.vsh b/shaders/world0/gbuffers_basic.vsh index 921757b..e91d601 100644 --- a/shaders/world0/gbuffers_basic.vsh +++ b/shaders/world0/gbuffers_basic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES diff --git a/shaders/world0/gbuffers_beaconbeam.fsh b/shaders/world0/gbuffers_beaconbeam.fsh index de7e25b..9b43c38 100644 --- a/shaders/world0/gbuffers_beaconbeam.fsh +++ b/shaders/world0/gbuffers_beaconbeam.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world0/gbuffers_beaconbeam.vsh b/shaders/world0/gbuffers_beaconbeam.vsh index ef2815b..38f7ac2 100644 --- a/shaders/world0/gbuffers_beaconbeam.vsh +++ b/shaders/world0/gbuffers_beaconbeam.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world0/gbuffers_block.fsh b/shaders/world0/gbuffers_block.fsh index 599cf60..707f67d 100644 --- a/shaders/world0/gbuffers_block.fsh +++ b/shaders/world0/gbuffers_block.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world0/gbuffers_block.vsh b/shaders/world0/gbuffers_block.vsh index 1a63441..1196819 100644 --- a/shaders/world0/gbuffers_block.vsh +++ b/shaders/world0/gbuffers_block.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world0/gbuffers_block_translucent.fsh b/shaders/world0/gbuffers_block_translucent.fsh index 155efb6..230a826 100644 --- a/shaders/world0/gbuffers_block_translucent.fsh +++ b/shaders/world0/gbuffers_block_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_block_translucent.vsh b/shaders/world0/gbuffers_block_translucent.vsh index 10c4aa1..a2be505 100644 --- a/shaders/world0/gbuffers_block_translucent.vsh +++ b/shaders/world0/gbuffers_block_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_damagedblock.fsh b/shaders/world0/gbuffers_damagedblock.fsh index 4570ebd..838b7cf 100644 --- a/shaders/world0/gbuffers_damagedblock.fsh +++ b/shaders/world0/gbuffers_damagedblock.fsh @@ -1,12 +1,4 @@ -#ifdef MC_OS_MAC - #ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif -#else - #version 430 compatibility -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world0/gbuffers_damagedblock.vsh b/shaders/world0/gbuffers_damagedblock.vsh index ec23cf1..a9b3998 100644 --- a/shaders/world0/gbuffers_damagedblock.vsh +++ b/shaders/world0/gbuffers_damagedblock.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world0/gbuffers_entities.fsh b/shaders/world0/gbuffers_entities.fsh index 3832195..481cd92 100644 --- a/shaders/world0/gbuffers_entities.fsh +++ b/shaders/world0/gbuffers_entities.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define ENTITIES diff --git a/shaders/world0/gbuffers_entities.vsh b/shaders/world0/gbuffers_entities.vsh index ec96eb7..8f6b3bf 100644 --- a/shaders/world0/gbuffers_entities.vsh +++ b/shaders/world0/gbuffers_entities.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD diff --git a/shaders/world0/gbuffers_entities_glowing.fsh b/shaders/world0/gbuffers_entities_glowing.fsh index c2a8ff2..9ed3c10 100644 --- a/shaders/world0/gbuffers_entities_glowing.fsh +++ b/shaders/world0/gbuffers_entities_glowing.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world0/gbuffers_entities_glowing.vsh b/shaders/world0/gbuffers_entities_glowing.vsh index 9588c1a..dd19f6b 100644 --- a/shaders/world0/gbuffers_entities_glowing.vsh +++ b/shaders/world0/gbuffers_entities_glowing.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world0/gbuffers_entities_translucent.fsh b/shaders/world0/gbuffers_entities_translucent.fsh index d8571be..08c2895 100644 --- a/shaders/world0/gbuffers_entities_translucent.fsh +++ b/shaders/world0/gbuffers_entities_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_entities_translucent.vsh b/shaders/world0/gbuffers_entities_translucent.vsh index 5a0789e..bd51362 100644 --- a/shaders/world0/gbuffers_entities_translucent.vsh +++ b/shaders/world0/gbuffers_entities_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_hand.fsh b/shaders/world0/gbuffers_hand.fsh index e8e6004..a7af644 100644 --- a/shaders/world0/gbuffers_hand.fsh +++ b/shaders/world0/gbuffers_hand.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world0/gbuffers_hand.vsh b/shaders/world0/gbuffers_hand.vsh index 92d777b..b4ff5f2 100644 --- a/shaders/world0/gbuffers_hand.vsh +++ b/shaders/world0/gbuffers_hand.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world0/gbuffers_hand_water.fsh b/shaders/world0/gbuffers_hand_water.fsh index 0352315..8e91ce2 100644 --- a/shaders/world0/gbuffers_hand_water.fsh +++ b/shaders/world0/gbuffers_hand_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_hand_water.vsh b/shaders/world0/gbuffers_hand_water.vsh index 5cc2aed..3bc3af9 100644 --- a/shaders/world0/gbuffers_hand_water.vsh +++ b/shaders/world0/gbuffers_hand_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_lightning.fsh b/shaders/world0/gbuffers_lightning.fsh index 8c90fbf..89a36fe 100644 --- a/shaders/world0/gbuffers_lightning.fsh +++ b/shaders/world0/gbuffers_lightning.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_lightning.vsh b/shaders/world0/gbuffers_lightning.vsh index dc1a749..7b42f23 100644 --- a/shaders/world0/gbuffers_lightning.vsh +++ b/shaders/world0/gbuffers_lightning.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_skybasic.fsh b/shaders/world0/gbuffers_skybasic.fsh index 493138a..470d527 100644 --- a/shaders/world0/gbuffers_skybasic.fsh +++ b/shaders/world0/gbuffers_skybasic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { discard; diff --git a/shaders/world0/gbuffers_skybasic.vsh b/shaders/world0/gbuffers_skybasic.vsh index 6cf9c57..4d7379d 100644 --- a/shaders/world0/gbuffers_skybasic.vsh +++ b/shaders/world0/gbuffers_skybasic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world0/gbuffers_skytextured.fsh b/shaders/world0/gbuffers_skytextured.fsh index c04d8dd..aa98e8a 100644 --- a/shaders/world0/gbuffers_skytextured.fsh +++ b/shaders/world0/gbuffers_skytextured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #if RESOURCEPACK_SKY != 0 diff --git a/shaders/world0/gbuffers_skytextured.vsh b/shaders/world0/gbuffers_skytextured.vsh index 0a1b78b..bf4411b 100644 --- a/shaders/world0/gbuffers_skytextured.vsh +++ b/shaders/world0/gbuffers_skytextured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #if RESOURCEPACK_SKY != 0 diff --git a/shaders/world0/gbuffers_spidereyes.fsh b/shaders/world0/gbuffers_spidereyes.fsh index 15cdcc2..ee5e2a7 100644 --- a/shaders/world0/gbuffers_spidereyes.fsh +++ b/shaders/world0/gbuffers_spidereyes.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world0/gbuffers_spidereyes.vsh b/shaders/world0/gbuffers_spidereyes.vsh index adf4440..1574d95 100644 --- a/shaders/world0/gbuffers_spidereyes.vsh +++ b/shaders/world0/gbuffers_spidereyes.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world0/gbuffers_terrain.fsh b/shaders/world0/gbuffers_terrain.fsh index 5aea0ab..0e0c585 100644 --- a/shaders/world0/gbuffers_terrain.fsh +++ b/shaders/world0/gbuffers_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_terrain.vsh b/shaders/world0/gbuffers_terrain.vsh index 5a719a2..78d7c72 100644 --- a/shaders/world0/gbuffers_terrain.vsh +++ b/shaders/world0/gbuffers_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_textured.fsh b/shaders/world0/gbuffers_textured.fsh index 0a03043..e6517b2 100644 --- a/shaders/world0/gbuffers_textured.fsh +++ b/shaders/world0/gbuffers_textured.fsh @@ -1,12 +1,4 @@ -#ifdef MC_OS_MAC - #ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif -#else - #version 430 compatibility -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world0/gbuffers_textured.vsh b/shaders/world0/gbuffers_textured.vsh index 101cd75..ef16bcd 100644 --- a/shaders/world0/gbuffers_textured.vsh +++ b/shaders/world0/gbuffers_textured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world0/gbuffers_textured_lit.fsh b/shaders/world0/gbuffers_textured_lit.fsh index a3b7386..eea06b7 100644 --- a/shaders/world0/gbuffers_textured_lit.fsh +++ b/shaders/world0/gbuffers_textured_lit.fsh @@ -1,12 +1,4 @@ -#ifdef MC_OS_MAC - #ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif -#else - #version 430 compatibility -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world0/gbuffers_textured_lit.vsh b/shaders/world0/gbuffers_textured_lit.vsh index 9a16bdd..7d6622e 100644 --- a/shaders/world0/gbuffers_textured_lit.vsh +++ b/shaders/world0/gbuffers_textured_lit.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world0/gbuffers_water.fsh b/shaders/world0/gbuffers_water.fsh index 9d09a92..4e758e4 100644 --- a/shaders/world0/gbuffers_water.fsh +++ b/shaders/world0/gbuffers_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_water.vsh b/shaders/world0/gbuffers_water.vsh index c3f2dd6..770ff41 100644 --- a/shaders/world0/gbuffers_water.vsh +++ b/shaders/world0/gbuffers_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_weather.fsh b/shaders/world0/gbuffers_weather.fsh index 108ba2e..367f422 100644 --- a/shaders/world0/gbuffers_weather.fsh +++ b/shaders/world0/gbuffers_weather.fsh @@ -1,12 +1,4 @@ -#ifdef MC_OS_MAC - #ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif -#else - #version 430 compatibility -#endif +#version 430 compatibility #define WEATHER #define OVERWORLD_SHADER diff --git a/shaders/world0/gbuffers_weather.vsh b/shaders/world0/gbuffers_weather.vsh index 700de19..be3892c 100644 --- a/shaders/world0/gbuffers_weather.vsh +++ b/shaders/world0/gbuffers_weather.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define OVERWORLD_SHADER diff --git a/shaders/world0/physics_ocean.fsh b/shaders/world0/physics_ocean.fsh index c68eeae..53156f6 100644 --- a/shaders/world0/physics_ocean.fsh +++ b/shaders/world0/physics_ocean.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PHYSICSMOD_FRAGMENT #define PHYSICSMOD_OCEAN_SHADER diff --git a/shaders/world0/physics_ocean.vsh b/shaders/world0/physics_ocean.vsh index 302599a..a392067 100644 --- a/shaders/world0/physics_ocean.vsh +++ b/shaders/world0/physics_ocean.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PHYSICSMOD_VERTEX #define PHYSICSMOD_OCEAN_SHADER diff --git a/shaders/world0/shadow.fsh b/shaders/world0/shadow.fsh index 310492b..4728a59 100644 --- a/shaders/world0/shadow.fsh +++ b/shaders/world0/shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" diff --git a/shaders/world0/shadow.vsh b/shaders/world0/shadow.vsh index 2cf6afb..157e334 100644 --- a/shaders/world0/shadow.vsh +++ b/shaders/world0/shadow.vsh @@ -1,9 +1,6 @@ -#ifdef MC_OS_MAC - #version 120 -#else - #version 430 compatibility - #include "/lib/SSBOs.glsl" -#endif +#version 430 compatibility +#include "/lib/SSBOs.glsl" + #include "/lib/settings.glsl" #if defined IS_LPV_ENABLED || WATER_INTERACTION == 2 || defined SHADER_GRASS @@ -130,7 +127,7 @@ bool intersectCone(float coneHalfAngle, vec3 coneTip , vec3 coneAxis, vec3 rayOr // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world0/voxy.json b/shaders/world0/voxy.json new file mode 100644 index 0000000..6e2c405 --- /dev/null +++ b/shaders/world0/voxy.json @@ -0,0 +1 @@ +#include "/dimensions/voxy.json" \ No newline at end of file diff --git a/shaders/world0/voxy_opaque.glsl b/shaders/world0/voxy_opaque.glsl new file mode 100644 index 0000000..9e20b80 --- /dev/null +++ b/shaders/world0/voxy_opaque.glsl @@ -0,0 +1,2 @@ +#define OVERWORLD_SHADER +#include "/dimensions/voxy_solid.glsl" \ No newline at end of file diff --git a/shaders/world0/voxy_translucent.glsl b/shaders/world0/voxy_translucent.glsl new file mode 100644 index 0000000..0f33684 --- /dev/null +++ b/shaders/world0/voxy_translucent.glsl @@ -0,0 +1,2 @@ +#define OVERWORLD_SHADER +#include "/dimensions/voxy_translucent.glsl" \ No newline at end of file diff --git a/shaders/world0_with_aether_flag/composite.fsh b/shaders/world0_with_aether_flag/composite.fsh index fc5fd84..915b620 100644 --- a/shaders/world0_with_aether_flag/composite.fsh +++ b/shaders/world0_with_aether_flag/composite.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite.vsh b/shaders/world0_with_aether_flag/composite.vsh index 6faaa0e..b57efad 100644 --- a/shaders/world0_with_aether_flag/composite.vsh +++ b/shaders/world0_with_aether_flag/composite.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite1.fsh b/shaders/world0_with_aether_flag/composite1.fsh index a2e6baf..7cfff7a 100644 --- a/shaders/world0_with_aether_flag/composite1.fsh +++ b/shaders/world0_with_aether_flag/composite1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite1.vsh b/shaders/world0_with_aether_flag/composite1.vsh index ff2d78c..26a9d88 100644 --- a/shaders/world0_with_aether_flag/composite1.vsh +++ b/shaders/world0_with_aether_flag/composite1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite10.fsh b/shaders/world0_with_aether_flag/composite10.fsh index 3f2afb9..06c2648 100644 --- a/shaders/world0_with_aether_flag/composite10.fsh +++ b/shaders/world0_with_aether_flag/composite10.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite10.vsh b/shaders/world0_with_aether_flag/composite10.vsh index 37d1c93..2837824 100644 --- a/shaders/world0_with_aether_flag/composite10.vsh +++ b/shaders/world0_with_aether_flag/composite10.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite12.fsh b/shaders/world0_with_aether_flag/composite12.fsh index a41f6a9..080c1ad 100644 --- a/shaders/world0_with_aether_flag/composite12.fsh +++ b/shaders/world0_with_aether_flag/composite12.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite12.vsh b/shaders/world0_with_aether_flag/composite12.vsh index 15a19d8..e435a07 100644 --- a/shaders/world0_with_aether_flag/composite12.vsh +++ b/shaders/world0_with_aether_flag/composite12.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite13.fsh b/shaders/world0_with_aether_flag/composite13.fsh index 150f8f6..d2a50a5 100644 --- a/shaders/world0_with_aether_flag/composite13.fsh +++ b/shaders/world0_with_aether_flag/composite13.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite13.vsh b/shaders/world0_with_aether_flag/composite13.vsh index 7410861..22be04c 100644 --- a/shaders/world0_with_aether_flag/composite13.vsh +++ b/shaders/world0_with_aether_flag/composite13.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite2.fsh b/shaders/world0_with_aether_flag/composite2.fsh index 81baefc..0680d8a 100644 --- a/shaders/world0_with_aether_flag/composite2.fsh +++ b/shaders/world0_with_aether_flag/composite2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite2.vsh b/shaders/world0_with_aether_flag/composite2.vsh index f27bd06..57ab549 100644 --- a/shaders/world0_with_aether_flag/composite2.vsh +++ b/shaders/world0_with_aether_flag/composite2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite3.fsh b/shaders/world0_with_aether_flag/composite3.fsh index dd0e814..ea40a9a 100644 --- a/shaders/world0_with_aether_flag/composite3.fsh +++ b/shaders/world0_with_aether_flag/composite3.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite3.vsh b/shaders/world0_with_aether_flag/composite3.vsh index 75d308b..5addd77 100644 --- a/shaders/world0_with_aether_flag/composite3.vsh +++ b/shaders/world0_with_aether_flag/composite3.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite4.fsh b/shaders/world0_with_aether_flag/composite4.fsh index 2e3130b..02bbbd9 100644 --- a/shaders/world0_with_aether_flag/composite4.fsh +++ b/shaders/world0_with_aether_flag/composite4.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite4.vsh b/shaders/world0_with_aether_flag/composite4.vsh index 6a4c711..47e7b2e 100644 --- a/shaders/world0_with_aether_flag/composite4.vsh +++ b/shaders/world0_with_aether_flag/composite4.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite5.fsh b/shaders/world0_with_aether_flag/composite5.fsh index 60fad61..056f6fa 100644 --- a/shaders/world0_with_aether_flag/composite5.fsh +++ b/shaders/world0_with_aether_flag/composite5.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite5.vsh b/shaders/world0_with_aether_flag/composite5.vsh index 0e3b419..0de16c1 100644 --- a/shaders/world0_with_aether_flag/composite5.vsh +++ b/shaders/world0_with_aether_flag/composite5.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite6.fsh b/shaders/world0_with_aether_flag/composite6.fsh index 6dcbf91..f2d701e 100644 --- a/shaders/world0_with_aether_flag/composite6.fsh +++ b/shaders/world0_with_aether_flag/composite6.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite6.vsh b/shaders/world0_with_aether_flag/composite6.vsh index d82f79a..ae4ffe0 100644 --- a/shaders/world0_with_aether_flag/composite6.vsh +++ b/shaders/world0_with_aether_flag/composite6.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite7.fsh b/shaders/world0_with_aether_flag/composite7.fsh index 2f67630..2918282 100644 --- a/shaders/world0_with_aether_flag/composite7.fsh +++ b/shaders/world0_with_aether_flag/composite7.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite7.vsh b/shaders/world0_with_aether_flag/composite7.vsh index 6a32aa4..1185ae8 100644 --- a/shaders/world0_with_aether_flag/composite7.vsh +++ b/shaders/world0_with_aether_flag/composite7.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite8.fsh b/shaders/world0_with_aether_flag/composite8.fsh index 145c772..bf1d7fa 100644 --- a/shaders/world0_with_aether_flag/composite8.fsh +++ b/shaders/world0_with_aether_flag/composite8.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite8.vsh b/shaders/world0_with_aether_flag/composite8.vsh index 1d24f9c..e5d3059 100644 --- a/shaders/world0_with_aether_flag/composite8.vsh +++ b/shaders/world0_with_aether_flag/composite8.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite9.fsh b/shaders/world0_with_aether_flag/composite9.fsh index 6e5dfa0..385f238 100644 --- a/shaders/world0_with_aether_flag/composite9.fsh +++ b/shaders/world0_with_aether_flag/composite9.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/composite9.vsh b/shaders/world0_with_aether_flag/composite9.vsh index 987acd1..9144ead 100644 --- a/shaders/world0_with_aether_flag/composite9.vsh +++ b/shaders/world0_with_aether_flag/composite9.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/deferred.fsh b/shaders/world0_with_aether_flag/deferred.fsh index 402acd0..1aeb77c 100644 --- a/shaders/world0_with_aether_flag/deferred.fsh +++ b/shaders/world0_with_aether_flag/deferred.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/deferred.vsh b/shaders/world0_with_aether_flag/deferred.vsh index 6799e5e..1001b4d 100644 --- a/shaders/world0_with_aether_flag/deferred.vsh +++ b/shaders/world0_with_aether_flag/deferred.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/deferred1.fsh b/shaders/world0_with_aether_flag/deferred1.fsh index 50c6383..df4303a 100644 --- a/shaders/world0_with_aether_flag/deferred1.fsh +++ b/shaders/world0_with_aether_flag/deferred1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/deferred1.vsh b/shaders/world0_with_aether_flag/deferred1.vsh index bb72448..9bccce0 100644 --- a/shaders/world0_with_aether_flag/deferred1.vsh +++ b/shaders/world0_with_aether_flag/deferred1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/deferred2.fsh b/shaders/world0_with_aether_flag/deferred2.fsh index a993728..474afdf 100644 --- a/shaders/world0_with_aether_flag/deferred2.fsh +++ b/shaders/world0_with_aether_flag/deferred2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/deferred2.vsh b/shaders/world0_with_aether_flag/deferred2.vsh index 56e6d90..d5061a6 100644 --- a/shaders/world0_with_aether_flag/deferred2.vsh +++ b/shaders/world0_with_aether_flag/deferred2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/dh_generic.fsh b/shaders/world0_with_aether_flag/dh_generic.fsh index e132c6e..f931aed 100644 --- a/shaders/world0_with_aether_flag/dh_generic.fsh +++ b/shaders/world0_with_aether_flag/dh_generic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/dh_generic.vsh b/shaders/world0_with_aether_flag/dh_generic.vsh index ffa996f..98ef90c 100644 --- a/shaders/world0_with_aether_flag/dh_generic.vsh +++ b/shaders/world0_with_aether_flag/dh_generic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/dh_shadow.fsh b/shaders/world0_with_aether_flag/dh_shadow.fsh index 3e03705..e278729 100644 --- a/shaders/world0_with_aether_flag/dh_shadow.fsh +++ b/shaders/world0_with_aether_flag/dh_shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility //#extension GL_ARB_shader_texture_lod : disable #include "/lib/settings.glsl" diff --git a/shaders/world0_with_aether_flag/dh_shadow.vsh b/shaders/world0_with_aether_flag/dh_shadow.vsh index 6837d25..cc99d4c 100644 --- a/shaders/world0_with_aether_flag/dh_shadow.vsh +++ b/shaders/world0_with_aether_flag/dh_shadow.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility /* !! DO NOT REMOVE !! @@ -33,7 +29,7 @@ flat varying int water; #define projMAD(m, v) (diagonal3(m) * (v) + (m)[3].xyz) // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world0_with_aether_flag/dh_terrain.fsh b/shaders/world0_with_aether_flag/dh_terrain.fsh index 30fc5c2..5ceb2ed 100644 --- a/shaders/world0_with_aether_flag/dh_terrain.fsh +++ b/shaders/world0_with_aether_flag/dh_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/dh_terrain.vsh b/shaders/world0_with_aether_flag/dh_terrain.vsh index 005e6f8..14e54f9 100644 --- a/shaders/world0_with_aether_flag/dh_terrain.vsh +++ b/shaders/world0_with_aether_flag/dh_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/dh_water.fsh b/shaders/world0_with_aether_flag/dh_water.fsh index e20cb33..d12df69 100644 --- a/shaders/world0_with_aether_flag/dh_water.fsh +++ b/shaders/world0_with_aether_flag/dh_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/dh_water.vsh b/shaders/world0_with_aether_flag/dh_water.vsh index 0d02cd5..f92d8d0 100644 --- a/shaders/world0_with_aether_flag/dh_water.vsh +++ b/shaders/world0_with_aether_flag/dh_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/final.fsh b/shaders/world0_with_aether_flag/final.fsh index 5133b98..2c56d1b 100644 --- a/shaders/world0_with_aether_flag/final.fsh +++ b/shaders/world0_with_aether_flag/final.fsh @@ -1,7 +1,3 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/dimensions/final.fsh" \ No newline at end of file diff --git a/shaders/world0_with_aether_flag/final.vsh b/shaders/world0_with_aether_flag/final.vsh index e274265..4d80407 100644 --- a/shaders/world0_with_aether_flag/final.vsh +++ b/shaders/world0_with_aether_flag/final.vsh @@ -1,7 +1,3 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/dimensions/final.vsh" \ No newline at end of file diff --git a/shaders/world0_with_aether_flag/gbuffers_armor_glint.fsh b/shaders/world0_with_aether_flag/gbuffers_armor_glint.fsh index 5e405a5..0d736cc 100644 --- a/shaders/world0_with_aether_flag/gbuffers_armor_glint.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_armor_glint.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world0_with_aether_flag/gbuffers_armor_glint.vsh b/shaders/world0_with_aether_flag/gbuffers_armor_glint.vsh index 328a320..01a4c43 100644 --- a/shaders/world0_with_aether_flag/gbuffers_armor_glint.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_armor_glint.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world0_with_aether_flag/gbuffers_basic.fsh b/shaders/world0_with_aether_flag/gbuffers_basic.fsh index 50501d0..4d1ae75 100644 --- a/shaders/world0_with_aether_flag/gbuffers_basic.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_basic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES diff --git a/shaders/world0_with_aether_flag/gbuffers_basic.vsh b/shaders/world0_with_aether_flag/gbuffers_basic.vsh index 88937d3..9d88930 100644 --- a/shaders/world0_with_aether_flag/gbuffers_basic.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_basic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES diff --git a/shaders/world0_with_aether_flag/gbuffers_beaconbeam.fsh b/shaders/world0_with_aether_flag/gbuffers_beaconbeam.fsh index de7e25b..9b43c38 100644 --- a/shaders/world0_with_aether_flag/gbuffers_beaconbeam.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_beaconbeam.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world0_with_aether_flag/gbuffers_beaconbeam.vsh b/shaders/world0_with_aether_flag/gbuffers_beaconbeam.vsh index ef2815b..38f7ac2 100644 --- a/shaders/world0_with_aether_flag/gbuffers_beaconbeam.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_beaconbeam.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world0_with_aether_flag/gbuffers_block.fsh b/shaders/world0_with_aether_flag/gbuffers_block.fsh index 6bed379..e6fce52 100644 --- a/shaders/world0_with_aether_flag/gbuffers_block.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_block.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world0_with_aether_flag/gbuffers_block.vsh b/shaders/world0_with_aether_flag/gbuffers_block.vsh index 11c7104..9ee025e 100644 --- a/shaders/world0_with_aether_flag/gbuffers_block.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_block.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world0_with_aether_flag/gbuffers_block_translucent.fsh b/shaders/world0_with_aether_flag/gbuffers_block_translucent.fsh index a725821..ddef53f 100644 --- a/shaders/world0_with_aether_flag/gbuffers_block_translucent.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_block_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_block_translucent.vsh b/shaders/world0_with_aether_flag/gbuffers_block_translucent.vsh index a50e57b..8b2a133 100644 --- a/shaders/world0_with_aether_flag/gbuffers_block_translucent.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_block_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_damagedblock.fsh b/shaders/world0_with_aether_flag/gbuffers_damagedblock.fsh index 1cf05bc..838b7cf 100644 --- a/shaders/world0_with_aether_flag/gbuffers_damagedblock.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_damagedblock.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world0_with_aether_flag/gbuffers_damagedblock.vsh b/shaders/world0_with_aether_flag/gbuffers_damagedblock.vsh index ec23cf1..a9b3998 100644 --- a/shaders/world0_with_aether_flag/gbuffers_damagedblock.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_damagedblock.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world0_with_aether_flag/gbuffers_entities.fsh b/shaders/world0_with_aether_flag/gbuffers_entities.fsh index 7bff60b..7f5a5a1 100644 --- a/shaders/world0_with_aether_flag/gbuffers_entities.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_entities.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define ENTITIES diff --git a/shaders/world0_with_aether_flag/gbuffers_entities.vsh b/shaders/world0_with_aether_flag/gbuffers_entities.vsh index c8205e8..0acf666 100644 --- a/shaders/world0_with_aether_flag/gbuffers_entities.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_entities.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD diff --git a/shaders/world0_with_aether_flag/gbuffers_entities_glowing.fsh b/shaders/world0_with_aether_flag/gbuffers_entities_glowing.fsh index c2a8ff2..9ed3c10 100644 --- a/shaders/world0_with_aether_flag/gbuffers_entities_glowing.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_entities_glowing.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world0_with_aether_flag/gbuffers_entities_glowing.vsh b/shaders/world0_with_aether_flag/gbuffers_entities_glowing.vsh index 9588c1a..dd19f6b 100644 --- a/shaders/world0_with_aether_flag/gbuffers_entities_glowing.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_entities_glowing.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world0_with_aether_flag/gbuffers_entities_translucent.fsh b/shaders/world0_with_aether_flag/gbuffers_entities_translucent.fsh index ad55c16..13e320d 100644 --- a/shaders/world0_with_aether_flag/gbuffers_entities_translucent.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_entities_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_entities_translucent.vsh b/shaders/world0_with_aether_flag/gbuffers_entities_translucent.vsh index 9080d23..1aa8735 100644 --- a/shaders/world0_with_aether_flag/gbuffers_entities_translucent.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_entities_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_hand.fsh b/shaders/world0_with_aether_flag/gbuffers_hand.fsh index f48e90f..f945482 100644 --- a/shaders/world0_with_aether_flag/gbuffers_hand.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_hand.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world0_with_aether_flag/gbuffers_hand.vsh b/shaders/world0_with_aether_flag/gbuffers_hand.vsh index d4a2d53..55e1f1d 100644 --- a/shaders/world0_with_aether_flag/gbuffers_hand.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_hand.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world0_with_aether_flag/gbuffers_hand_water.fsh b/shaders/world0_with_aether_flag/gbuffers_hand_water.fsh index 1916b69..5d6fbbb 100644 --- a/shaders/world0_with_aether_flag/gbuffers_hand_water.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_hand_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_hand_water.vsh b/shaders/world0_with_aether_flag/gbuffers_hand_water.vsh index 5e52af8..82d9811 100644 --- a/shaders/world0_with_aether_flag/gbuffers_hand_water.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_hand_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_skybasic.fsh b/shaders/world0_with_aether_flag/gbuffers_skybasic.fsh index 493138a..470d527 100644 --- a/shaders/world0_with_aether_flag/gbuffers_skybasic.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_skybasic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { discard; diff --git a/shaders/world0_with_aether_flag/gbuffers_skybasic.vsh b/shaders/world0_with_aether_flag/gbuffers_skybasic.vsh index 6cf9c57..4d7379d 100644 --- a/shaders/world0_with_aether_flag/gbuffers_skybasic.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_skybasic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world0_with_aether_flag/gbuffers_skytextured.fsh b/shaders/world0_with_aether_flag/gbuffers_skytextured.fsh index c04d8dd..aa98e8a 100644 --- a/shaders/world0_with_aether_flag/gbuffers_skytextured.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_skytextured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #if RESOURCEPACK_SKY != 0 diff --git a/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh b/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh index 0a1b78b..bf4411b 100644 --- a/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #if RESOURCEPACK_SKY != 0 diff --git a/shaders/world0_with_aether_flag/gbuffers_spidereyes.fsh b/shaders/world0_with_aether_flag/gbuffers_spidereyes.fsh index 15cdcc2..ee5e2a7 100644 --- a/shaders/world0_with_aether_flag/gbuffers_spidereyes.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_spidereyes.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world0_with_aether_flag/gbuffers_spidereyes.vsh b/shaders/world0_with_aether_flag/gbuffers_spidereyes.vsh index adf4440..1574d95 100644 --- a/shaders/world0_with_aether_flag/gbuffers_spidereyes.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_spidereyes.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world0_with_aether_flag/gbuffers_terrain.fsh b/shaders/world0_with_aether_flag/gbuffers_terrain.fsh index 348bea5..628259c 100644 --- a/shaders/world0_with_aether_flag/gbuffers_terrain.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/gbuffers_terrain.vsh b/shaders/world0_with_aether_flag/gbuffers_terrain.vsh index 4a51a93..cb7cd02 100644 --- a/shaders/world0_with_aether_flag/gbuffers_terrain.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/gbuffers_textured.fsh b/shaders/world0_with_aether_flag/gbuffers_textured.fsh index 1efb977..9cd89bf 100644 --- a/shaders/world0_with_aether_flag/gbuffers_textured.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_textured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world0_with_aether_flag/gbuffers_textured.vsh b/shaders/world0_with_aether_flag/gbuffers_textured.vsh index 6172b0f..81d8da8 100644 --- a/shaders/world0_with_aether_flag/gbuffers_textured.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_textured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world0_with_aether_flag/gbuffers_textured_lit.fsh b/shaders/world0_with_aether_flag/gbuffers_textured_lit.fsh index 7e1d919..4260c57 100644 --- a/shaders/world0_with_aether_flag/gbuffers_textured_lit.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_textured_lit.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world0_with_aether_flag/gbuffers_textured_lit.vsh b/shaders/world0_with_aether_flag/gbuffers_textured_lit.vsh index 6868cdf..8a28ab4 100644 --- a/shaders/world0_with_aether_flag/gbuffers_textured_lit.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_textured_lit.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world0_with_aether_flag/gbuffers_water.fsh b/shaders/world0_with_aether_flag/gbuffers_water.fsh index 0adf27e..9d79091 100644 --- a/shaders/world0_with_aether_flag/gbuffers_water.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/gbuffers_water.vsh b/shaders/world0_with_aether_flag/gbuffers_water.vsh index aae8841..0e5a842 100644 --- a/shaders/world0_with_aether_flag/gbuffers_water.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define AETHER_FLAG diff --git a/shaders/world0_with_aether_flag/gbuffers_weather.fsh b/shaders/world0_with_aether_flag/gbuffers_weather.fsh index beb3564..ba55f24 100644 --- a/shaders/world0_with_aether_flag/gbuffers_weather.fsh +++ b/shaders/world0_with_aether_flag/gbuffers_weather.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/gbuffers_weather.vsh b/shaders/world0_with_aether_flag/gbuffers_weather.vsh index 418af1f..ad77b2d 100644 --- a/shaders/world0_with_aether_flag/gbuffers_weather.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_weather.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define OVERWORLD_SHADER diff --git a/shaders/world0_with_aether_flag/shadow.fsh b/shaders/world0_with_aether_flag/shadow.fsh index b43bcac..036816b 100644 --- a/shaders/world0_with_aether_flag/shadow.fsh +++ b/shaders/world0_with_aether_flag/shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" diff --git a/shaders/world0_with_aether_flag/shadow.vsh b/shaders/world0_with_aether_flag/shadow.vsh index ebf828c..c368a31 100644 --- a/shaders/world0_with_aether_flag/shadow.vsh +++ b/shaders/world0_with_aether_flag/shadow.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #ifdef IS_LPV_ENABLED #extension GL_ARB_explicit_attrib_location: enable @@ -124,7 +120,7 @@ bool intersectCone(float coneHalfAngle, vec3 coneTip , vec3 coneAxis, vec3 rayOr // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world0_with_twilight_forest_flag/composite.fsh b/shaders/world0_with_twilight_forest_flag/composite.fsh index ff74d83..68e3ec2 100644 --- a/shaders/world0_with_twilight_forest_flag/composite.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite.vsh b/shaders/world0_with_twilight_forest_flag/composite.vsh index 3418e08..67fdd21 100644 --- a/shaders/world0_with_twilight_forest_flag/composite.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite1.fsh b/shaders/world0_with_twilight_forest_flag/composite1.fsh index 31ed7fc..d7d66e0 100644 --- a/shaders/world0_with_twilight_forest_flag/composite1.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite1.vsh b/shaders/world0_with_twilight_forest_flag/composite1.vsh index fb73f1f..4de3412 100644 --- a/shaders/world0_with_twilight_forest_flag/composite1.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite10.fsh b/shaders/world0_with_twilight_forest_flag/composite10.fsh index 6136667..ef6c79b 100644 --- a/shaders/world0_with_twilight_forest_flag/composite10.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite10.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite10.vsh b/shaders/world0_with_twilight_forest_flag/composite10.vsh index ca6b258..65c52f4 100644 --- a/shaders/world0_with_twilight_forest_flag/composite10.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite10.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite12.fsh b/shaders/world0_with_twilight_forest_flag/composite12.fsh index 488b883..7fa8abb 100644 --- a/shaders/world0_with_twilight_forest_flag/composite12.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite12.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite12.vsh b/shaders/world0_with_twilight_forest_flag/composite12.vsh index 45a060c..3bee0bc 100644 --- a/shaders/world0_with_twilight_forest_flag/composite12.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite12.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite13.fsh b/shaders/world0_with_twilight_forest_flag/composite13.fsh index 321e5c6..b22622a 100644 --- a/shaders/world0_with_twilight_forest_flag/composite13.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite13.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite13.vsh b/shaders/world0_with_twilight_forest_flag/composite13.vsh index aedf094..a6f92f3 100644 --- a/shaders/world0_with_twilight_forest_flag/composite13.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite13.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite2.fsh b/shaders/world0_with_twilight_forest_flag/composite2.fsh index 016b4ff..7b1b350 100644 --- a/shaders/world0_with_twilight_forest_flag/composite2.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite2.vsh b/shaders/world0_with_twilight_forest_flag/composite2.vsh index 8950983..b1b2299 100644 --- a/shaders/world0_with_twilight_forest_flag/composite2.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite3.fsh b/shaders/world0_with_twilight_forest_flag/composite3.fsh index 9f5898a..6e31b01 100644 --- a/shaders/world0_with_twilight_forest_flag/composite3.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite3.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite3.vsh b/shaders/world0_with_twilight_forest_flag/composite3.vsh index 96f1a87..3a1274f 100644 --- a/shaders/world0_with_twilight_forest_flag/composite3.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite3.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite4.fsh b/shaders/world0_with_twilight_forest_flag/composite4.fsh index ddbda1d..546b602 100644 --- a/shaders/world0_with_twilight_forest_flag/composite4.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite4.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite4.vsh b/shaders/world0_with_twilight_forest_flag/composite4.vsh index c1a8c4e..7f34587 100644 --- a/shaders/world0_with_twilight_forest_flag/composite4.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite4.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite5.fsh b/shaders/world0_with_twilight_forest_flag/composite5.fsh index eb7f535..79b531f 100644 --- a/shaders/world0_with_twilight_forest_flag/composite5.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite5.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite5.vsh b/shaders/world0_with_twilight_forest_flag/composite5.vsh index ce85bd3..bcd2cde 100644 --- a/shaders/world0_with_twilight_forest_flag/composite5.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite5.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite6.fsh b/shaders/world0_with_twilight_forest_flag/composite6.fsh index 7ee13cc..191fd76 100644 --- a/shaders/world0_with_twilight_forest_flag/composite6.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite6.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite6.vsh b/shaders/world0_with_twilight_forest_flag/composite6.vsh index 3f36a99..a33f892 100644 --- a/shaders/world0_with_twilight_forest_flag/composite6.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite6.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite7.fsh b/shaders/world0_with_twilight_forest_flag/composite7.fsh index b27fa26..a20dd2c 100644 --- a/shaders/world0_with_twilight_forest_flag/composite7.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite7.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite7.vsh b/shaders/world0_with_twilight_forest_flag/composite7.vsh index 6dc9190..1d752de 100644 --- a/shaders/world0_with_twilight_forest_flag/composite7.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite7.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite8.fsh b/shaders/world0_with_twilight_forest_flag/composite8.fsh index 8c645e9..3f00252 100644 --- a/shaders/world0_with_twilight_forest_flag/composite8.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite8.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite8.vsh b/shaders/world0_with_twilight_forest_flag/composite8.vsh index 4550513..c35885f 100644 --- a/shaders/world0_with_twilight_forest_flag/composite8.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite8.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite9.fsh b/shaders/world0_with_twilight_forest_flag/composite9.fsh index 372851e..6acbb5f 100644 --- a/shaders/world0_with_twilight_forest_flag/composite9.fsh +++ b/shaders/world0_with_twilight_forest_flag/composite9.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/composite9.vsh b/shaders/world0_with_twilight_forest_flag/composite9.vsh index 7df7b7a..45029c4 100644 --- a/shaders/world0_with_twilight_forest_flag/composite9.vsh +++ b/shaders/world0_with_twilight_forest_flag/composite9.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/deferred.fsh b/shaders/world0_with_twilight_forest_flag/deferred.fsh index 42119a9..e4e957e 100644 --- a/shaders/world0_with_twilight_forest_flag/deferred.fsh +++ b/shaders/world0_with_twilight_forest_flag/deferred.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/deferred.vsh b/shaders/world0_with_twilight_forest_flag/deferred.vsh index 89f5256..f37a943 100644 --- a/shaders/world0_with_twilight_forest_flag/deferred.vsh +++ b/shaders/world0_with_twilight_forest_flag/deferred.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/deferred1.fsh b/shaders/world0_with_twilight_forest_flag/deferred1.fsh index df36e78..433d37d 100644 --- a/shaders/world0_with_twilight_forest_flag/deferred1.fsh +++ b/shaders/world0_with_twilight_forest_flag/deferred1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/deferred1.vsh b/shaders/world0_with_twilight_forest_flag/deferred1.vsh index 099d987..1926119 100644 --- a/shaders/world0_with_twilight_forest_flag/deferred1.vsh +++ b/shaders/world0_with_twilight_forest_flag/deferred1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/deferred2.fsh b/shaders/world0_with_twilight_forest_flag/deferred2.fsh index b463dcd..afeb3c6 100644 --- a/shaders/world0_with_twilight_forest_flag/deferred2.fsh +++ b/shaders/world0_with_twilight_forest_flag/deferred2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/deferred2.vsh b/shaders/world0_with_twilight_forest_flag/deferred2.vsh index de0a1ec..6b2072e 100644 --- a/shaders/world0_with_twilight_forest_flag/deferred2.vsh +++ b/shaders/world0_with_twilight_forest_flag/deferred2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/dh_generic.fsh b/shaders/world0_with_twilight_forest_flag/dh_generic.fsh index 0cf774c..270a59f 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_generic.fsh +++ b/shaders/world0_with_twilight_forest_flag/dh_generic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/dh_generic.vsh b/shaders/world0_with_twilight_forest_flag/dh_generic.vsh index 981e488..f64022e 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_generic.vsh +++ b/shaders/world0_with_twilight_forest_flag/dh_generic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/dh_shadow.fsh b/shaders/world0_with_twilight_forest_flag/dh_shadow.fsh index 3e03705..e278729 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_shadow.fsh +++ b/shaders/world0_with_twilight_forest_flag/dh_shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility //#extension GL_ARB_shader_texture_lod : disable #include "/lib/settings.glsl" diff --git a/shaders/world0_with_twilight_forest_flag/dh_shadow.vsh b/shaders/world0_with_twilight_forest_flag/dh_shadow.vsh index 6837d25..cc99d4c 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_shadow.vsh +++ b/shaders/world0_with_twilight_forest_flag/dh_shadow.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility /* !! DO NOT REMOVE !! @@ -33,7 +29,7 @@ flat varying int water; #define projMAD(m, v) (diagonal3(m) * (v) + (m)[3].xyz) // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world0_with_twilight_forest_flag/dh_terrain.fsh b/shaders/world0_with_twilight_forest_flag/dh_terrain.fsh index 24a87df..ebd6d28 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_terrain.fsh +++ b/shaders/world0_with_twilight_forest_flag/dh_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/dh_terrain.vsh b/shaders/world0_with_twilight_forest_flag/dh_terrain.vsh index e8b7976..707c786 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_terrain.vsh +++ b/shaders/world0_with_twilight_forest_flag/dh_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/dh_water.fsh b/shaders/world0_with_twilight_forest_flag/dh_water.fsh index a44e7c4..c7a9bd4 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_water.fsh +++ b/shaders/world0_with_twilight_forest_flag/dh_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/dh_water.vsh b/shaders/world0_with_twilight_forest_flag/dh_water.vsh index 20b4d1a..9c95e8a 100644 --- a/shaders/world0_with_twilight_forest_flag/dh_water.vsh +++ b/shaders/world0_with_twilight_forest_flag/dh_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/final.fsh b/shaders/world0_with_twilight_forest_flag/final.fsh index 5133b98..2c56d1b 100644 --- a/shaders/world0_with_twilight_forest_flag/final.fsh +++ b/shaders/world0_with_twilight_forest_flag/final.fsh @@ -1,7 +1,3 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/dimensions/final.fsh" \ No newline at end of file diff --git a/shaders/world0_with_twilight_forest_flag/final.vsh b/shaders/world0_with_twilight_forest_flag/final.vsh index e274265..4d80407 100644 --- a/shaders/world0_with_twilight_forest_flag/final.vsh +++ b/shaders/world0_with_twilight_forest_flag/final.vsh @@ -1,7 +1,3 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/dimensions/final.vsh" \ No newline at end of file diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.fsh index 5e405a5..0d736cc 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.vsh index 328a320..01a4c43 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_armor_glint.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_basic.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_basic.fsh index f93c2fc..12c063d 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_basic.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_basic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_basic.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_basic.vsh index 1e9267a..b77dc57 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_basic.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_basic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.fsh index de7e25b..9b43c38 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.vsh index ef2815b..38f7ac2 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_beaconbeam.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_block.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_block.fsh index 9f4b86b..7001c6a 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_block.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_block.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_block.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_block.vsh index 7456616..7b19627 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_block.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_block.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.fsh index 5923447..1233f85 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.vsh index 41f75f1..b36fdc6 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_block_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.fsh index 1cf05bc..838b7cf 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.vsh index ec23cf1..a9b3998 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_damagedblock.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_entities.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_entities.fsh index 30ff327..6148f2a 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_entities.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_entities.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define ENTITIES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_entities.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_entities.vsh index adce0ac..85fe096 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_entities.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_entities.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.fsh index c2a8ff2..9ed3c10 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.vsh index 9588c1a..dd19f6b 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_glowing.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.fsh index a2d4b1f..43df64e 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.vsh index 8f95693..8da9c12 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_entities_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_hand.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_hand.fsh index fcb316d..5966c95 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_hand.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_hand.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_hand.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_hand.vsh index 0a048ba..452ad85 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_hand.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_hand.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.fsh index e547663..9bd2196 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.vsh index eda344e..2c79487 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_hand_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.fsh index 493138a..470d527 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { discard; diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.vsh index 6cf9c57..4d7379d 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_skybasic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.fsh index c04d8dd..aa98e8a 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #if RESOURCEPACK_SKY != 0 diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh index 0a1b78b..bf4411b 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #if RESOURCEPACK_SKY != 0 diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.fsh index 15cdcc2..ee5e2a7 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.vsh index adf4440..1574d95 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_spidereyes.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.fsh index fbe9eb2..89d5b1b 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.vsh index 932d46b..3eeb7b7 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_textured.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_textured.fsh index 4fce862..dceb183 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_textured.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_textured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_textured.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_textured.vsh index c896208..de3127f 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_textured.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_textured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define PARTICLES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.fsh index daf71c4..49031d6 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.vsh index b4f9134..57da111 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_textured_lit.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LIT #define PARTICLES diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_water.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_water.fsh index 546977d..195e07d 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_water.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_water.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_water.vsh index 376e29c..07221e1 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_water.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define OVERWORLD_SHADER #define TWILIGHT_FOREST_FLAG diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_weather.fsh b/shaders/world0_with_twilight_forest_flag/gbuffers_weather.fsh index b50643e..b8c3b8b 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_weather.fsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_weather.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_weather.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_weather.vsh index b9a75b0..4e9ff9e 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_weather.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_weather.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WEATHER #define OVERWORLD_SHADER diff --git a/shaders/world0_with_twilight_forest_flag/shadow.fsh b/shaders/world0_with_twilight_forest_flag/shadow.fsh index b43bcac..036816b 100644 --- a/shaders/world0_with_twilight_forest_flag/shadow.fsh +++ b/shaders/world0_with_twilight_forest_flag/shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" diff --git a/shaders/world0_with_twilight_forest_flag/shadow.vsh b/shaders/world0_with_twilight_forest_flag/shadow.vsh index ebf828c..c368a31 100644 --- a/shaders/world0_with_twilight_forest_flag/shadow.vsh +++ b/shaders/world0_with_twilight_forest_flag/shadow.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" #ifdef IS_LPV_ENABLED #extension GL_ARB_explicit_attrib_location: enable @@ -124,7 +120,7 @@ bool intersectCone(float coneHalfAngle, vec3 coneTip , vec3 coneAxis, vec3 rayOr // uniform float far; -uniform float dhFarPlane; +uniform float dhVoxyFarPlane; #include "/lib/DistantHorizons_projections.glsl" diff --git a/shaders/world1/composite.fsh b/shaders/world1/composite.fsh index 06943bf..535a452 100644 --- a/shaders/world1/composite.fsh +++ b/shaders/world1/composite.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite.vsh b/shaders/world1/composite.vsh index b9cb675..a28b9c5 100644 --- a/shaders/world1/composite.vsh +++ b/shaders/world1/composite.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite1.fsh b/shaders/world1/composite1.fsh index 1460f9c..04654f4 100644 --- a/shaders/world1/composite1.fsh +++ b/shaders/world1/composite1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite1.vsh b/shaders/world1/composite1.vsh index b3bd52d..8e0aed0 100644 --- a/shaders/world1/composite1.vsh +++ b/shaders/world1/composite1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite10.fsh b/shaders/world1/composite10.fsh index 288555f..34ce61e 100644 --- a/shaders/world1/composite10.fsh +++ b/shaders/world1/composite10.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite10.vsh b/shaders/world1/composite10.vsh index d40cdbc..ccdfe59 100644 --- a/shaders/world1/composite10.vsh +++ b/shaders/world1/composite10.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite11.fsh b/shaders/world1/composite11.fsh index a25493a..8ae8319 100644 --- a/shaders/world1/composite11.fsh +++ b/shaders/world1/composite11.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite11.vsh b/shaders/world1/composite11.vsh index 8a79caf..857fd9a 100644 --- a/shaders/world1/composite11.vsh +++ b/shaders/world1/composite11.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite12.fsh b/shaders/world1/composite12.fsh index 28f9d28..5c39db2 100644 --- a/shaders/world1/composite12.fsh +++ b/shaders/world1/composite12.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite12.vsh b/shaders/world1/composite12.vsh index c3c8cef..dbc8732 100644 --- a/shaders/world1/composite12.vsh +++ b/shaders/world1/composite12.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite13.fsh b/shaders/world1/composite13.fsh index 708f408..8cbe700 100644 --- a/shaders/world1/composite13.fsh +++ b/shaders/world1/composite13.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite13.vsh b/shaders/world1/composite13.vsh index a7361a1..14cad22 100644 --- a/shaders/world1/composite13.vsh +++ b/shaders/world1/composite13.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite2.fsh b/shaders/world1/composite2.fsh index 01351b3..47f0524 100644 --- a/shaders/world1/composite2.fsh +++ b/shaders/world1/composite2.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite2.vsh b/shaders/world1/composite2.vsh index 50a19f7..b57a634 100644 --- a/shaders/world1/composite2.vsh +++ b/shaders/world1/composite2.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite3.fsh b/shaders/world1/composite3.fsh index de4f569..c9b0b5e 100644 --- a/shaders/world1/composite3.fsh +++ b/shaders/world1/composite3.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite3.vsh b/shaders/world1/composite3.vsh index 442fe69..51d662e 100644 --- a/shaders/world1/composite3.vsh +++ b/shaders/world1/composite3.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite4.fsh b/shaders/world1/composite4.fsh index 79a6368..613e1f7 100644 --- a/shaders/world1/composite4.fsh +++ b/shaders/world1/composite4.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite4.vsh b/shaders/world1/composite4.vsh index 70eb693..7e44eb2 100644 --- a/shaders/world1/composite4.vsh +++ b/shaders/world1/composite4.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite5.fsh b/shaders/world1/composite5.fsh index 75bdf3c..deb8c65 100644 --- a/shaders/world1/composite5.fsh +++ b/shaders/world1/composite5.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite5.vsh b/shaders/world1/composite5.vsh index 826d9d2..cad98f9 100644 --- a/shaders/world1/composite5.vsh +++ b/shaders/world1/composite5.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite6.fsh b/shaders/world1/composite6.fsh index da7e3ba..3e966d4 100644 --- a/shaders/world1/composite6.fsh +++ b/shaders/world1/composite6.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite6.vsh b/shaders/world1/composite6.vsh index 82996e2..42b0917 100644 --- a/shaders/world1/composite6.vsh +++ b/shaders/world1/composite6.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite7.fsh b/shaders/world1/composite7.fsh index 0291401..8b43b73 100644 --- a/shaders/world1/composite7.fsh +++ b/shaders/world1/composite7.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite7.vsh b/shaders/world1/composite7.vsh index 27bb193..7a48c22 100644 --- a/shaders/world1/composite7.vsh +++ b/shaders/world1/composite7.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite8.fsh b/shaders/world1/composite8.fsh index 9b4e307..2b2f5a4 100644 --- a/shaders/world1/composite8.fsh +++ b/shaders/world1/composite8.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite8.vsh b/shaders/world1/composite8.vsh index 945e9fc..21dd2ea 100644 --- a/shaders/world1/composite8.vsh +++ b/shaders/world1/composite8.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite9.fsh b/shaders/world1/composite9.fsh index fb3319a..e28e1b6 100644 --- a/shaders/world1/composite9.fsh +++ b/shaders/world1/composite9.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/composite9.vsh b/shaders/world1/composite9.vsh index 642af84..9407784 100644 --- a/shaders/world1/composite9.vsh +++ b/shaders/world1/composite9.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/deferred.fsh b/shaders/world1/deferred.fsh index 7f7e0a5..33a06e3 100644 --- a/shaders/world1/deferred.fsh +++ b/shaders/world1/deferred.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/deferred.vsh b/shaders/world1/deferred.vsh index 754f892..80dc169 100644 --- a/shaders/world1/deferred.vsh +++ b/shaders/world1/deferred.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/deferred1.fsh b/shaders/world1/deferred1.fsh index fedbb6b..b060fdb 100644 --- a/shaders/world1/deferred1.fsh +++ b/shaders/world1/deferred1.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/deferred1.vsh b/shaders/world1/deferred1.vsh index 9a897ea..b164c43 100644 --- a/shaders/world1/deferred1.vsh +++ b/shaders/world1/deferred1.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/dh_terrain.fsh b/shaders/world1/dh_terrain.fsh index e4fec4c..d948c36 100644 --- a/shaders/world1/dh_terrain.fsh +++ b/shaders/world1/dh_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/dh_terrain.vsh b/shaders/world1/dh_terrain.vsh index fb14f59..818f03a 100644 --- a/shaders/world1/dh_terrain.vsh +++ b/shaders/world1/dh_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/dh_water.fsh b/shaders/world1/dh_water.fsh index 97b5b57..28e0681 100644 --- a/shaders/world1/dh_water.fsh +++ b/shaders/world1/dh_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/dh_water.vsh b/shaders/world1/dh_water.vsh index 294aa52..9ebd3fe 100644 --- a/shaders/world1/dh_water.vsh +++ b/shaders/world1/dh_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 330 compatibility -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/final.fsh b/shaders/world1/final.fsh index 855f975..1fa4863 100644 --- a/shaders/world1/final.fsh +++ b/shaders/world1/final.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/final.vsh b/shaders/world1/final.vsh index e00a119..a8e2e59 100644 --- a/shaders/world1/final.vsh +++ b/shaders/world1/final.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_armor_glint.fsh b/shaders/world1/gbuffers_armor_glint.fsh index 5e405a5..0d736cc 100644 --- a/shaders/world1/gbuffers_armor_glint.fsh +++ b/shaders/world1/gbuffers_armor_glint.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world1/gbuffers_armor_glint.vsh b/shaders/world1/gbuffers_armor_glint.vsh index 328a320..01a4c43 100644 --- a/shaders/world1/gbuffers_armor_glint.vsh +++ b/shaders/world1/gbuffers_armor_glint.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENCHANT_GLINT diff --git a/shaders/world1/gbuffers_basic.fsh b/shaders/world1/gbuffers_basic.fsh index 6a9d420..e4e749b 100644 --- a/shaders/world1/gbuffers_basic.fsh +++ b/shaders/world1/gbuffers_basic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES #define END_SHADER diff --git a/shaders/world1/gbuffers_basic.vsh b/shaders/world1/gbuffers_basic.vsh index 6cf1b75..60faf22 100644 --- a/shaders/world1/gbuffers_basic.vsh +++ b/shaders/world1/gbuffers_basic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define LINES #define END_SHADER diff --git a/shaders/world1/gbuffers_beaconbeam.fsh b/shaders/world1/gbuffers_beaconbeam.fsh index de7e25b..9b43c38 100644 --- a/shaders/world1/gbuffers_beaconbeam.fsh +++ b/shaders/world1/gbuffers_beaconbeam.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world1/gbuffers_beaconbeam.vsh b/shaders/world1/gbuffers_beaconbeam.vsh index ef2815b..38f7ac2 100644 --- a/shaders/world1/gbuffers_beaconbeam.vsh +++ b/shaders/world1/gbuffers_beaconbeam.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BEACON_BEAM diff --git a/shaders/world1/gbuffers_block.fsh b/shaders/world1/gbuffers_block.fsh index 645e2d1..b941cf9 100644 --- a/shaders/world1/gbuffers_block.fsh +++ b/shaders/world1/gbuffers_block.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world1/gbuffers_block.vsh b/shaders/world1/gbuffers_block.vsh index 4f696db..d75a2d9 100644 --- a/shaders/world1/gbuffers_block.vsh +++ b/shaders/world1/gbuffers_block.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define BLOCKENTITIES diff --git a/shaders/world1/gbuffers_block_translucent.fsh b/shaders/world1/gbuffers_block_translucent.fsh index a9b7a95..be1e31a 100644 --- a/shaders/world1/gbuffers_block_translucent.fsh +++ b/shaders/world1/gbuffers_block_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define END_SHADER diff --git a/shaders/world1/gbuffers_block_translucent.vsh b/shaders/world1/gbuffers_block_translucent.vsh index 6b157ee..e80c829 100644 --- a/shaders/world1/gbuffers_block_translucent.vsh +++ b/shaders/world1/gbuffers_block_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define BLOCKENTITIES #define END_SHADER diff --git a/shaders/world1/gbuffers_damagedblock.fsh b/shaders/world1/gbuffers_damagedblock.fsh index 8d354b1..535181a 100644 --- a/shaders/world1/gbuffers_damagedblock.fsh +++ b/shaders/world1/gbuffers_damagedblock.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world1/gbuffers_damagedblock.vsh b/shaders/world1/gbuffers_damagedblock.vsh index 85ddcfd..7d21287 100644 --- a/shaders/world1/gbuffers_damagedblock.vsh +++ b/shaders/world1/gbuffers_damagedblock.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER #define DAMAGE_BLOCK_EFFECT diff --git a/shaders/world1/gbuffers_entities.fsh b/shaders/world1/gbuffers_entities.fsh index 88f5c21..94af613 100644 --- a/shaders/world1/gbuffers_entities.fsh +++ b/shaders/world1/gbuffers_entities.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define ENTITIES diff --git a/shaders/world1/gbuffers_entities.vsh b/shaders/world1/gbuffers_entities.vsh index 4db938d..6376104 100644 --- a/shaders/world1/gbuffers_entities.vsh +++ b/shaders/world1/gbuffers_entities.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility // #define WORLD diff --git a/shaders/world1/gbuffers_entities_glowing.fsh b/shaders/world1/gbuffers_entities_glowing.fsh index c2a8ff2..9ed3c10 100644 --- a/shaders/world1/gbuffers_entities_glowing.fsh +++ b/shaders/world1/gbuffers_entities_glowing.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world1/gbuffers_entities_glowing.vsh b/shaders/world1/gbuffers_entities_glowing.vsh index 9588c1a..dd19f6b 100644 --- a/shaders/world1/gbuffers_entities_glowing.vsh +++ b/shaders/world1/gbuffers_entities_glowing.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define GLOWING diff --git a/shaders/world1/gbuffers_entities_translucent.fsh b/shaders/world1/gbuffers_entities_translucent.fsh index 9a1438d..a45ca82 100644 --- a/shaders/world1/gbuffers_entities_translucent.fsh +++ b/shaders/world1/gbuffers_entities_translucent.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define END_SHADER diff --git a/shaders/world1/gbuffers_entities_translucent.vsh b/shaders/world1/gbuffers_entities_translucent.vsh index d67c301..f5deea6 100644 --- a/shaders/world1/gbuffers_entities_translucent.vsh +++ b/shaders/world1/gbuffers_entities_translucent.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define ENTITIES #define END_SHADER diff --git a/shaders/world1/gbuffers_hand.fsh b/shaders/world1/gbuffers_hand.fsh index a080590..83f98eb 100644 --- a/shaders/world1/gbuffers_hand.fsh +++ b/shaders/world1/gbuffers_hand.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world1/gbuffers_hand.vsh b/shaders/world1/gbuffers_hand.vsh index 5be3aff..58d92cc 100644 --- a/shaders/world1/gbuffers_hand.vsh +++ b/shaders/world1/gbuffers_hand.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define HAND diff --git a/shaders/world1/gbuffers_hand_water.fsh b/shaders/world1/gbuffers_hand_water.fsh index d21c4a2..e9691f1 100644 --- a/shaders/world1/gbuffers_hand_water.fsh +++ b/shaders/world1/gbuffers_hand_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define END_SHADER diff --git a/shaders/world1/gbuffers_hand_water.vsh b/shaders/world1/gbuffers_hand_water.vsh index 1d960e5..bd57d0e 100644 --- a/shaders/world1/gbuffers_hand_water.vsh +++ b/shaders/world1/gbuffers_hand_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define HAND #define END_SHADER diff --git a/shaders/world1/gbuffers_lightning.fsh b/shaders/world1/gbuffers_lightning.fsh index 38cf433..3cce8d3 100644 --- a/shaders/world1/gbuffers_lightning.fsh +++ b/shaders/world1/gbuffers_lightning.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define OVERWORLD_SHADER //otherwise it won't work... diff --git a/shaders/world1/gbuffers_lightning.vsh b/shaders/world1/gbuffers_lightning.vsh index 28127ec..8977508 100644 --- a/shaders/world1/gbuffers_lightning.vsh +++ b/shaders/world1/gbuffers_lightning.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define WORLD #define OVERWORLD_SHADER //otherwise it won't work for some reason... diff --git a/shaders/world1/gbuffers_skybasic.fsh b/shaders/world1/gbuffers_skybasic.fsh index 17c2182..2ece8fa 100644 --- a/shaders/world1/gbuffers_skybasic.fsh +++ b/shaders/world1/gbuffers_skybasic.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility /* RENDERTARGETS:0 */ diff --git a/shaders/world1/gbuffers_skybasic.vsh b/shaders/world1/gbuffers_skybasic.vsh index 6cf9c57..4d7379d 100644 --- a/shaders/world1/gbuffers_skybasic.vsh +++ b/shaders/world1/gbuffers_skybasic.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world1/gbuffers_skytextured.fsh b/shaders/world1/gbuffers_skytextured.fsh index c6e242e..85dc748 100644 --- a/shaders/world1/gbuffers_skytextured.fsh +++ b/shaders/world1/gbuffers_skytextured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { diff --git a/shaders/world1/gbuffers_skytextured.vsh b/shaders/world1/gbuffers_skytextured.vsh index bd73477..c47b076 100644 --- a/shaders/world1/gbuffers_skytextured.vsh +++ b/shaders/world1/gbuffers_skytextured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility void main() { gl_Position = ftransform(); diff --git a/shaders/world1/gbuffers_spidereyes.fsh b/shaders/world1/gbuffers_spidereyes.fsh index 15cdcc2..ee5e2a7 100644 --- a/shaders/world1/gbuffers_spidereyes.fsh +++ b/shaders/world1/gbuffers_spidereyes.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world1/gbuffers_spidereyes.vsh b/shaders/world1/gbuffers_spidereyes.vsh index adf4440..1574d95 100644 --- a/shaders/world1/gbuffers_spidereyes.vsh +++ b/shaders/world1/gbuffers_spidereyes.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define SPIDER_EYES diff --git a/shaders/world1/gbuffers_terrain.fsh b/shaders/world1/gbuffers_terrain.fsh index be2d06e..38c7df7 100644 --- a/shaders/world1/gbuffers_terrain.fsh +++ b/shaders/world1/gbuffers_terrain.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_terrain.vsh b/shaders/world1/gbuffers_terrain.vsh index c407951..634d36b 100644 --- a/shaders/world1/gbuffers_terrain.vsh +++ b/shaders/world1/gbuffers_terrain.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_textured.fsh b/shaders/world1/gbuffers_textured.fsh index 1e90111..d6c4c5d 100644 --- a/shaders/world1/gbuffers_textured.fsh +++ b/shaders/world1/gbuffers_textured.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_textured.vsh b/shaders/world1/gbuffers_textured.vsh index fdefbfd..b54a375 100644 --- a/shaders/world1/gbuffers_textured.vsh +++ b/shaders/world1/gbuffers_textured.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_textured_lit.fsh b/shaders/world1/gbuffers_textured_lit.fsh index bb2006e..9ea80a0 100644 --- a/shaders/world1/gbuffers_textured_lit.fsh +++ b/shaders/world1/gbuffers_textured_lit.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_textured_lit.vsh b/shaders/world1/gbuffers_textured_lit.vsh index 6787ff7..97f5282 100644 --- a/shaders/world1/gbuffers_textured_lit.vsh +++ b/shaders/world1/gbuffers_textured_lit.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility // #define WEATHER #define PARTICLES diff --git a/shaders/world1/gbuffers_water.fsh b/shaders/world1/gbuffers_water.fsh index 676894e..b27fddf 100644 --- a/shaders/world1/gbuffers_water.fsh +++ b/shaders/world1/gbuffers_water.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_water.vsh b/shaders/world1/gbuffers_water.vsh index e487f42..7a2b1ec 100644 --- a/shaders/world1/gbuffers_water.vsh +++ b/shaders/world1/gbuffers_water.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define END_SHADER diff --git a/shaders/world1/gbuffers_weather.fsh b/shaders/world1/gbuffers_weather.fsh index e2c010c..b96966e 100644 --- a/shaders/world1/gbuffers_weather.fsh +++ b/shaders/world1/gbuffers_weather.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility varying vec4 lmtexcoord; diff --git a/shaders/world1/gbuffers_weather.vsh b/shaders/world1/gbuffers_weather.vsh index 91d898c..e34bc68 100644 --- a/shaders/world1/gbuffers_weather.vsh +++ b/shaders/world1/gbuffers_weather.vsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #define TAA /* diff --git a/shaders/world1/shadow.fsh b/shaders/world1/shadow.fsh index 7898fae..dddab8f 100644 --- a/shaders/world1/shadow.fsh +++ b/shaders/world1/shadow.fsh @@ -1,8 +1,4 @@ -#ifndef MC_OS_MAC - #version 430 compatibility -#else - #version 120 -#endif +#version 430 compatibility #include "/lib/settings.glsl" diff --git a/shaders/world1/shadow.vsh b/shaders/world1/shadow.vsh index 2bb2b09..4b8b5de 100644 --- a/shaders/world1/shadow.vsh +++ b/shaders/world1/shadow.vsh @@ -1,9 +1,7 @@ -#ifdef MC_OS_MAC - #version 120 -#else - #version 430 compatibility - #include "/lib/SSBOs.glsl" -#endif +#version 430 compatibility +#include "/lib/SSBOs.glsl" + + #extension GL_ARB_explicit_attrib_location: enable #extension GL_ARB_shader_image_load_store: enable