diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-09-12 07:29:26 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-09-12 07:57:30 +0800 |
| commit | f87fa59b1e490d7a752bf8937bc67b7b18a62ad5 (patch) | |
| tree | 1794ca14a7da95fbaa621661c2096a4b39142fb2 /indra/newview/app_settings | |
| parent | 7279245b5fee11bf0683a068639d42f3bacd5e6b (diff) | |
| parent | 067d83b640d3fae45098ef8bc71e913c1eb65a44 (diff) | |
Merge remote-tracking branch 'mobserveur/experimental2'
Diffstat (limited to 'indra/newview/app_settings')
3 files changed, 13 insertions, 7 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 503f2760a8..d9cf46a4af 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14417,7 +14417,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>1.5</integer> + <integer>1.0</integer> </map> <key>MPHDRGamma</key> <map> @@ -14439,7 +14439,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <integer>1.5</integer> + <integer>1.0</integer> </map> <key>MPColorPrecision</key> <map> diff --git a/indra/newview/app_settings/shaders/class1/effects/bloomExtractF.glsl b/indra/newview/app_settings/shaders/class1/effects/bloomExtractF.glsl index d878ab053e..66d86eec1f 100644 --- a/indra/newview/app_settings/shaders/class1/effects/bloomExtractF.glsl +++ b/indra/newview/app_settings/shaders/class1/effects/bloomExtractF.glsl @@ -2,7 +2,7 @@ out vec4 frag_color; uniform sampler2D diffuseMap; uniform sampler2D bloomExtractORM; // orm -uniform sampler2D bloomExtractEmissive; // emissive +//uniform sampler2D bloomExtractEmissive; // emissive uniform sampler2D bloomExtractEmissive2; // emissive 2 uniform float bloomExtractBrightness = 0.9; @@ -15,6 +15,12 @@ void main() { vec4 col = texture(diffuseMap, vary_texcoord0.xy); + if(col.a > 0.001) + { + discard; + return; + } + //int valid = 0; //float brightness = dot(col.rgb, vec3(0.2126, 0.7152, 0.0722)); float brightness = dot(col.rgb, vec3(0.3, 0.5, 0.2)); @@ -25,14 +31,16 @@ void main() return; } + /* vec3 emi = texture(bloomExtractEmissive, vary_texcoord0.xy).rgb; if(emi.r + emi.g + emi.b > 0.01) { discard; return; } + */ - emi = texture(bloomExtractEmissive2, vary_texcoord0.xy).rgb; + vec3 emi = texture(bloomExtractEmissive2, vary_texcoord0.xy).rgb; if(emi.r + emi.g + emi.b > 0.01) { discard; diff --git a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl index 42cc333829..83fe1c505f 100644 --- a/indra/newview/app_settings/shaders/class1/interface/uiF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/uiF.glsl @@ -27,12 +27,10 @@ out vec4 frag_color; uniform sampler2D diffuseMap; -uniform float mpHDRBoost = 1.0; - in vec2 vary_texcoord0; in vec4 vertex_color; void main() { - frag_color = mpHDRBoost * vertex_color*texture(diffuseMap, vary_texcoord0.xy); + frag_color = vertex_color*texture(diffuseMap, vary_texcoord0.xy); } |