diff --git a/control.tscn b/control.tscn index 012fff4..d1237f2 100644 --- a/control.tscn +++ b/control.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://scripts/scaling.gd" type="Script" id=1] [ext_resource path="res://graphics/borders/prideborder.png" type="Texture" id=2] [ext_resource path="res://maps/level_select.tscn" type="PackedScene" id=3] -[ext_resource path="res://scripts/crt.gdshader" type="Shader" id=4] +[ext_resource path="res://scripts/lcd.gdshader" type="Shader" id=4] [ext_resource path="res://ui/2ndpuberty_no_dropshadow.tres" type="Theme" id=5] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=6] [ext_resource path="res://graphics/fade_patterns/diamonds2.png" type="Texture" id=7] @@ -14,9 +14,9 @@ shader = ExtResource( 4 ) shader_param/enabled = false shader_param/resolution = Vector2( 256, 192 ) -shader_param/curvature = Vector2( 6, 6 ) -shader_param/scanline_opacity = Vector2( 0.4, 0.05 ) -shader_param/brightness = 1.25 +shader_param/curvature = Vector2( inf, inf ) +shader_param/scanline_opacity = Vector2( 0.125, 0.125 ) +shader_param/brightness = 1.1 [sub_resource type="ShaderMaterial" id=6] shader = ExtResource( 9 ) diff --git a/scripts/crt.gdshader b/scripts/lcd.gdshader similarity index 93% rename from scripts/crt.gdshader rename to scripts/lcd.gdshader index 18fc6d8..078e9d2 100644 --- a/scripts/crt.gdshader +++ b/scripts/lcd.gdshader @@ -24,7 +24,7 @@ vec3 scanline_intensity(float uv, float res, float opacity) { void fragment() { if (enabled) { - vec2 curved_uv = curve_uv(UV); + vec2 curved_uv = UV; vec3 base_color = texture(TEXTURE, curved_uv).rgb; base_color += vec3(1.0/256.0); @@ -33,7 +33,7 @@ void fragment() { base_color *= vec3(brightness); if (curved_uv.x < 0.0 || curved_uv.y < 0.0 || curved_uv.x > 1.0 || curved_uv.y > 1.0) { - COLOR = vec4(0.0, 0.0, 0.0, 1.0); + COLOR = vec4(0.0, 0.0, 0.0, 0.0); } else { COLOR = vec4(base_color, 1.0); }