Skip to content

Commit a3898be

Browse files
ambrosia13ambrosia13
committed
Better config
1 parent 5f6e04d commit a3898be

File tree

6 files changed

+104
-156
lines changed

6 files changed

+104
-156
lines changed

‎assets/forgetmenot/include/shadow_config.json5‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
{
2-
options: [
3-
{
4-
includeToken: "forgetmenot:shadows",
5-
categoryKey: "config.forgetmenot.category.shadows",
6-
elements: {
7-
shadow_filter: {
8-
default: true,
9-
nameKey: "config.forgetmenot.name.shadow_filter",
10-
descriptionKey: "config.forgetmenot.desc.shadow_filter"
11-
},
12-
cascade_adjust: {
13-
default: false,
14-
nameKey: "config.forgetmenot.name.cascade_adjust",
15-
descriptionKey: "config.forgetmenot.desc.cascade_adjust"
16-
},
17-
shadow_filter_taps: {
18-
default: 3,
19-
min: 0,
20-
max: 10,
21-
nameKey: "config.forgetmenot.name.shadow_filter_taps",
22-
descriptionKey: "config.forgetmenot.desc.shadow_filter_taps"
23-
},
24-
volumetric_lighting: {
25-
default: false,
26-
nameKey: "config.forgetmenot.name.volumetric_lighting",
27-
descriptionKey: "config.forgetmenot.desc.volumetric_lighting"
28-
},
29-
}
30-
}
31-
]
2+
// options: [
3+
// {
4+
// includeToken: "forgetmenot:shadows",
5+
// categoryKey: "config.forgetmenot.category.shadows",
6+
// elements: {
7+
// shadow_filter: {
8+
// default: true,
9+
// nameKey: "config.forgetmenot.name.shadow_filter",
10+
// descriptionKey: "config.forgetmenot.desc.shadow_filter"
11+
// },
12+
// cascade_adjust: {
13+
// default: false,
14+
// nameKey: "config.forgetmenot.name.cascade_adjust",
15+
// descriptionKey: "config.forgetmenot.desc.cascade_adjust"
16+
// },
17+
// shadow_filter_taps: {
18+
// default: 3,
19+
// min: 0,
20+
// max: 10,
21+
// nameKey: "config.forgetmenot.name.shadow_filter_taps",
22+
// descriptionKey: "config.forgetmenot.desc.shadow_filter_taps"
23+
// },
24+
// volumetric_lighting: {
25+
// default: false,
26+
// nameKey: "config.forgetmenot.name.volumetric_lighting",
27+
// descriptionKey: "config.forgetmenot.desc.volumetric_lighting"
28+
// },
29+
// }
30+
// }
31+
// ]
3232
}

‎assets/forgetmenot/lang/en_us.json‎

