eric/matrix
1
0
Fork 0
mirror of https://github.com/Rezmason/matrix.git synced 2026-04-21 23:39:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Moving bloom strength math to the combine steps, and fixing a redundant multiply issue in the REGL based renderer

Browse Source
This commit is contained in:
Rezmason
2022-10-04 21:53:53 -07:00
parent 507f907096
commit 3843dd90d1
17 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shaders/glsl/imagePass.frag.glsl
View File

@@ -2,13 +2,12 @@ precision mediump float;
uniform sampler2D tex;
uniform sampler2D bloomTex;
uniform sampler2D backgroundTex;
uniform float bloomStrength;
varying vec2 vUV;
vec4 getBrightness(vec2 uv) {
vec4 primary = texture2D(tex, uv);
vec4 bloom = texture2D(bloomTex, uv) * bloomStrength;
return min((primary + bloom) * (2.0 - bloomStrength), 1.0);
vec4 bloom = texture2D(bloomTex, uv);
return primary + bloom;
}
void main() {

5
shaders/glsl/palettePass.frag.glsl
View File

@@ -4,7 +4,6 @@ precision mediump float;
uniform sampler2D tex;
uniform sampler2D bloomTex;
uniform sampler2D paletteTex;
uniform float bloomStrength;
uniform float ditherMagnitude;
uniform float time;
uniform vec3 backgroundColor, cursorColor, glintColor;
@@ -18,8 +17,8 @@ highp float rand( const in vec2 uv, const in float t ) {
vec4 getBrightness(vec2 uv) {
vec4 primary = texture2D(tex, uv);
vec4 bloom = texture2D(bloomTex, uv) * bloomStrength;
return min((primary + bloom) * (2.0 - bloomStrength), 1.0);
vec4 bloom = texture2D(bloomTex, uv);
return primary + bloom;
}
void main() {

5
shaders/glsl/stripePass.frag.glsl
View File

@@ -3,7 +3,6 @@ precision mediump float;
uniform sampler2D tex;
uniform sampler2D bloomTex;
uniform float bloomStrength;
uniform sampler2D stripeTex;
uniform float ditherMagnitude;
uniform float time;
@@ -18,8 +17,8 @@ highp float rand( const in vec2 uv, const in float t ) {
vec4 getBrightness(vec2 uv) {
vec4 primary = texture2D(tex, uv);
vec4 bloom = texture2D(bloomTex, uv) * bloomStrength;
return min((primary + bloom) * (2.0 - bloomStrength), 1.0);
vec4 bloom = texture2D(bloomTex, uv);
return primary + bloom;
}
void main() {