feat: various fixes

Author: nsarrazin

godot-6502/src/lib.rs

@@ -327,6 +327,11 @@ impl Emulator6502 {
         self.frequency = frequency
     }
 
+    #[func]
+    pub fn get_frequency(&self) -> i32 {
+        self.frequency
+    }
+
     #[func]
     pub fn get_line_number(&self, pc: u16) -> i32 {
         let line = self.cpu().get_line_number(pc);

godot/scenes/Main.tscn

@@ -79,20 +79,16 @@ zoom_sensitivity = 1.0
 max_zoom = 100.0
 
 [node name="Planet" parent="." instance=ExtResource("4_hrnxs")]
-transform = Transform3D(-0.84147, 0, 0.540303, 0, 1, 0, -0.540303, 0, -0.84147, 0, 0, 0)
+transform = Transform3D(-0.986832, 0, 0.16175, 0, 1, 0, -0.16175, 0, -0.986832, 0, 0, 0)
 physics_material_override = SubResource("PhysicsMaterial_q8u5g")
-constant_angular_velocity = Vector3(0, 0.005, 0)
-regenerate_in_editor = null
+regenerate_in_editor = false
 radius = 5000.0
 micro_octaves = 4
 micro_lacunarity = 10.0
 micro_gain = 3.0
 micro_strength = 0.05
 flatten_deadband = 0.2
 range_anisotropy = 0.3
-ice_cap_latitude_start = 0.95
-ice_cap_latitude_full = 0.96
-ice_cap_height_bias = 0.35
 smooth_lambda = 0.0
 gravitational_pull = 5e+07
 atmosphere_height_scale = 1.0

godot/scenes/Planet/Planet.gd

@@ -313,8 +313,12 @@ func _build_planet_triangles(segs: int, uvs: Array[Vector2]) -> void:
 	# Create and apply lunar material
 	var material = create_planet_material()
 
-	mesh_instance.mesh = mesh
-	mesh_instance.material_override = material
+	# Ensure mesh_instance is valid before assigning
+	if mesh_instance != null:
+		mesh_instance.mesh = mesh
+		mesh_instance.material_override = material
+	else:
+		push_error("mesh_instance is null in _build_planet_triangles")
 
 func _add_triangle(i0: int, i1: int, i2: int, uvs: Array[Vector2]) -> void:
 	# Add triangle with reduced function calls
@@ -557,18 +561,19 @@ func _physics_process(delta: float) -> void:
 		_update_atmosphere_params()
 
 	# Apply gravitational pull only to bodies that aren't too far
-	for body in get_tree().get_nodes_in_group("affected_by_gravity"):
-		if body is RigidBody3D:
-			if not is_instance_valid(body) or body.freeze:
-				continue
-				
-			var direction = global_position - body.global_position
-			var distance = direction.length()
+	if get_tree() != null:
+		for body in get_tree().get_nodes_in_group("affected_by_gravity"):
+			if body is RigidBody3D:
+				if not is_instance_valid(body) or body.freeze:
+					continue
+					
+				var direction = global_position - body.global_position
+				var distance = direction.length()
+					
+				var force_magnitude = (gravitational_pull * body.mass) / (distance * distance)
+				var force = direction.normalized() * force_magnitude
 
-			var force_magnitude = (gravitational_pull * body.mass) / (distance * distance)
-			var force = direction.normalized() * force_magnitude
-			
-			body.apply_central_force(force)
+				body.apply_central_force(force)
 
 	# Update local scatter near camera
 	if enable_scatter:
@@ -611,15 +616,16 @@ func _get_directional_light() -> DirectionalLight3D:
 		if l is DirectionalLight3D:
 			return l
 	# Fallback: search the tree (first one)
-	for node in get_tree().get_nodes_in_group(""):
-		# no dedicated group; skip
-		pass
-	# Broad fallback: scan root children
-	var root = get_tree().current_scene
-	if root:
-		for c in root.get_children():
-			if c is DirectionalLight3D:
-				return c
+	if get_tree() != null:
+		for node in get_tree().get_nodes_in_group(""):
+			# no dedicated group; skip
+			pass
+		# Broad fallback: scan root children
+		var root = get_tree().current_scene
+		if root:
+			for c in root.get_children():
+				if c is DirectionalLight3D:
+					return c
 	return null
 
 func _update_atmosphere_params() -> void:
@@ -642,10 +648,12 @@ func _update_atmosphere_params() -> void:
 	var sun_dir_obj: Vector3 = (global_transform.basis.inverse() * sun_dir_world).normalized()
 	atmosphere_material.set_shader_parameter("sun_dir_object", sun_dir_obj)
 	# Camera position in planet object space
-	var _cam := get_viewport().get_camera_3d()
-	if _cam:
-		var cam_obj: Vector3 = to_local(_cam.global_transform.origin)
-		atmosphere_material.set_shader_parameter("camera_pos_object", cam_obj)
+	var viewport = get_viewport()
+	if viewport != null:
+		var _cam := viewport.get_camera_3d()
+		if _cam:
+			var cam_obj: Vector3 = to_local(_cam.global_transform.origin)
+			atmosphere_material.set_shader_parameter("camera_pos_object", cam_obj)
 
 func _update_surface_atmo_params() -> void:
 	var smat := mesh_instance.material_override as ShaderMaterial

godot/scenes/main.gd

@@ -33,7 +33,39 @@ func _ready() -> void:
 	ships = get_tree().get_nodes_in_group("ships")
 	# If no ships exist, spawn one
 	if ships.is_empty():
-		spawn_ship()
+		spawn_ship("
+THRUSTER_1 = $020C
+FIRE_UP = 8
+FIRE_DOWN = 4
+
+.org $0600
+
+main_loop:
+	LDA #FIRE_UP
+	STA THRUSTER_1
+	JSR delay
+	
+	LDA #0
+	STA THRUSTER_1
+	JSR delay
+
+	LDA #FIRE_DOWN
+	STA THRUSTER_1
+	JSR delay
+
+	LDA #0
+	STA THRUSTER_1
+	JSR delay
+
+	JMP main_loop
+
+delay:
+	LDX #5
+inner_loop:
+	NOP
+	DEX
+	BNE inner_loop
+	RTS")
 
 	WebHelper.expose_all(self)
 
@@ -157,10 +189,23 @@ func js_step():
 	return true
 
 func js_getState():
+	if active_ship == null:
+		print("js_getState: active_ship is null")
+		return null
+	if active_ship.computer == null:
+		print("js_getState: active_ship.computer is null")
+		return null
+	if active_ship.computer.emulator == null:
+		print("js_getState: active_ship.computer.emulator is null")
+		return null
+	
+	var frequency = active_ship.computer.emulator.get_frequency()
+	print("js_getState: frequency = ", frequency)
+	
 	return {
 		"code": active_ship.computer.program,
 		"isPaused": active_ship.computer.pause,
-		"frequency": active_ship.computer.emulator.frequency,
+		"frequency": frequency,
 		"shipIdx": ship_idx
 	} as Dictionary
 

web/src/lib/components/Asm6502Editor.svelte

@@ -26,6 +26,8 @@
 
   let editorContainer: HTMLDivElement;
   let view: EditorView | null = null;
+  let isDirty = $state(false);
+  let originalCode = $state('');
 
   // 6502 opcodes and directives
   const OPCODES = [
@@ -357,6 +359,16 @@
     try {
       const helper = (window as any).WebHelper;
       if (!helper || !view) return;
+      
+      // Don't highlight execution line if editor is dirty
+      if (isDirty) {
+        if (lastExecLine !== null) {
+          lastExecLine = null;
+          view.dispatch({ effects: setExecLineEffect.of(null) });
+        }
+        return;
+      }
+      
       const line: number | null | undefined = await helper.getLineNumber();
       if (line !== lastExecLine && view) {
         lastExecLine = line ?? null;
@@ -395,6 +407,8 @@
             if (newValue !== value) {
               value = newValue;
             }
+            // Update dirty state
+            isDirty = newValue !== originalCode;
           }
         })
       ];
@@ -416,6 +430,8 @@
 
   onMount(() => {
     view = createEditor();
+    originalCode = value;
+    isDirty = false;
 
     function updateLoop() {
       pollExecLine();
@@ -443,6 +459,9 @@
               insert: value
             }
           });
+          // Update original code and reset dirty state when value changes externally
+          originalCode = value;
+          isDirty = false;
         } catch (error) {
           console.error('Failed to update editor value:', error);
         }

