hardliner66/odin-game - Change 3ECHXH2QH5FRHX7PSL2JEFZK2XBRHMXZWLQYNU43SQ5PAY3EKUEQC

start converting to statemachine

Created by hardliner66 on February 21, 2024

3ECHXH2QH5FRHX7PSL2JEFZK2XBRHMXZWLQYNU43SQ5PAY3EKUEQC

Dependencies

In channels

main

Change contents

Insertion in main.odin at line 8 [3.381]

[2.88]


GameStateStartup :: struct {}
GameStateStartScreen :: struct {}
GameStateLoop :: struct {}
GameStateExitRequested :: struct {}
GameState :: union {
	GameStateStartup,
	GameStateStartScreen,
	GameStateLoop,
	GameStateExitRequested,
}

Deletion in main.odin at line 57 [3.381]
B:BD[3.432] → [2.999:1000]
Deletion in main.odin at line 58 [3.381]
B:BD[2.1079] → [2.1079:1143]
```
	exitWindowRequested := false // Flag to request window to exit
```

Insertion in main.odin at line 63 [3.381]

[2.1281]

	game_state: GameState = GameStateStartup{}
	last_state: GameState = nil

Insertion in main.odin at line 75 [3.381]

[2.1519]

		switch s in game_state {
		case GameStateStartup:
			game_state = GameStateStartScreen{}
		case GameStateStartScreen:
			game_state = GameStateLoop{}
		case GameStateLoop:
			handle_input(&player)

Replacement in main.odin at line 83 [3.381]

B:BD[2.1520] → [2.1520:1793]

		// Update
		//----------------------------------------------------------------------------------
		// Detect if X-button or KEY_ESCAPE have been pressed to close window
		if (rl.WindowShouldClose() || rl.IsKeyPressed(rl.KeyboardKey.ESCAPE)) do exitWindowRequested = true

[2.1520]

[2.1793]

			camera.target = rl.Vector2({player.x + 20, player.y + 20})
			camera.zoom += f32(rl.GetMouseWheelMove() * 0.05)
			if camera.zoom > 3.0 do camera.zoom = 3.0
			else if camera.zoom < 0.1 do camera.zoom = 0.1
			if rl.IsKeyPressed(rl.KeyboardKey.R) {
				camera.zoom = 1.0
				camera.rotation = 0.0
			}

Replacement in main.odin at line 95 [3.381]

B:BD[2.1794] → [2.1794:1823]

		if (exitWindowRequested) {

[2.1794]

[2.1823]

			if (rl.WindowShouldClose() || rl.IsKeyPressed(rl.KeyboardKey.ESCAPE)) do game_state = GameStateExitRequested{}
		case GameStateExitRequested:

Replacement in main.odin at line 101 [3.381]

B:BD[2.2059] → [2.2059:2173]

			else if (rl.IsKeyPressed(rl.KeyboardKey.N)) do exitWindowRequested = false
		} else {
			handle_input(&player)

[2.2059]

[2.2173]

			else if (rl.IsKeyPressed(rl.KeyboardKey.N)) do game_state = last_state

Deletion in main.odin at line 103 [3.381]

B:BD[2.2177] → [2.2177:2379]

		//----------------------------------------------------------------------------------
		camera.target = rl.Vector2({player.x + 20, player.y + 20})
		camera.zoom += f32(rl.GetMouseWheelMove() * 0.05)

Deletion in main.odin at line 104 [3.381]

B:BD[2.2380] → [2.2380:2473]

		if camera.zoom > 3.0 do camera.zoom = 3.0
		else if camera.zoom < 0.1 do camera.zoom = 0.1

Deletion in main.odin at line 105 [3.381]

B:BD[2.2474] → [2.2474:2566]

		if rl.IsKeyPressed(rl.KeyboardKey.R) {
			camera.zoom = 1.0
			camera.rotation = 0.0
		}

Replacement in main.odin at line 146 [3.381]

B:BD[2.3708] → [2.3708:3737]

		if (exitWindowRequested) {

[2.3708]

[2.3737]

		#partial switch _ in game_state {
		case GameStateExitRequested: