akkartik/pothi.love - Change QO2BU5MSY6N7D57BSQGE64Y5PFJF3MJ3NVLWY6VZSV5PN7IX6O5QC

do animations in a nested event loop

Created by akkartik on April 17, 2025

QO2BU5MSY6N7D57BSQGE64Y5PFJF3MJ3NVLWY6VZSV5PN7IX6O5QC

Dependencies

In channels

main

Change contents

File deletion: 0088-animate_next_frame, 0078-animate_next_frame

BF:BFD[5.2] → [6.1816:1863]

BF:BFD[6.1863] → [7.13597:13597]

BFD:BFD[5.2] → [7.14033:14080]

BF:BFD[7.14080] → [7.13597:13597]

B:BD[7.13597] → [7.13598:14018]

∅:D[3.426] → [7.14018:14029]

∅:D[8.1259] → [7.14018:14029]

B:BD[7.14018] → [7.14018:14029]

B:BD[7.14029] → [9.82:85]

B:BD[7.14018] → [3.343:426]

animate_next_frame = function(state, dt)
	if state.initial == nil then
		state.initial = from_viewport(state)
		-- once we've checked keys, pollute the keyspace
		state.step = 0
		state.frame_time = 0
		return
	end
	state.frame_time = state.frame_time + dt
	if state.frame_time > 0.01 then
		state.frame_time = state.frame_time - 0.01
		state.step = state.step+1
		interpolate_viewport(state.initial, state, state.step)
		B()
	end
end
		print('animation frame: Viewport is now', Viewport.x, Viewport.y, Viewport.zoom)

File deletion: 0087-animate_next, 0077-animate_next
BF:BFD[5.2] → [6.1865:1906]
BF:BFD[6.1906] → [7.14082:14082]
BFD:BFD[5.2] → [7.14344:14385]
BF:BFD[7.14385] → [7.14082:14082]
B:BD[7.14082] → [7.14083:14239]
∅:D[3.515] → [7.14239:14274]
∅:D[8.1376] → [7.14239:14274]
B:BD[7.14239] → [7.14239:14274]
∅:D[10.91] → [7.14274:14340]
B:BD[7.14274] → [7.14274:14340]
B:BD[7.14340] → [9.87:90]
B:BD[7.14274] → [10.66:91]
B:BD[7.14239] → [3.428:515]
```
animate_next = function(dt)
	if Animating[1].step and Animating[1].step >= Num_animation_frames then
		table.remove(Animating, 1)
		if #Animating == 0 then
			Animating = nil
			Canvas = nil
			A()
			return
		end
	end
	animate_next_frame(Animating[1], dt)
end
			Global_viewport = nil
			print('Viewport at end of survey animation', Viewport.x, Viewport.y, Viewport.zoom)
```

File deletion: 0075-Animating, 0064-Animating

BF:BFD[5.2] → [6.2429:2467]

BF:BFD[6.2467] → [7.18514:18514]

BFD:BFD[5.2] → [7.18875:18913]

BF:BFD[7.18913] → [7.18514:18514]

B:BD[7.18514] → [7.18515:18874]

Animating = nil  -- set this to enable animation
-- When enabled, animation should consist of a series of viewport states that we animate into.
-- Each viewport state will be attained in Num_animation_frames frames, each of 0.01 ms or 1 Love frame.
-- Each state will specify the final state of various viewport keys. Keys not mentioned will remain unchanged.

File addition: 0141-animate_to (----------)

[5.2]

animate_to = function(dest)
	local state = {
		x=dest.x, y=dest.y, zoom=dest.zoom,
		initial=from_viewport(dest),
		step = 0,
		frame_time = 0,
	}
	while true do
		love.event.pump()
		for name, a,b,c,d,e,f in love.event.poll() do
			if name == "quit" then
				os.exit(0)
			end
			-- ignore other events
		end
		-- update
		dt = love.timer.step()
		state.frame_time = state.frame_time + dt
		if state.frame_time > 0.01 then
			state.frame_time = state.frame_time - 0.01
			state.step = state.step + 1
			if state.step >= Num_animation_frames then
				return
			end
			interpolate_viewport(state.initial, state, state.step)
			print('animation frame: Viewport is now', Viewport.x, Viewport.y, Viewport.zoom)
			B()
		end
		-- draw
		love.graphics.origin()
		love.graphics.clear(love.graphics.getBackgroundColor())
		local q = love.graphics.newQuad(
			(Viewport.x-Global_viewport.x)*Viewport.zoom,
			(Viewport.y-Global_viewport.y)*Viewport.zoom,
			App.screen.width,
			App.screen.height,
			Global_bounds.w*Viewport.zoom,
			Global_bounds.h*Viewport.zoom)
		App.color{r=1,g=1,b=1}
		love.graphics.draw(Canvas, q, 0,0)
		love.graphics.present()
		love.timer.sleep(0.001)
	end
end

Deletion in 0103-survey_animation at line 6 [7.4016]
∅:D[11.88] → [7.4722:4826]
B:BD[7.4722] → [7.4722:4826]
```
	-- initialize animation
	Animating = {
		copy_viewport(Global_viewport),
		copy_viewport(Viewport),
	}
```

Insertion in 0103-survey_animation at line 11 [7.4016]

[3.327]

