akkartik/luaML.love - Change WKMW7PCE75A5CFXF5GPL5HQ4ZNASFOFQFHASOQ7LABSQKWU3KEGAC

undo 2 most recent commits

Created by Kartik K. Agaram on October 25, 2023

WKMW7PCE75A5CFXF5GPL5HQ4ZNASFOFQFHASOQ7LABSQKWU3KEGAC

Dependencies

In channels

main

Change contents

Replacement in 0030-update_editor_box at line 8 [3.26]
B:BD[3.315] → [2.31:58]
```
		node.editor.top = node.y
```
[3.315]
[3.346]
```
		node.editor.top = vy(node.y)
```

Replacement in 0030-update_editor_box at line 10 [3.26]

B:BD[3.352] → [4.31:128]

		node.editor.screen_top1, node.editor.top = schema1_of_y(node.editor, scale(Viewport.y-node.y))

[3.352]

[5.238]

		node.editor.screen_top1, node.editor.top = schema1_of_y(node.editor, Viewport.y-node.y)

File addition: 0029-Page2 (----------)

[6.2]

Page2 = {
	x=500, y=300,
    -- page
		type='text',
        data={
"Call me Ishmael.  Some years ago--never mind how long precisely--having little or no money in my purse, and nothing particular to interest me on shore, I thought I would sail about a little and see the watery part of the world.  It is a way I have of driving off the spleen and regulating the circulation.  Whenever I find myself growing grim about the mouth; whenever it is a damp, drizzly November in my soul; whenever I find myself involuntarily pausing before coffin warehouses, and bringing up the rear of every funeral I meet; and especially whenever my hypos get such an upper hand of me, that it requires a strong moral principle to prevent me from deliberately stepping into the street, and methodically knocking people's hats off--then, I account it high time to get to sea as soon as I can.  This is my substitute for pistol and ball.  With a philosophical flourish Cato throws himself upon his sword; I quietly take to the ship.  There is nothing surprising in this.  If they but knew it, almost all men in their degree, some time or other, cherish very nearly the same feelings towards the ocean with me."
		},
        width=400, bg={r=0,g=0.8,b=0}
}

Replacement in 0028-A at line 2 [8.6019]

B:BD[7.115] → [4.130:142]

B:BD[4.142] → [2.60:356]

	print('A')
       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

[7.115]

[5.519]

	love.graphics.setFont(love.graphics.newFont(scale(20)))  -- editor objects implicitly depend on current font
	-- translate Page to Surface
	while #Surface > 3 do table.remove(Surface) end  -- HACK
	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
	compute_layout(Page, Page.x,Page.y, Surface)
	compute_layout(Page2, Page2.x,Page2.y, Surface)
	-- continue the pipeline
	B()
	-- TODO: ugly that we're manipulating editor objects twice

Replacement in 0027-Surface at line 2 [8.12612]

B:BD[8.12625] → [4.144:146]

[8.12625]

  -- test data
  {type='line', data={0,-1000, 0,1000}},
  {type='line', data={-10000,0, 10000,0}},
  {type='text', data={'0'}, x=-20,y=-30},
  {type='rectangle', x=50,y=50, w=20,h=80, r=1,g=0,b=0},
  {type='text', data={'abc', 'def'}, x=150, y=50, w=50,h=50, fg={r=0,g=0.4, b=0.9}},
  {type='circle', x=300,y=200, radius=40, r=1,g=0,b=1},
  {type='arc', x=0,y=0, radius=50, angle1=0, angle2=math.pi*2/3},
  {type='ellipse', x=100,y=100, radiusx=10, radiusy=50},
  {type='bezier', data={25,25, 25,125, 75,25, 125,25}},
}

Replacement in 0026-on.draw at line 2 [9.238692]

B:BD[9.238714] → [2.359:579]

∅:D[2.579] → [4.148:179]

B:BD[9.238714] → [4.148:179]

B:BD[4.179] → [2.580:656]

