akkartik/pothi.love - Change TK73HJVXQCBEEN4ATMLSSG4DI2XZJAQEJICJ472E3YAW55EFAT5AC

abort: switch to LÖVE's coordinate transforms

This is a big change, and I'd have to first modify lines.love to use the coordinate transforms. And that fork doesn't really need a principled coordinate system.

Created by Kartik K. Agaram on October 25, 2023

TK73HJVXQCBEEN4ATMLSSG4DI2XZJAQEJICJ472E3YAW55EFAT5AC

Dependencies

In channels

main

Change contents

File deletion: 0004-vy, 0008-vy
BF:BFD[4.2] → [5.1403:1434]
BF:BFD[5.1434] → [6.7649:7649]
BFD:BFD[4.2] → [6.7699:7730]
BF:BFD[6.7730] → [6.7649:7649]
B:BD[6.7649] → [7.730:836]
```
vy = function(sy)
	-- turn surface coordinates into viewport coordinates
	return scale(sy-Viewport.y)
end
```
File deletion: 0003-scale, 0007-scale
BF:BFD[4.2] → [5.1436:1470]
BF:BFD[5.1470] → [6.7853:7853]
BFD:BFD[4.2] → [6.7902:7936]
BF:BFD[6.7936] → [6.7853:7853]
B:BD[6.7853] → [6.7854:7901]
```
scale = function(d)
	return d*Viewport.zoom
end
```
File deletion: 0002-vx, 0005-vx
BF:BFD[4.2] → [5.1472:1503]
BF:BFD[5.1503] → [6.8245:8245]
BFD:BFD[4.2] → [6.8295:8326]
BF:BFD[6.8326] → [6.8245:8245]
B:BD[6.8245] → [7.839:945]
```
vx = function(sx)
	-- turn surface coordinates into viewport coordinates
	return scale(sx-Viewport.x)
end
```
Replacement in 0030-update_editor_box at line 8 [8.26]
B:BD[8.315] → [8.315:346]
```
		node.editor.top = vy(node.y)
```
[8.315]
[8.346]
```
		node.editor.top = node.y
```

Replacement in 0028-A at line 3 [11.6019]

∅:D[9.115] → [10.408:518]

∅:D[3.142] → [10.408:518]

B:BD[11.6069] → [10.408:518]

∅:D[10.518] → [11.6069:6099]

B:BD[11.6069] → [11.6069:6099]

B:BD[11.6369] → [9.116:162]

∅:D[9.211] → [11.6536:6562]

B:BD[11.6536] → [11.6536:6562]

B:BD[11.6562] → [9.212:217]

∅:D[9.217] → [11.6601:6661]

B:BD[11.6601] → [11.6601:6661]

	love.graphics.setFont(love.graphics.newFont(scale(20)))  -- editor objects implicitly depend on current font
	-- translate Page to Surface
	compute_layout(Page, Page.x,Page.y, Surface)
	-- continue the pipeline
	B()
	-- TODO: ugly that we're manipulating editor objects twice

[3.142]

[10.519]

       local red = false
       for x=-1000,2000,300 do
               for y=-10000,10000,200 do
                       add_thick_line({type='line', data={x,y, x+200,y+200, x,y+400}, r=red and 1 or 0,g=red and 0 or 0.5,b=0}, 10)
                       red = not red
               end
       end

Insertion in 0026-on.draw at line 2 [12.238692]

[12.238714]

[3.148]

	-- vx = x, vy = y
	love.graphics.translate(-Viewport.x, -Viewport.y)
	-- vx = x-Viewport.x, vy = y-Viewport.y
	love.graphics.scale(Viewport.zoom)
	-- vx = (x-Viewport.x)*Viewport.zoom, vy = (y-Viewport.y)*Viewport.zoom

Replacement in 0026-on.draw at line 8 [12.238692]

B:BD[3.179] → [3.179:287]

	love.graphics.line(vx(0), vy(0), vx(0), vy(1000000))
	love.graphics.line(vx(0), vy(0), vx(1000000), vy(0))

[3.179]

[3.287]

	love.graphics.line(0, 0, 0, 1000000)
	love.graphics.line(0, 0, 1000000, 0)

Replacement in 0026-on.draw at line 11 [12.238692]

B:BD[3.303] → [3.303:357]

		love.graphics.print(tostring(i), vx(0), vy(i*1000))

[3.303]

[3.357]

		love.graphics.print(tostring(i), 0, i*1000)

Replacement in 0026-on.draw at line 16 [12.238692]

B:BD[12.238842] → [2.231:379]

			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h), scale(obj.rx or 0),scale(obj.ry or obj.rx or 0))

[12.238842]

[12.238950]

			love.graphics.rectangle(obj.drawmode or 'fill', obj.x,obj.y, obj.w,obj.h, obj.rx or 0,obj.ry or obj.rx or 0)

Replacement in 0026-on.draw at line 18 [12.238692]
B:BD[12.239332] → [12.239332:239373]
```
			love.graphics.line(unpack(obj.zdata))
```
[12.238983]
[12.239373]
```
			love.graphics.line(unpack(obj.data))
```

Replacement in 0026-on.draw at line 20 [12.238692]

B:BD[12.239408] → [12.239408:239497]

			love.graphics.circle(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radius))