web/src/lib/components/FrequencySlider.svelte

@@ -2,8 +2,7 @@
 	import { onMount } from 'svelte';
 	import { appState } from '$lib/AppState.svelte';
 
-	// Props
-	let { initialFrequency = 10 }: { initialFrequency?: number } = $props();
+	// No props needed - frequency comes from AppState
 
 	// Slider state for UI (derived from AppState frequency)
 	let sliderValue = $state(0);
@@ -92,17 +91,18 @@
 		}
 	}
 
-	// Initialize slider position based on initial frequency or AppState
+	// Initialize slider position based on AppState frequency
 	onMount(() => {
-		if (appState.frequency !== initialFrequency) {
-			appState.setFrequency(initialFrequency);
-		}
+		console.log('FrequencySlider onMount, appState.frequency:', appState.frequency);
 		sliderValue = freqToSlider(appState.frequency);
+		console.log('Set sliderValue to:', sliderValue);
 	});
 
 	$effect(() => {
 		// Keep slider position in sync with AppState frequency changes
+		console.log('FrequencySlider effect, appState.frequency changed to:', appState.frequency);
 		sliderValue = freqToSlider(appState.frequency);
+		console.log('Updated sliderValue to:', sliderValue);
 	});
 </script>
 

web/src/routes/+page.svelte