∅:D[2.656] → [4.287:303]

B:BD[4.287] → [4.287:303]

B:BD[4.303] → [2.657:703]

∅:D[2.703] → [4.357:362]

B:BD[4.357] → [4.357:362]

	-- 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
	love.graphics.setColor(0,0,0)
	love.graphics.line(0, 0, 0, 1000000)
	love.graphics.line(0, 0, 1000000, 0)
	for i=1,100 do
		love.graphics.print(tostring(i), 0, i*1000)
	end

[9.238714]

	love.graphics.setColor(1,0,0)

Replacement in 0026-on.draw at line 6 [9.238692]

B:BD[9.238842] → [2.704:816]

			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)

[9.238842]

[9.238950]

			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))

Replacement in 0026-on.draw at line 8 [9.238692]
B:BD[9.238983] → [2.817:857]
```
			love.graphics.line(unpack(obj.data))
```
[9.238983]
[9.239373]
```
			love.graphics.line(unpack(obj.zdata))
```

Replacement in 0026-on.draw at line 10 [9.238692]

B:BD[9.239408] → [2.858:932]

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

[9.239408]

[9.239497]

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

Replacement in 0026-on.draw at line 12 [9.238692]

B:BD[9.239529] → [2.933:1065]

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

[9.239529]

[9.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)

Replacement in 0026-on.draw at line 14 [9.238692]

B:BD[9.239712] → [2.1066:1155]

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

[9.239712]

[9.239823]

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

Replacement in 0026-on.draw at line 16 [9.238692]
B:BD[9.239858] → [2.1156:1196]
```
			love.graphics.line(unpack(obj.data))
```
[9.239858]
[9.240245]
```
			love.graphics.line(unpack(obj.zdata))
```

Replacement in 0026-on.draw at line 19 [9.238692]

B:BD[10.384] → [2.1197:1244]

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

[10.384]

[10.439]

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

Replacement in 0020-Page at line 12 [11.55929]

B:BD[11.56184] → [4.439:790]

'1',
'2',
'3',
'4',
'5',
'6',
'7',
'8',
'9',
'10',
'11',
'12',
'13',
'14',
'15',
'16',
'17',
'18',
'19',
'20',
'21',
'22',
'23',
'24',
'25',
'26',
'27',
'28',
'29',
'30',
'31',
'32',
'33',
'34',
'35',
'36',
'37',
'38',
'39',
'40',
'41',
'42',
'43',
'44',
'45',
'46',
'47',
'48',
'49',
'50',
'51',
'52',
'53',
'54',
'55',
'56',
'57',
'58',
'59',
'60',

[11.56184]

[11.56772]

			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',

Insertion in 0020-Page at line 25 [11.55929]

[11.56822]

