diff --git a/app/shaders/terminal_dynamic.frag b/app/shaders/terminal_dynamic.frag index 179cd61..e833877 100644 --- a/app/shaders/terminal_dynamic.frag +++ b/app/shaders/terminal_dynamic.frag @@ -169,8 +169,7 @@ void main() { #if CRT_DISPLAY_FRAME == 1 vec4 frameColor = texture(frameSource, qt_TexCoord0); - vec3 reflection = max(finalColor - backgroundColor.rgb, vec3(0.0)); - reflection *= frameShininess; + vec3 reflection = max(finalColor - backgroundColor.rgb, vec3(0.0)) * frameShininess; finalColor = mix(finalColor, frameColor.rgb + reflection, frameColor.a); #endif diff --git a/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma0.frag.qsb index 5de23e6..c618212 100644 Binary files a/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma1.frag.qsb index 5de23e6..c618212 100644 Binary files a/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster0_burn0_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma0.frag.qsb index 956a725..7cc6689 100644 Binary files a/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma1.frag.qsb index 5b17d86..6aaab53 100644 Binary files a/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster0_burn1_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma0.frag.qsb index 0f2cbca..1203cfe 100644 Binary files a/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma1.frag.qsb index 0f2cbca..1203cfe 100644 Binary files a/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster1_burn0_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma0.frag.qsb index 43cd0f6..9e17a7b 100644 Binary files a/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma1.frag.qsb index b49203a..67318f0 100644 Binary files a/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster1_burn1_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma0.frag.qsb index b32d821..59ba11b 100644 Binary files a/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma1.frag.qsb index b32d821..59ba11b 100644 Binary files a/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster2_burn0_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma0.frag.qsb index 3168c94..db31da7 100644 Binary files a/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma1.frag.qsb index e5bc2ae..c98c885 100644 Binary files a/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster2_burn1_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma0.frag.qsb index 1b030dd..a473aee 100644 Binary files a/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma1.frag.qsb index 1b030dd..a473aee 100644 Binary files a/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster3_burn0_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma0.frag.qsb b/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma0.frag.qsb index c3d03b6..5cabbd5 100644 Binary files a/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma0.frag.qsb and b/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma0.frag.qsb differ diff --git a/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma1.frag.qsb b/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma1.frag.qsb index 60dafe4..23cf025 100644 Binary files a/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma1.frag.qsb and b/app/shaders/terminal_dynamic_raster3_burn1_frame1_chroma1.frag.qsb differ diff --git a/app/shaders/terminal_static.frag b/app/shaders/terminal_static.frag index 718a36a..50ef977 100644 --- a/app/shaders/terminal_static.frag +++ b/app/shaders/terminal_static.frag @@ -23,11 +23,11 @@ layout(std140, binding = 0) uniform ubuf { vec4 backgroundColor; float screenCurvature; float chromaColor; - float screen_brightness; - float bloom; float rbgShift; float frameShininess; float frameSize; + float screen_brightness; + float bloom; }; layout(binding = 1) uniform sampler2D source; @@ -67,7 +67,7 @@ void main() { shownDraw = max2(step(vec2(0.0), curvatureCoords) - step(vec2(1.0), curvatureCoords)); isScreen = min2(step(vec2(0.0), curvatureCoords) - step(vec2(1.0), curvatureCoords)); isReflection = shownDraw - isScreen; - txt_coords = -2.0 * curvatureCoords + 3.0 * step(vec2(0.0), curvatureCoords) * curvatureCoords - 3.0 * step(vec2(1.0), curvatureCoords) * curvatureCoords; + txt_coords = curvatureCoords * (-1.0 + 2.0 * step(vec2(0.0), curvatureCoords) - 2.0 * step(vec2(1.0), curvatureCoords)); #endif vec3 txt_color = texture(source, txt_coords).rgb; @@ -107,8 +107,7 @@ void main() { #endif if (frameShininess > 0.0) { - float shine = clamp(frameShininess, 0.0, 1.0); - vec3 reflectionColor = mix(bloomColor, finalColor, shine * 0.5); + vec3 reflectionColor = mix(backgroundColor.rgb + bloomColor, finalColor, frameShininess * 0.5); finalColor = mix(finalColor, reflectionColor, isReflection); } diff --git a/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve0.frag.qsb b/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve0.frag.qsb index f0db04a..262451f 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve0.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve1.frag.qsb b/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve1.frag.qsb index fb8768e..5e2d5d8 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve1.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma0_bloom0_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve0.frag.qsb b/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve0.frag.qsb index d56ac16..056ed24 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve0.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve1.frag.qsb b/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve1.frag.qsb index 57d47ab..5ba8006 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve1.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma0_bloom1_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve0.frag.qsb b/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve0.frag.qsb index 31d6739..a983004 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve0.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve1.frag.qsb b/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve1.frag.qsb index db07e17..8b2924a 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve1.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma1_bloom0_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve0.frag.qsb b/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve0.frag.qsb index 39d0093..347d934 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve0.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve1.frag.qsb b/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve1.frag.qsb index ed2e6e5..33265ed 100644 Binary files a/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve1.frag.qsb and b/app/shaders/terminal_static_rgb0_chroma1_bloom1_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve0.frag.qsb b/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve0.frag.qsb index 49bde30..e74c8da 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve0.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve1.frag.qsb b/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve1.frag.qsb index e173195..e8b30ee 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve1.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma0_bloom0_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve0.frag.qsb b/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve0.frag.qsb index 4a84d79..15a3a32 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve0.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve1.frag.qsb b/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve1.frag.qsb index 771767c..7e3f33a 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve1.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma0_bloom1_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve0.frag.qsb b/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve0.frag.qsb index d430d08..568fd32 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve0.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve1.frag.qsb b/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve1.frag.qsb index dbc795e..01d0979 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve1.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma1_bloom0_curve1.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve0.frag.qsb b/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve0.frag.qsb index d23106a..76e9892 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve0.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve0.frag.qsb differ diff --git a/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve1.frag.qsb b/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve1.frag.qsb index 3f1043c..5a6b759 100644 Binary files a/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve1.frag.qsb and b/app/shaders/terminal_static_rgb1_chroma1_bloom1_curve1.frag.qsb differ