Lines changed: 40 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,45 @@
11
{
22
"pipeline.forgetmenot.name": "Forget-Me-Not Shaders",
3-
"pipeline.forgetmenot.desc": "Forget-Me-Not without any shadows",
4-
"pipeline.forgetmenot_shadow.name": "Forget-Me-Not Shaders [Sky Shadows]",
5-
"pipeline.forgetmenot_shadow.desc": "Forget-Me-Not with shadows enabled",
6-
7-
8-
"config.forgetmenot.category.shadows": "Shadow Options",
9-
10-
"config.forgetmenot.name.shadow_filter": "Shadow Filter",
11-
"config.forgetmenot.desc.shadow_filter": "Filters shadows to soften jagged edges. Performance cost.",
12-
"config.forgetmenot.name.cascade_adjust": "Cascade Adjust",
13-
"config.forgetmenot.desc.cascade_adjust": "Adjusts the shadow filter size based on cascade, to minimize shadow acne. ;If this option is enabled, shadow filter taps option is ignored.",
14-
"config.forgetmenot.name.shadow_filter_taps": "Shadow Filter Taps",
15-
"config.forgetmenot.desc.shadow_filter_taps": "Shadow samples equals this number squared. High performance cost. ;Ignored if cascade adjust option is enabled.",
16-
"config.forgetmenot.name.volumetric_lighting": "[EXPERIMENTAL] Volumetric Light Rays",
17-
"config.forgetmenot.desc.volumetric_lighting": "Adds fog that is illuminated by sunlight. Very experimental and bad. Works well with depressing mode. High performance cost.",
18-
19-
20-
"config.forgetmenot.category.clouds": "Cloud Options",
21-
22-
"config.forgetmenot.name.clouds": "Clouds",
23-
"config.forgetmenot.desc.clouds": "Enables extensive 2D clouds. Up to 9 layers of different types of clouds. High performance cost.",
24-
"config.forgetmenot.name.cloud_noise_octaves": "Cloud Noise Octaves",
25-
"config.forgetmenot.desc.cloud_noise_octaves": "The higher the number, the sharper the clouds appear. High performance cost.",
26-
"config.forgetmenot.name.stratus_clouds": "Stratus Clouds",
27-
"config.forgetmenot.desc.stratus_clouds": "Cloud shape that resembles stratus clouds.",
28-
"config.forgetmenot.name.cumulus_clouds": "Cumulus Clouds",
29-
"config.forgetmenot.desc.cumulus_clouds": "Cloud shape that resembles cumulus clouds.",
30-
"config.forgetmenot.name.stratocumulus_clouds": "Stratocumulus Clouds",
31-
"config.forgetmenot.desc.stratocumulus_clouds": "Cloud shape that resembles stratocumulus clouds.",
32-
"config.forgetmenot.name.nimbostratus_clouds": "Nimbostratus Clouds",
33-
"config.forgetmenot.desc.nimbostratus_clouds": "Cloud shape that resembles nimbostratus clouds.",
34-
"config.forgetmenot.name.altostratus_clouds": "Altostratus Clouds",
35-
"config.forgetmenot.desc.altostratus_clouds": "Cloud shape that resembles altostratus clouds.",
36-
"config.forgetmenot.name.altocumulus_clouds": "Altocumulus Clouds",
37-
"config.forgetmenot.desc.altocumulus_clouds": "Cloud shape that resembles altocumulus clouds.",
38-
"config.forgetmenot.name.cirrostratus_clouds": "Cirrostratus Clouds",
39-
"config.forgetmenot.desc.cirrostratus_clouds": "Cloud shape that resembles cirrostratus clouds.",
40-
"config.forgetmenot.name.cirrocumulus_clouds": "Cirrocumulus Clouds",
41-
"config.forgetmenot.desc.cirrocumulus_clouds": "Cloud shape that resembles cirrocumulus clouds.",
42-
"config.forgetmenot.name.cirrus_clouds": "Cirrus Clouds",
43-
"config.forgetmenot.desc.cirrus_clouds": "Cloud shape that resembles cirrus clouds.",
44-
"config.forgetmenot.name.clouds_constant_weight": "Constant Cloud Weight",
45-
"config.forgetmenot.desc.clouds_constant_weight": "If enabled, density of clouds will not be dependent on world time. ;This means that every single cloud type that is enabled will show up in the sky, all the time.",
46-
47-
48-
"config.forgetmenot.category.water_reflections": "Water & Reflections",
49-
50-
"config.forgetmenot.name.raytrace_ssr": "Raymarch Reflections",
51-
"config.forgetmenot.desc.raytrace_ssr": "Uses raymarching to give accurate reflections. Else will just flip the screen for reflections, which is inaccurate but a bit faster.",
52-
"config.forgetmenot.name.ssr_steps": "SSR Steps",
53-
"config.forgetmenot.desc.ssr_steps": "Number of raymarching steps for raymarched reflections. Increase for a mild performance decrease but better quality reflections. Doesn't seem to impact performance much.",
54-
"config.forgetmenot.name.waves_quality": "Water Waves Quality",
55-
"config.forgetmenot.desc.waves_quality": "Number of noise octaves to use for water noise. High performance cost.",
56-
"config.forgetmenot.name.simple_water": "Fast Water",
57-
"config.forgetmenot.desc.simple_water": "Uses simpler water normals. Enable this if looking at water makes your performance drop a bunch. ;Also use this if the water reflections look warped and stretched.",
58-
"config.forgetmenot.name.simple_sky_reflection": "Simple Sky Reflection",
59-
"config.forgetmenot.desc.simple_sky_reflection": "If enabled, skips cloud and star rendering when calculating reflections. May improve performance a bit.",
60-
"config.forgetmenot.name.illegal_ssr": "Illegal SSR",
61-
"config.forgetmenot.desc.illegal_ssr": "Uses cursed and highly illegal method to have easy mutli-bounce reflections. Usually doesn't cause issues. May decrease performance.",
62-
63-
64-
"config.forgetmenot.category.general": "General Options",
65-
66-
"config.forgetmenot.name.depressing_mode": "Depressing Mode",
67-
"config.forgetmenot.desc.depressing_mode": "Makes the entire game mode more moody, depressing, and gray.",
68-
"config.forgetmenot.name.emissive_boost": "Emissive Boost",
69-
"config.forgetmenot.desc.emissive_boost": "Brightness of emissive boost. Affects bloom and global illumination.",
70-
"config.forgetmenot.name.bloom_mix_factor": "Bloom Amount",
71-
"config.forgetmenot.desc.bloom_mix_factor": "Bloom amount. 10 for 100 percent. Does not affect brightness of bloom, just the amount.",
72-
"config.forgetmenot.name.pixel_locked_glint": "Pixel Locked Enchantment Glint",
73-
"config.forgetmenot.desc.pixel_locked_glint": "Locks the enchantment glint to the pixels of the texture. Similar to Bedrock edition glint.",
74-
"config.forgetmenot.name.fake_eye_adjust": "Fake Eye Adjust",
75-
"config.forgetmenot.desc.fake_eye_adjust": "Uses current lightmap value at the player position to adjust brightness when the player is in a dark area.",
76-
"config.forgetmenot.name.contrast": "Contrast",
77-
"config.forgetmenot.desc.contrast": "Adjusts contrast. 10 means no adjustment to contrast.",
78-
"config.forgetmenot.name.vanilla_lava": "Vanilla Lava",
79-
"config.forgetmenot.desc.vanilla_lava": "Enable for vanilla lava texture. Custom lava texture may have a minor performance impact.",
80-
81-
82-
"config.forgetmenot.category.lighting": "Lighting Options",
83-
84-
"config.forgetmenot.name.direct_light_intensity_day": "Direct Light Intensity [Day]",
85-
"config.forgetmenot.desc.direct_light_intensity_day": "Brightness of direct light during daytime.",
86-
"config.forgetmenot.name.ambient_light_intensity_day": "Ambient Light Intensity [Day]",
87-
"config.forgetmenot.desc.ambient_light_intensity_day": "Brightness of shadows during daytime.",
88-
"config.forgetmenot.name.direct_light_intensity_night": "Direct Light Intensity [Night]",
89-
"config.forgetmenot.desc.direct_light_intensity_night": "Brightness of direct light during nighttime.",
90-
"config.forgetmenot.name.ambient_light_intensity_night": "Ambient Light Intensity [Night]",
91-
"config.forgetmenot.desc.ambient_light_intensity_night": "Brightness of shadows during nighttime.",
92-
"config.forgetmenot.name.held_light_radius": "Held Light Radius",
93-
"config.forgetmenot.desc.held_light_radius": "Radius in blocks of held light.",
94-
95-
"config.forgetmenot.category.experimental": "Experimental Stuff",
96-
97-
"config.forgetmenot.name.global_illumination": "Screen Space Global Illumination",
98-
"config.forgetmenot.desc.global_illumination": "Raytraces in screen space for global illumination. For colored lighting & ambient occlusion.",
99-
"config.forgetmenot.name.steps": "Step Count",
100-
"config.forgetmenot.desc.steps": "Number of times to run the raytracing loop. 1 for decent colored light, 10 for ambient occlusion and good colored lights.",
101-
"config.forgetmenot.name.gi_range": "Global Illumination Range",
102-
"config.forgetmenot.desc.gi_range": "Range of global illumination in blocks. 1 is good for gameplay, increase for better screenshots and longer range lighting.",
103-
"config.forgetmenot.name.gi_filter": "Global Illumination Filter",
104-
"config.forgetmenot.desc.gi_filter": "Filter to reduce noise of global illumination. High performance impact.",
105-
"config.forgetmenot.name.gi_filter_quality": "GI Filter Quality",
106-
"config.forgetmenot.desc.gi_filter_quality": "Quality of the GI filter blur. High performance impact.",
107-
"config.forgetmenot.name.apply_mc_lightmap": "Apply Minecraft Lightmap",
108-
"config.forgetmenot.desc.apply_mc_lightmap": "When disabled, won't apply vanilla lightmap.",
3+
"pipeline.forgetmenot.desc": "Semi-realistic immersive shaderpack",
4+
5+
"config.forgetmenot.category.atmospherics": "Sky & Atmospherics",
6+
7+
"config.forgetmenot.name.sky_ground_fog": "Horizon Sharpness",
8+
"config.forgetmenot.desc.sky_ground_fog": "How sharp the transition between the sky ground and the sky is",
9+
"config.forgetmenot.name.mie_amount": "Mie Scattering Amount",
10+
"config.forgetmenot.desc.mie_amount": "Intensity of the halo around the sun",
11+
"config.forgetmenot.name.sun_energy": "Sun Energy",
12+
"config.forgetmenot.desc.sun_energy": "Energy amount to use for mie scattering phase ;Affects sun and sun halo",
13+
"config.forgetmenot.name.dynamic_weather": "Dynamic Weather",
14+
"config.forgetmenot.desc.dynamic_weather": "Dynamic weather system for clouds ;Impacts performance slightly",
15+
"config.forgetmenot.name.cloud_light_rays": "Cloud Light Rays",
16+
"config.forgetmenot.desc.cloud_light_rays": "Light rays on the cloud plane ;Aren't physically based and don't look correct ;Impacts performance greatly",
17+
"config.forgetmenot.name.cloud_detail": "Cloud Detail",
18+
"config.forgetmenot.desc.cloud_detail": "Amount of octaves to use for cloud noise ;Higher number means more detailed and intricate clouds ;Impacts performance greatly",
19+
"config.forgetmenot.name.cloud_shading_detail": "Cloud Shading Detail",
20+
"config.forgetmenot.desc.cloud_shading_detail": "Amount of octaves to use for cloud lighting ;Higher number means more detailed and intricate lighting ;Impacts performance greatly ;Recommended to leave at default",
21+
"config.forgetmenot.name.curl_noise": "Cloud Curl Noise",
22+
"config.forgetmenot.desc.curl_noise": "Enables curl noise which adds extra detail to the cloud shape and movement ;Impacts performance mildly",
23+
"config.forgetmenot.name.atmospheric_fog": "Atmospheric Fog",
24+
"config.forgetmenot.desc.atmospheric_fog": "Fog that uses atmospheric scattering",
25+
"config.forgetmenot.name.border_fog": "Border Fog",
26+
"config.forgetmenot.desc.border_fog": "Fog that hides chunk borders",
27+
28+
"config.forgetmenot.category.lighting": "Lighting",
29+
30+
"config.forgetmenot.name.day_brightness": "Day Brightness",
31+
"config.forgetmenot.desc.day_brightness": "Brightness of daylight",
32+
"config.forgetmenot.name.night_brightness": "Night Brightness",
33+
"config.forgetmenot.desc.night_brightness": "Brightness of nightlight",
34+
"config.forgetmenot.name.blocklight_neutrality": "Neutral Blocklight Color",
35+
"config.forgetmenot.desc.blocklight_neutrality": "Turn to 0 for orange blocklight, turn to 1 for neutral colored blocklight",
10936
"config.forgetmenot.name.vanilla_ao": "Vanilla Ambient Occlusion",
110-
"config.forgetmenot.desc.vanilla_ao": "Enables and disables Vanilla AO. Recommended to leave on.",
111-
"config.forgetmenot.name.directional_shading": "Directional Shading",
112-
"config.forgetmenot.desc.directional_shading": "Enables and disables directional sunlight shading."
37+
"config.forgetmenot.desc.vanilla_ao": "Whether to enable vanilla minecraft approximation of ambient occlusion",
38+
"config.forgetmenot.name.rtao": "Raytraced Ambient Occlusion",
39+
"config.forgetmenot.desc.rtao": "Whether to enable ray traced ambient occlusion ;Impacts performance",
40+
41+
"config.forgetmenot.category.debug": "Debug",
11342

43+
"config.forgetmenot.name.white_world": "White World",
44+
"config.forgetmenot.desc.white_world": "Every block is colored white ;Used for examining lighting"
11445
}