[11.57526]

      -- a table on the right
      { type='rows', name='searches', margin=50, data={
        { type='text', data={''},},
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},

Replacement in 0020-Page at line 45 [11.55929]
B:BD[11.57533] → [4.791:793]
```
}
```
[11.57533]
```
}
```

Insertion in 0019-B at line 2 [12.6168]

[7.349]

[7.378]

	-- 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

Deletion in 0012-on.initialize at line 2 [13.2104]
B:BD[13.2132] → [2.1259:1309]
```
	love.graphics.setFont(love.graphics.newFont(20))
```
Replacement in 0012-on.initialize at line 3 [13.2104]
B:BD[13.2137] → [2.1310:1314]
```
end
```
[13.2137]
```
end
```

Replacement in 0011-box_height at line 2 [14.8821]

B:BD[14.8850] → [4.816:917]

	-- return the height of a text editor node (explicit width). The result is scaled.
	local count = 0

[14.8850]

[15.157]

	-- return the height of a text editor node (explicit width). The result is unscaled.
	local y = 0

Insertion in 0011-box_height at line 9 [14.8821]
[15.307]
[15.351]
```
		node.editor.line_cache[i].fragments = nil
```

Replacement in 0011-box_height at line 12 [14.8821]

B:BD[15.467] → [4.918:988]

		count = count + #node.editor.line_cache[i].screen_line_starting_pos

[15.467]

[15.536]

		y = y + node.editor.line_height*#node.editor.line_cache[i].screen_line_starting_pos

Replacement in 0011-box_height at line 15 [14.8821]

B:BD[15.588] → [4.989:1121]

	print(count, '*', node.editor.line_height, '=', count*node.editor.line_height)
	return count*node.editor.line_height/Viewport.zoom

[15.588]

[16.306]

	return y

Replacement in 0010-initialize_editor at line 4 [17.542]

B:BD[17.628] → [2.1317:1405]

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

[17.628]

[17.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)

Replacement in 0010-initialize_editor at line 10 [17.542]
B:BD[17.936] → [2.1406:1410]
```
end
```
[17.936]
```
end
```

Replacement in 0008-Viewport at line 1 [18.445]

B:BD[18.445] → [4.1125:1174]

Viewport = {x=-50, y=-50, w=800,h=600, zoom=0.4}

[18.445]

Viewport = {x=-50, y=-50, w=800,h=600, zoom=1.0}

Deletion in 0007-to_text at line 2 [19.25]

B:BD[19.50] → [2.1414:1489]

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

Replacement in 0007-to_text at line 4 [19.25]

B:BD[19.114] → [2.1490:1611]

			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

[19.114]

[19.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

Replacement in 0007-to_text at line 11 [19.25]
B:BD[19.290] → [2.1612:1616]
```
end
```
[19.290]
```
end
```

File addition: 0004-vy (----------)

[6.2]

vy = function(sy)
	-- turn surface coordinates into viewport coordinates
	return scale(sy-Viewport.y)
end

File addition: 0003-scale (----------)

[6.2]

scale = function(d)
	return d*Viewport.zoom
end

File addition: 0002-vx (----------)

[6.2]

vx = function(sx)
	-- turn surface coordinates into viewport coordinates
	return scale(sx-Viewport.x)
end

undo 2 most recent commits

Dependencies

In channels

Change contents

Replacement in 0030-update_editor_box at line 8 [3.26]

Replacement in 0030-update_editor_box at line 10 [3.26]

File addition: 0029-Page2 (----------)

Replacement in 0028-A at line 2 [8.6019]

Replacement in 0027-Surface at line 2 [8.12612]

Replacement in 0026-on.draw at line 2 [9.238692]

Replacement in 0026-on.draw at line 6 [9.238692]

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

Replacement in 0026-on.draw at line 10 [9.238692]

Replacement in 0026-on.draw at line 12 [9.238692]

Replacement in 0026-on.draw at line 14 [9.238692]

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

Replacement in 0026-on.draw at line 19 [9.238692]

Replacement in 0020-Page at line 12 [11.55929]

Insertion in 0020-Page at line 25 [11.55929]

Replacement in 0020-Page at line 45 [11.55929]

Insertion in 0019-B at line 2 [12.6168]

Deletion in 0012-on.initialize at line 2 [13.2104]

Replacement in 0012-on.initialize at line 3 [13.2104]

Replacement in 0011-box_height at line 2 [14.8821]

Insertion in 0011-box_height at line 9 [14.8821]

Replacement in 0011-box_height at line 12 [14.8821]

Replacement in 0011-box_height at line 15 [14.8821]

Replacement in 0010-initialize_editor at line 4 [17.542]

Replacement in 0010-initialize_editor at line 10 [17.542]

Replacement in 0008-Viewport at line 1 [18.445]

Deletion in 0007-to_text at line 2 [19.25]

Replacement in 0007-to_text at line 4 [19.25]

Replacement in 0007-to_text at line 11 [19.25]

File addition: 0004-vy (----------)

File addition: 0003-scale (----------)

File addition: 0002-vx (----------)