The

program.odin

@@ -5,8 +5,6 @@ import ui "libraries/snths_ui"
 import "core:mem"
 import "core:fmt"
 import "core:math/linalg"
-import "core:math/ease"
-import "core:math"
 import "core:strings"
 import "core:os"
 
@@ -176,6 +174,12 @@ ProgramData_DialogState :: struct {
 	input_text_buffers: [DIALOG_STATE_TEXT_INPUT_FIELD_SIZE][DIALOG_STATE_TEXT_INPUT_FIELD_COUNT]byte,
 }
 
+ProgramAnimationState :: enum {
+	Ready,
+	Playing,
+	Paused,
+}
+
 Program :: struct {
 	ui_context: ui.Context,
 	ui_element_focus: ui.ElementId,
@@ -198,6 +202,8 @@ Program :: struct {
 	dialog_type: ProgramDialogType,
 	dialog_data: ProgramData_DialogState,
 	animation: Animation,
+	animation_state: ProgramAnimationState,
+	animation_speed: f32,
 }
 
 float_slice_get_mat3 :: proc(floats: []f32, index: int) -> ^mat3 {
@@ -236,7 +242,7 @@ program_load_project :: proc(program: ^Program, path: string) -> ProjectReadErro
 	for val, i in program.matrix_float_pool[:program.matrix_count * 9] {
 		fmt.bprint(program.matrix_value_string_pool[i][:], val)
 	}
-	animation_update(&program.animation, (cast([^]mat3)(raw_data(program.matrix_float_pool)))[:program.matrix_count])
+	program.animation.matrix_count = program.matrix_count
 	return nil
 }
 
@@ -284,17 +290,16 @@ program_get_master_matrix :: proc() -> mat3 {
 	return master_matrix
 }
 
-program_set_transformation_state :: proc(state: AnimationState) {
-	if program.animation.state == state do return
-	previous_state := program.animation.state
-	program.animation.state = state
-	switch program.animation.state {
+program_set_animation_state :: proc(state: ProgramAnimationState) {
+	if program.animation_state == state do return
+	previous_state := program.animation_state
+	program.animation_state = state
+	switch program.animation_state {
 	case .Ready:
 		animation_reset(&program.animation)
 	case .Playing:
 
 	case .Paused:
-	case .Finished:
 	}
 }
 
@@ -376,7 +381,7 @@ program_update :: proc() {
 				}
 			case .LoadProject:
 			}
-			animation_update(&program.animation, (cast([^]mat3)(raw_data(program.matrix_float_pool)))[:program.matrix_count])
+			program.animation.matrix_count = program.matrix_count
 			program.state = .Normal
 		}
 	}
@@ -386,7 +391,8 @@ program_update :: proc() {
 	grid_text_clip := rect_from_area(v2{matrix_container_br.x, top_bar_container_br.y}, v2{WINDOW_WIDTH, WINDOW_HEIGHT})
 	draw_grid(program.grid, rect_grow(grid_text_clip, -4.0), rect_grow(grid_text_clip, -32.0))
 
-	animation_draw(program.animation)
+	animation_update(&program.animation, 0.01)
+	animation_draw(program.animation, linalg.inverse(grid_world_to_grid_matrix(program.grid.zoom, program.grid.offset)))
 
 	ui_element_focus := program.state == .Normal ? program.ui_element_focus : ui.element_id_invalid()
 	program.ui_element_focus = program_render_ui_and_handle_focus(&program.ui_context, ui_element_focus, program.font_style, ui_elements)
@@ -528,8 +534,8 @@ program_build_workspace_ui :: proc(ctx: ^ui.Context) ->
 
 		play_button_label: cstring
 		button_data = new(UiElementData_Button, context.temp_allocator)
-		switch program.animation.state {
-		case .Ready, .Finished:
+		switch program.animation_state {
+		case .Ready:
 			button_config.label = RAYGUI_ICON_PLAY
 			button_data^ = {type = .StartTransformation}
 		case .Paused:
@@ -566,10 +572,6 @@ program_build_workspace_ui :: proc(ctx: ^ui.Context) ->
 	return
 }
 
-grid_get_zoom_amount :: proc(zoom: v2) -> v2 {
-	return linalg.pow(v2{2.0, 2.0}, zoom) - 1.0
-}
-
 program_handle_mouse_workspace :: proc(mouse_state: MouseState, top_bar_container, matrix_container: ^ui.Element) -> MouseState {
 	mouse := rl.GetMousePosition()
 	mouse_wheel := rl.GetMouseWheelMoveV()
@@ -675,13 +677,16 @@ program_render_ui_and_handle_focus :: proc(ctx: ^ui.Context, focus_element_id: u
 					program.state = .Normal
 				case .StartTransformation:
 					if program.matrix_count > 0 {
-						program.animation.state = .Playing
+						program.animation_state = .Playing
 						animation_reset(&program.animation)
 					}
 				case .PauseTransformation:
-					program.animation.state = .Paused
+					program.animation_state = .Paused
 				case .ResumeTransformation:
-					program.animation.state = .Playing
+					if animation_is_finished(program.animation) {
+						animation_reset(&program.animation)
+					}
+					program.animation_state = .Playing
 				case .ResetTransformation:
 					animation_reset(&program.animation)
 				case .SaveProjectConfirm:
@@ -711,7 +716,7 @@ program_render_ui_and_handle_focus :: proc(ctx: ^ui.Context, focus_element_id: u
 					matrix_move_to(program.matrix_float_pool, program.matrix_value_string_pool, data.target_matrix, data.target_matrix + 1)
 				}
 				if data.type in UiButtonRecalculateFinishGroup {
-					animation_update(&program.animation, (cast([^]mat3)(raw_data(program.matrix_float_pool)))[:program.matrix_count])
+					program.animation.matrix_count = program.matrix_count
 				}
 			}
 		case .Slider:
@@ -724,7 +729,7 @@ program_render_ui_and_handle_focus :: proc(ctx: ^ui.Context, focus_element_id: u
 				focus_element_id = element.id
 			}
 			if value_previous != data.value^ && .UpdateMatrix in data.tag {
-				animation_update(&program.animation, (cast([^]mat3)(raw_data(program.matrix_float_pool)))[:program.matrix_count])
+				program.animation.matrix_count = program.matrix_count
 			}
 		case .InputText:
 			data := cast(^UiElementData_TextInput)element.data