‎assets/forgetmenot/shaders/lib/materials.glsl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ vec2 fmn_hash2D(float p) {
2020
return fract((p3.xx+p3.yz)*p3.zy);
2121
}
2222

23+
vec2 fmn_rotate2D(vec2 uv, float angle) {
24+
float s = sin(angle);
25+
float c = cos(angle);
26+
mat2 mat = mat2(c, s, -s, c);
27+
return mat * uv;
28+
}
29+
2330
float fmn_noise2D(in vec2 st) {
2431
vec2 p = floor(st);
2532
vec2 f = fract(st);

‎assets/forgetmenot/shaders/post/fabulous/sort.frag‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,12 @@ void main() {
296296

297297
// if(min_depth == 1.0) {
298298
translucent_color.rgb = mix(translucent_color.rgb, waterFogColor, fogDensity);
299-
translucent_color.a = mix(translucent_color.a, 0.9, fogDensity);
299+
translucent_color.a = mix(translucent_color.a, 0.99, fogDensity);
300300
// }
301301

302302
}
303303

304-
if(pbrData.g > 0.5 || frx_cameraInWater == 1) {
304+
if(frx_cameraInWater == 1) {
305305
main_color.rgb *= vec3(0.16, 0.81, 1.0);
306306
}
307307

@@ -317,7 +317,7 @@ void main() {
317317
try_insert(entity_color, entity_depth);
318318
try_insert(weather_color, weather_depth);
319319
try_insert(particles_color, particles_depth);
320-
if(clouds_depth < max_depth) color_layers[0].rgb = mix(color_layers[0].rgb, clouds_color.rgb, clouds_color.a);
320+
//if(clouds_depth < max_depth) color_layers[0].rgb = mix(color_layers[0].rgb, clouds_color.rgb, clouds_color.a);
321321

322322
vec3 composite = color_layers[0].rgb;
323323
for (int ii = 1; ii < active_layers; ++ii) {

‎assets/minecraft/shaders/material/stylize/sss.frag‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
void frx_materialFragment() {
44
#ifdef PBR_ENABLED
55
#if FMN_PBR >= 1
6-
fmn_sssAmount = 1.0;
6+
//fmn_sssAmount = 1.0;
77
#endif
88
#endif
99
}

‎assets/minecraft/shaders/material/stylize/water.frag‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,30 @@ float waterHeightNoise(in vec2 uv) {
2222
// float offset = 1.0;
2323
// float noise;
2424

25-
// mat2 rotationMatrix = mat2(cos(PI / 6.0), sin(PI / 6.0), -sin(PI / 6.0), cos(PI / 6.0));
25+
// mat2 rotationMatrix = mat2(cos(PI / 16.0), sin(PI / 16.0), -sin(PI / 16.0), cos(PI / 16.0));
2626

27-
// for(int i = 0; i < 10; i++) {
28-
// // noise += amp * exp2(sin(uv.x + uv.y) * sin((uv.x + 2.0 * uv.y) * 0.5) - 1.0);
29-
// // uv = 1.0 * (uv) + mod(frx_renderSeconds * 0.1, 1000.0);
30-
// // uv *= 2.0;
31-
// // amp *= 0.5;
32-
// // uv += offset * 0.5 * i;
33-
// float n = sin(dot(uv.xy, fmn_hash2D(float(i)) * 2.0 - 1.0));
34-
// noise += amp * exp(n);
35-
36-
// uv = rotationMatrix * uv * 2.0;
27+
// // for(int i = 0; i < 10; i++) {
28+
// // // // noise += amp * exp2(sin(uv.x + uv.y) * sin((uv.x + 2.0 * uv.y) * 0.5) - 1.0);
29+
// // // // uv = 1.0 * (uv) + mod(frx_renderSeconds * 0.1, 1000.0);
30+
// // // // uv *= 2.0;
31+
// // // // amp *= 0.5;
32+
// // // // uv += offset * 0.5 * i;
33+
// // // float n = sin(dot(uv.xy, fmn_hash2D(float(i)) * 2.0 - 1.0));
34+
// // // noise += amp * exp(n);
35+
36+
// // // uv = rotationMatrix * uv * 2.0;
37+
// // // amp *= 0.5;
38+
// // // uv += offset * i;
39+
// // uv = rotationMatrix * uv;
40+
// // noise += amp * sin(uv.x);
41+
// // amp *= 0.5;
42+
// // }
43+
// for(int i = 0; i < 20; i++) {
44+
// uv = fmn_rotate2D(uv, fmn_hash1D(i));
45+
// noise += amp * pow(sin(uv.x), 2.0);
46+
// uv *= 2.0;
47+
// uv += frx_renderSeconds * amp * 4.0;
3748
// amp *= 0.5;
38-
// uv += offset * i;
3949
// }
4050

4151
// return noise * 0.05;
@@ -49,7 +59,7 @@ void frx_materialFragment() {
4959
// uv0.y - (sin(frx_renderSeconds / 1.0) / 2.0 + frx_renderSeconds / 1.0)
5060
// ) * 0.3;
5161

52-
//uv = floor(uv * 16.0) / 16.0;
62+
//uv = floor(uv * 116.0) / 116.0;
5363

5464
float centerNoise = waterHeightNoise(uv);
5565
uv = fmn_parallaxMapping(uv, centerNoise * 4.0);

0 commit comments

Comments
 (0)