feat: improve visuals & state passing

Author: nsarrazin

godot/scenes/CRT.gdshader

@@ -45,7 +45,7 @@ float FIXF(float c) { return max(abs(c), 1e-5); }
 vec4  FIX4(vec4 c)  { return max(abs(c), vec4(1e-5)); }
 
 // 480i uses 59.94 Hz field rate (29.97 fps x 2 fields)
-float frame_mod2() { 
+float frame_mod2() {
     if (enable_480i) {
         return floor(mod(TIME * 59.94 + interlace_offset, 2.0));
     } else {
@@ -144,7 +144,7 @@ vec3 bloom_apply(vec2 uv, vec2 screen_px, float intensity, float radius_px, floa
 void fragment() {
     // Live framebuffer sizes
     vec2 texture_size = vec2(textureSize(screen_tex, 0));
-    
+
     // For 480i clamping: render as if we have low resolution but fill the full canvas
     vec2 video_size = clamp_resolution ? vec2(target_width, target_height) : texture_size;
     vec2 screen_px = 1.0 / texture_size;  // Keep original for bloom calculations

godot/scenes/Main.gdshader

@@ -28,32 +28,32 @@ glow_enabled = true
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lhr70"]
 shader = ExtResource("9_q8u5g")
-shader_parameter/CRTgamma = 2.4
+shader_parameter/CRTgamma = 2.16
 shader_parameter/monitorgamma = 2.2
 shader_parameter/d = 3.0
 shader_parameter/CURVATURE = 1.0
-shader_parameter/R = 2.0
+shader_parameter/R = 3.649
 shader_parameter/cornersize = 0.03
-shader_parameter/cornersmooth = 1000.0
+shader_parameter/cornersmooth = 116.075
 shader_parameter/x_tilt = 0.0
 shader_parameter/y_tilt = 0.0
-shader_parameter/overscan_x = 105.0
-shader_parameter/overscan_y = 105.0
-shader_parameter/DOTMASK = 0.2
+shader_parameter/overscan_x = 95.0
+shader_parameter/overscan_y = 95.0
+shader_parameter/DOTMASK = 0.229
 shader_parameter/SHARPER = 1.0
-shader_parameter/scanline_weight = 0.6
-shader_parameter/lum = 0.15
-shader_parameter/enable_480i = true
-shader_parameter/interlace_offset = 0.0
+shader_parameter/scanline_weight = 0.249
+shader_parameter/lum = 0.581
+shader_parameter/enable_480i = false
+shader_parameter/interlace_offset = 1.0
 shader_parameter/clamp_resolution = true
 shader_parameter/target_width = 640.0
 shader_parameter/target_height = 480.0
 shader_parameter/aspect_y_scale = 1.0
 shader_parameter/LINEAR_PROCESSING = true
 shader_parameter/OVERSAMPLE = true
-shader_parameter/bloom_intensity = 0.256
-shader_parameter/bloom_threshold = 0.283
-shader_parameter/bloom_radius_px = 8.0
+shader_parameter/bloom_intensity = 0.136
+shader_parameter/bloom_threshold = 0.219
+shader_parameter/bloom_radius_px = 0.175
 shader_parameter/corner_bg_color = Color(0.0745098, 0.0745098, 0.0941176, 1)
 
 [node name="Main" type="Node3D" node_paths=PackedStringArray("planet") groups=["affected_by_gravity"]]

godot/scenes/Main.gdshader.uid

@@ -3,14 +3,12 @@ render_mode unshaded, cull_front, depth_draw_never, blend_add;
 
 uniform float planet_radius : hint_range(0.0, 1e9) = 200000.0;
 uniform float atmosphere_height : hint_range(0.0, 1e8) = 6000.0;
-uniform float outer_radius : hint_range(0.0, 1e9) = 206000.0;
 
-uniform float intensity_rayleigh : hint_range(0.0, 2.0) = 0.25;
-uniform float intensity_mie : hint_range(0.0, 2.0) = 0.05;
-uniform float g : hint_range(-0.99, 0.99) = 0.8;
-
-uniform vec3 rayleigh_color : source_color = vec3(0.55, 0.75, 1.0);
-uniform vec3 mie_color : source_color = vec3(1.0, 0.95, 0.9);
+// Simplified atmosphere controls
+uniform float intensity : hint_range(0.0, 2.0) = 0.5;
+uniform vec3 atmosphere_color : source_color = vec3(0.55, 0.75, 1.0);
+uniform float density_falloff : hint_range(0.1, 2.0) = 0.8;
+uniform float horizon_power : hint_range(1.0, 4.0) = 2.0;
 
 // Sun light direction in planet object-space (points from planet towards sun)
 uniform vec3 sun_dir_object = vec3(0.0, -1.0, 0.0);
@@ -19,22 +17,11 @@ uniform vec3 camera_pos_object = vec3(0.0);
 
 varying vec3 v_pos_obj;
 
-float rayleigh_phase(float cosTheta) {
-	return 3.0 / (16.0 * PI) * (1.0 + cosTheta * cosTheta);
-}
-
-float hg_phase(float cosTheta, float g_val) {
-	float g2 = g_val * g_val;
-	float denom = pow(max(1.0 + g2 - 2.0 * g_val * cosTheta, 1e-3), 1.5);
-	return (1.0 / (4.0 * PI)) * (1.0 - g2) / denom;
-}
-
 void vertex() {
 	v_pos_obj = VERTEX;
 }
 
 void fragment() {
-	// Camera position in planet object-space passed from script
 	vec3 cam_pos_obj = camera_pos_object;
 	vec3 view_dir = normalize(cam_pos_obj - v_pos_obj);
 	vec3 up_from_center = normalize(v_pos_obj);
@@ -43,24 +30,24 @@ void fragment() {
 	// Exponential density falloff with height above surface
 	float h = max(r - planet_radius, 0.0);
 	float H = max(atmosphere_height, 1.0);
-	float density = exp(-h / (0.5 * H));
-
-	// Thicker towards horizon for visual oomph
-	float horizon = pow(1.0 - clamp(dot(up_from_center, view_dir), 0.0, 1.0), 1.25);
-	float thickness = density * (0.6 + 1.6 * horizon);
+	float density = exp(-h / (density_falloff * H));
 
-	// Phase functions based on sun-view angle
+	// Enhanced horizon effect for more atmospheric depth
+	float horizon = 1.0 - clamp(dot(up_from_center, view_dir), 0.0, 1.0);
+	horizon = pow(horizon, horizon_power);
+	
+	// Sun direction influence for simple scattering
 	vec3 sun_dir = normalize(sun_dir_object);
-	float cosTheta = clamp(dot(view_dir, sun_dir), -1.0, 1.0);
-	float pr = rayleigh_phase(cosTheta);
-	float pm = hg_phase(cosTheta, g);
+	float sun_alignment = clamp(dot(view_dir, sun_dir), 0.0, 1.0);
+	float scattering = 0.6 + 0.4 * sun_alignment;
 
-	vec3 scatter = rayleigh_color * intensity_rayleigh * pr + mie_color * intensity_mie * pm;
-	vec3 col = scatter * thickness;
+	// Final atmospheric glow
+	float thickness = density * horizon * scattering;
+	vec3 final_color = atmosphere_color * intensity * thickness;
 
-	EMISSION = col;
+	EMISSION = final_color;
 	ALBEDO = vec3(0.0);
 	ROUGHNESS = 1.0;
 	SPECULAR = 0.0;
-	ALPHA = clamp(length(col), 0.0, 1.0);
+	ALPHA = clamp(length(final_color), 0.0, 1.0);
 } 

godot/scenes/Main.tscn

@@ -517,14 +517,12 @@ func _update_atmosphere_params() -> void:
 	if atmosphere_material == null:
 		return
 	var shell_height: float = max(1.0, radius * atmosphere_height_scale)
-	var atm_radius: float = radius + shell_height
 	atmosphere_material.set_shader_parameter("planet_radius", radius)
 	atmosphere_material.set_shader_parameter("atmosphere_height", shell_height)
-	atmosphere_material.set_shader_parameter("intensity_rayleigh", atmosphere_intensity)
-	atmosphere_material.set_shader_parameter("intensity_mie", atmosphere_mie_intensity)
-	atmosphere_material.set_shader_parameter("g", clampf(atmosphere_g, -0.99, 0.99))
-	atmosphere_material.set_shader_parameter("rayleigh_color", atmosphere_color)
-	atmosphere_material.set_shader_parameter("mie_color", atmosphere_mie_color)
+	atmosphere_material.set_shader_parameter("intensity", atmosphere_intensity)
+	atmosphere_material.set_shader_parameter("atmosphere_color", atmosphere_color)
+	atmosphere_material.set_shader_parameter("density_falloff", 0.8)
+	atmosphere_material.set_shader_parameter("horizon_power", 2.0)
 	# Sun direction in world
 	var light := _get_directional_light()
 	var sun_dir_world: Vector3 = Vector3(0, -1, 0)
@@ -534,8 +532,6 @@ func _update_atmosphere_params() -> void:
 	# Convert to planet local/object space
 	var sun_dir_obj: Vector3 = (global_transform.basis.inverse() * sun_dir_world).normalized()
 	atmosphere_material.set_shader_parameter("sun_dir_object", sun_dir_obj)
-	# Visual tweaks
-	atmosphere_material.set_shader_parameter("outer_radius", atm_radius)
 	# Camera position in planet object space
 	var cam := get_viewport().get_camera_3d()
 	if cam:
@@ -547,11 +543,8 @@ func _update_surface_atmo_params() -> void:
 	if smat == null:
 		return
 	smat.set_shader_parameter("atmo_height", radius * atmosphere_height_scale)
-	smat.set_shader_parameter("atmo_intensity_rayleigh", atmosphere_intensity)
-	smat.set_shader_parameter("atmo_intensity_mie", atmosphere_mie_intensity)
-	smat.set_shader_parameter("atmo_g", clampf(atmosphere_g, -0.99, 0.99))
-	smat.set_shader_parameter("atmo_rayleigh_color", atmosphere_color)
-	smat.set_shader_parameter("atmo_mie_color", atmosphere_mie_color)
+	smat.set_shader_parameter("atmo_intensity", atmosphere_intensity * 0.4)
+	smat.set_shader_parameter("atmo_color", atmosphere_color)
 	# Sun direction
 	var light := _get_directional_light()
 	var sun_dir_world: Vector3 = Vector3(0, -1, 0)