[12.239408]

[12.239497]

			love.graphics.circle(obj.drawmode or 'fill', obj.x, obj.y, obj.radius)

Replacement in 0026-on.draw at line 22 [12.238692]

B:BD[12.239529] → [12.239529:239676]

			love.graphics.arc(obj.drawmode or 'line', obj.arctype or 'open', vx(obj.x), vy(obj.y), scale(obj.radius), obj.angle1, obj.angle2, obj.segments)

[12.239529]

[12.239676]

			love.graphics.arc(obj.drawmode or 'line', obj.arctype or 'open', obj.x, obj.y, obj.radius, obj.angle1, obj.angle2, obj.segments)

Replacement in 0026-on.draw at line 24 [12.238692]

B:BD[12.239712] → [12.239712:239823]

			love.graphics.ellipse(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radiusx), scale(obj.radiusy))

[12.239712]

[12.239823]

			love.graphics.ellipse(obj.drawmode or 'fill', obj.x, obj.y, obj.radiusx, obj.radiusy)

Replacement in 0026-on.draw at line 26 [12.238692]
B:BD[12.239858] → [5.318:359]
```
			love.graphics.line(unpack(obj.zdata))
```
[12.239858]
[12.240245]
```
			love.graphics.line(unpack(obj.data))
```

Replacement in 0026-on.draw at line 29 [12.238692]

B:BD[5.384] → [5.384:439]

				love.graphics.draw(obj.text, vx(obj.x), vy(obj.y))

[5.384]

[5.439]

				love.graphics.draw(obj.text, obj.x, obj.y)

Deletion in 0026-on.draw at line 31 [12.238692]

B:BD[5.447] → [3.363:432]

				print(obj.x, obj.y, obj.editor.top, obj.editor.screen_top1.line)

Deletion in 0019-B at line 2 [13.6168]

B:BD[9.349] → [3.795:807]

∅:D[9.349] → [13.6218:6287]

∅:D[3.807] → [13.6218:6287]

B:BD[13.6218] → [13.6218:6287]

B:BD[13.6410] → [13.6410:6887]

B:BD[13.6887] → [9.350:377]

∅:D[9.377] → [13.6950:7048]

B:BD[13.6950] → [13.6950:7048]

	print('B')
	-- recompute various aspects based on the current viewport settings
	for _,obj in ipairs(Surface) do
		if obj.type == 'line' then
			obj.zdata = {}
			for i=1,#obj.data,2 do
				table.insert(obj.zdata, vx(obj.data[i]))
				table.insert(obj.zdata, vy(obj.data[i+1]))
			end
		elseif obj.type == 'bezier' then
			zdata = {}
			for i=1,#obj.data,2 do
				table.insert(zdata, vx(obj.data[i]))
				table.insert(zdata, vy(obj.data[i+1]))
			end
			obj.zdata = love.math.newBezierCurve(zdata):render()
		elseif obj.type == 'text' then
			if obj.w then
				update_editor_box(obj)
			else
				obj.text = love.graphics.newText(love.graphics.getFont(), obj.data)
			end
		end
	end

Insertion in 0012-on.initialize at line 2 [14.2104]
[14.2132]
[14.2132]
```
	love.graphics.setFont(love.graphics.newFont(20))
```
Replacement in 0012-on.initialize at line 4 [14.2104]
B:BD[14.2137] → [14.2137:2140]
```
end
```
[14.2137]
```
end
```

Replacement in 0010-initialize_editor at line 4 [15.542]

B:BD[15.628] → [15.628:859]

		local scaled_fontsize = scale(20)
		local scaled_lineheight = math.floor(scaled_fontsize*1.3)
		obj.editor = edit.initialize_state(vy(obj.y), math.floor(vx(obj.x)), math.ceil(vx(obj.x+obj.w)), scaled_fontsize, scaled_lineheight)

[15.628]

[15.859]

		obj.editor = edit.initialize_state(obj.y, obj.x, obj.x+obj.w, 20, math.floor(20*1.3))

Replacement in 0010-initialize_editor at line 8 [15.542]
B:BD[15.936] → [15.936:939]
```
end
```
[15.936]
```
end
```

Insertion in 0007-to_text at line 2 [16.25]

[16.50]

	local sx, sy = x/Viewport.zoom + Viewport.x, y/Viewport.zoom + Viewport.y

Replacement in 0007-to_text at line 5 [16.25]

B:BD[16.114] → [16.114:247]

			if x >= vx(node.x) and node.w and x < vx(node.x + node.w) then
				if y >= vy(node.y) and node.h and y < vy(node.y + node.h) then

[16.114]

[16.247]

			if sx >= node.x and node.w and sx < node.x + node.w then
				if sy >= node.y and node.h and sy < node.y + node.h then

Replacement in 0007-to_text at line 12 [16.25]
B:BD[16.290] → [16.290:293]
```
end
```
[16.290]
```
end
```

abort: switch to LÖVE's coordinate transforms

Dependencies

In channels

Change contents

File deletion: 0004-vy, 0008-vy

File deletion: 0003-scale, 0007-scale

File deletion: 0002-vx, 0005-vx

Replacement in 0030-update_editor_box at line 8 [8.26]