@@ -23,9 +23,83 @@
 		} catch {}
 	});
 
+	// Handle ship switching
+	async function handleNextShip() {
+		try {
+			await WebHelper.nextShip();
+			await updateFromGameState();
+		} catch (error) {
+			console.error('Failed to switch to next ship:', error);
+		}
+	}
+
+	async function handlePreviousShip() {
+		try {
+			await WebHelper.previousShip();
+			await updateFromGameState();
+		} catch (error) {
+			console.error('Failed to switch to previous ship:', error);
+		}
+	}
+
 	// Handle engine ready callback
 	function handleEngineReady(engineInstance: any) {
 		engine = engineInstance;
+		// Update app state with current ship's code when engine is ready
+		// Add a delay and retry mechanism to ensure ships are spawned
+		retryUpdateFromGameState();
+	}
+
+	// Retry getting game state until ship is ready
+	async function retryUpdateFromGameState(attempts = 0) {
+		const maxAttempts = 20; // Max 2 seconds (20 * 100ms)
+		
+		try {
+			const state = await WebHelper.getState();
+			if (state != null) {
+				// Ship is ready, update state
+				console.log('Game state ready:', state);
+				appState.code = state.code || '';
+				appState.isPaused = state.isPaused || false;
+				appState.frequency = state.frequency || 10;
+				appState.shipIdx = state.shipIdx || 0;
+				console.log('Updated appState frequency to:', appState.frequency);
+				return;
+			}
+		} catch (error) {
+			console.warn('Attempt', attempts + 1, 'failed:', error);
+		}
+
+		// If state is null and we haven't reached max attempts, retry
+		if (attempts < maxAttempts) {
+			setTimeout(() => {
+				retryUpdateFromGameState(attempts + 1);
+			}, 100);
+		} else {
+			console.warn('Failed to get game state after', maxAttempts, 'attempts');
+		}
+	}
+
+	// Update app state from game state
+	async function updateFromGameState() {
+		if (!engine) return;
+		try {
+			const state = await WebHelper.getState();
+			console.log('Game state:', state); // Debug log
+			
+			if (state == null) {
+				console.warn('Game state is null, ship not ready yet');
+				return;
+			}
+			
+			appState.code = state.code || '';
+			appState.isPaused = state.isPaused || false;
+			appState.frequency = state.frequency || 10; // Default to 10 if null
+			appState.shipIdx = state.shipIdx || 0;
+			console.log('Updated appState frequency to:', appState.frequency); // Debug log
+		} catch (error) {
+			console.warn('Failed to update from game state:', error);
+		}
 	}
 
 	async function handleRespawnShip() {