[9.63]

	local initial_viewport = copy_viewport(Viewport)
	animate_to(Global_viewport)
	animate_to(initial_viewport)
	print('Viewport at end of survey animation', Viewport.x, Viewport.y, Viewport.zoom)
	Canvas = nil
	Global_viewport = nil
	A()

Replacement in 0090-undo_zoom_out at line 4 [7.12364]

∅:D[12.106] → [7.12411:12467]

∅:D[11.157] → [7.12411:12467]

B:BD[7.12411] → [7.12411:12467]

	Animating = {
		Save_viewport,
	}
	Save_viewport = nil

[12.106]

[7.12467]

	animate_to(Save_viewport)
	print('Viewport at end of undo zoom out animation', Viewport.x, Viewport.y, Viewport.zoom)
	Canvas = nil
	Global_viewport = nil
	A()

Insertion in 0090-undo_zoom_out at line 10 [7.12364]
[7.12485]
[10.31]
```
	Save_viewport = nil
```

Replacement in 0089-zoom_in at line 8 [7.12533]

∅:D[12.197] → [7.12752:12990]

∅:D[11.219] → [7.12752:12990]

B:BD[7.12752] → [7.12752:12990]

	Animating = {
		{
			x=sx(x)-App.screen.width/Save_viewport.zoom/2,
			y=sy(y)-App.screen.height/Save_viewport.zoom/2,
			w=App.screen.width/Save_viewport.zoom,
			h=App.screen.height/Save_viewport.zoom,
			zoom=Save_viewport.zoom,
		},

[12.197]

[7.12990]

	animate_to{
		x=sx(x)-App.screen.width/Save_viewport.zoom/2,
		y=sy(y)-App.screen.height/Save_viewport.zoom/2,
		zoom=Save_viewport.zoom,

Insertion in 0089-zoom_in at line 13 [7.12533]

[7.12993]

	print('Viewport at end of zoom in animation', Viewport.x, Viewport.y, Viewport.zoom)
	Canvas = nil
	Global_viewport = nil
	A()

Deletion in 0085-zoom_out at line 5 [7.15067]
∅:D[12.288] → [7.15150:15202]
∅:D[11.484] → [7.15150:15202]
B:BD[7.15150] → [7.15150:15202]
```
	Animating = {
		copy_viewport(Global_viewport),
	}
```

Insertion in 0085-zoom_out at line 6 [7.15067]

[7.15221]

	animate_to(Global_viewport)
	print('Viewport at end of zoom out animation', Viewport.x, Viewport.y, Viewport.zoom)
	Canvas = nil
	Global_viewport = nil
	A()

Deletion in 0061-on.key_release at line 2 [7.23485]
B:BD[7.23517] → [7.23517:23547]
```
	if Animating then return end
```

Deletion in 0026-on.draw at line 2 [13.238692]

B:BD[13.238714] → [14.935:954]

B:BD[14.954] → [4.544:788]

∅:D[4.788] → [14.1182:1253]

B:BD[14.1182] → [14.1182:1253]

B:BD[14.1253] → [2.420:425]

	if Animating then
		local q = love.graphics.newQuad(
			(Viewport.x-Global_viewport.x)*Viewport.zoom,
			(Viewport.y-Global_viewport.y)*Viewport.zoom,
			App.screen.width,
			App.screen.height,
			Global_bounds.w*Viewport.zoom,
			Global_bounds.h*Viewport.zoom)
		App.color{r=1,g=1,b=1}
		love.graphics.draw(Canvas, q, 0,0)
		return
	end

Deletion in 0023-on.keychord_press at line 2 [16.26]
∅:D[15.294] → [7.102:132]
B:BD[7.102] → [7.102:132]
```
	if Animating then return end
```
Deletion in 0018-on.update at line 3 [7.10030]
∅:D[17.2978] → [7.10056:10108]
B:BD[7.10056] → [7.10056:10108]
```
	if Animating then
		animate_next(dt)
		return
	end
```
Deletion in 0017-on.mouse_release at line 2 [19.1417]
B:BD[18.59327] → [7.19039:19069]
```
	if Animating then return end
```
Deletion in 0006-on.mouse_press at line 2 [19.703]
B:BD[18.58905] → [7.13119:13149]
```
	if Animating then return end
```

do animations in a nested event loop

Dependencies

In channels

Change contents

File deletion: 0088-animate_next_frame, 0078-animate_next_frame

File deletion: 0087-animate_next, 0077-animate_next

File deletion: 0075-Animating, 0064-Animating

File addition: 0141-animate_to (----------)

Deletion in 0103-survey_animation at line 6 [7.4016]

Insertion in 0103-survey_animation at line 11 [7.4016]

Replacement in 0090-undo_zoom_out at line 4 [7.12364]

Insertion in 0090-undo_zoom_out at line 10 [7.12364]

Replacement in 0089-zoom_in at line 8 [7.12533]

Insertion in 0089-zoom_in at line 13 [7.12533]

Deletion in 0085-zoom_out at line 5 [7.15067]

Insertion in 0085-zoom_out at line 6 [7.15067]

Deletion in 0061-on.key_release at line 2 [7.23485]

Deletion in 0026-on.draw at line 2 [13.238692]

Deletion in 0023-on.keychord_press at line 2 [16.26]

Deletion in 0018-on.update at line 3 [7.10030]

Deletion in 0017-on.mouse_release at line 2 [19.1417]

Deletion in 0006-on.mouse_press at line 2 [19.703]