Compare commits

..

No commits in common. "master" and "lua51" have entirely different histories.

14 changed files with 7 additions and 355 deletions

View file

@ -1,16 +1,3 @@
# lite-hearted
lite-hearted is a small compatibility shim for the lite text editor that allows
it to run in love2d. It is a quick-and-dirty experiment in embedding editing tools
into a game engine, to allow for building smooth game development workflows. It's
also literally a two-evening hack, so you will probably run into some rough edges!
You can run it simply by cloning this repo and running `love .`. Due to the
limitations of love2d's sandboxed filesystem, you can only edit files that are in
the project itself. Given the goals of this project, this should be fine.
Original README follows:
# lite # lite
![screenshot](https://user-images.githubusercontent.com/3920290/81471642-6c165880-91ea-11ea-8cd1-fae7ae8f0bc4.png) ![screenshot](https://user-images.githubusercontent.com/3920290/81471642-6c165880-91ea-11ea-8cd1-fae7ae8f0bc4.png)

View file

@ -1,6 +0,0 @@
function love.conf(t)
t.window.width = 1280
t.window.height = 1000
t.window.resizable = true
end

View file

@ -16,7 +16,7 @@ function command.add(predicate, map)
predicate = function() return core.active_view:is(class) end predicate = function() return core.active_view:is(class) end
end end
for name, fn in pairs(map) do for name, fn in pairs(map) do
-- assert(not command.map[name], "command already exists: " .. name) assert(not command.map[name], "command already exists: " .. name)
command.map[name] = { predicate = predicate, perform = fn } command.map[name] = { predicate = predicate, perform = fn }
end end
end end

View file

@ -237,14 +237,8 @@ function core.push_clip_rect(x, y, w, h)
w, h = r-x, b-y w, h = r-x, b-y
table.insert(core.clip_rect_stack, { x, y, w, h }) table.insert(core.clip_rect_stack, { x, y, w, h })
renderer.set_clip_rect(x, y, w, h) renderer.set_clip_rect(x, y, w, h)
return (#core.clip_rect_stack) - 1
end end
function core.pop_clip_rect_to(length)
while #core.clip_rect_stack > length do
core.pop_clip_rect()
end
end
function core.pop_clip_rect() function core.pop_clip_rect()
table.remove(core.clip_rect_stack) table.remove(core.clip_rect_stack)
@ -317,7 +311,6 @@ end
function core.try(fn, ...) function core.try(fn, ...)
local err local err
local ok, res = xpcall(fn, function(msg) local ok, res = xpcall(fn, function(msg)
print(msg, debug.traceback())
local item = core.error("%s", msg) local item = core.error("%s", msg)
item.info = debug.traceback(nil, 2):gsub("\t", "") item.info = debug.traceback(nil, 2):gsub("\t", "")
err = msg err = msg
@ -423,7 +416,7 @@ function core.step()
end end
core.run_threads = coroutine.wrap(function() local run_threads = coroutine.wrap(function()
while true do while true do
local max_time = 1 / config.fps - 0.004 local max_time = 1 / config.fps - 0.004
local ran_any_threads = false local ran_any_threads = false
@ -459,7 +452,7 @@ function core.run()
while true do while true do
core.frame_start = system.get_time() core.frame_start = system.get_time()
local did_redraw = core.step() local did_redraw = core.step()
core.run_threads() run_threads()
if not did_redraw and not system.window_has_focus() then if not did_redraw and not system.window_has_focus() then
system.wait_event(0.25) system.wait_event(0.25)
end end

View file

@ -365,13 +365,9 @@ function Node:draw()
self:draw_tabs() self:draw_tabs()
end end
local pos, size = self.active_view.position, self.active_view.size local pos, size = self.active_view.position, self.active_view.size
local clipstate = core.push_clip_rect(pos.x, pos.y, size.x + pos.x % 1, size.y + pos.y % 1) core.push_clip_rect(pos.x, pos.y, size.x + pos.x % 1, size.y + pos.y % 1)
xpcall(function() self.active_view:draw() end, self.active_view:draw()
function(msg) core.pop_clip_rect()
love.graphics.setCanvas(nil)
common.draw_text(style.font, { common.color "#ff0000" }, msg .. "\n" .. debug.traceback(), "left", pos.x, pos.y, size.x, size.y)
end)
core.pop_clip_rect_to(clipstate)
else else
local x, y, w, h = self:get_divider_rect() local x, y, w, h = self:get_divider_rect()
renderer.draw_rect(x, y, w, h, style.divider) renderer.draw_rect(x, y, w, h, style.divider)

View file

@ -57,7 +57,7 @@ local function draw_items(self, items, x, y, draw_fn)
local color = style.text local color = style.text
for _, item in ipairs(items) do for _, item in ipairs(items) do
if type(item) == "userdata" or (type(item) == "table" and item.get_width) then if type(item) == "userdata" then
font = item font = item
elseif type(item) == "table" then elseif type(item) == "table" then
color = item color = item

View file

@ -1 +0,0 @@
../../../lite-plugins/plugins/autoinsert.lua

View file

@ -1 +0,0 @@
../../../../support/lite/plugins/betterfind.lua

View file

@ -1 +0,0 @@
../../../lite-plugins/plugins/bracketmatch.lua

View file

@ -1 +0,0 @@
../../../lite-plugins/plugins/language_fennel.lua

View file

@ -1 +0,0 @@
../../../../support/lite/plugins/rainbowparen.lua

View file

@ -1 +0,0 @@
../../../lite-plugins/plugins/selectionhighlight.lua

View file

@ -1 +0,0 @@
../../../../support/lite/plugins/statusoverride.lua

311
main.lua
View file

@ -1,311 +0,0 @@
renderer = {}
function renderer.show_debug(show)
-- useful?
end
function renderer.get_size()
return love.graphics.getWidth(), love.graphics.getHeight()
end
function renderer.begin_frame()
-- handled in love.run
end
function renderer.end_frame()
-- handled in love.run
end
function renderer.set_clip_rect(x, y, w, h)
love.graphics.setScissor(x, y, w, h)
end
function renderer.set_litecolor(color)
local r, g, b, a = 255, 255, 255, 255
if color and #color >= 3 then r, g, b = unpack(color, 1, 3) end
if #color >= 4 then a = color[4] end
love.graphics.setColor(r / 255, g / 255, b / 255, a / 255)
end
function renderer.draw_rect(x, y, w, h, color)
renderer.set_litecolor(color)
love.graphics.rectangle("fill", x, y, w, h)
end
function renderer.draw_text(font, text, x, y, color)
renderer.set_litecolor(color)
love.graphics.setFont(font.font)
if pcall(function() love.graphics.print(text, x, y) end) then
return x + font.font:getWidth(text)
else
return x
end
end
renderer.font = {}
function renderer.font.load(filename, size)
local font = love.graphics.newFont(filename, size)
return {
font = font,
set_tab_width = function(self, n)
-- todo? Ignore?
end,
get_width = function(self, text)
return self.font:getWidth(text)
end,
get_height = function(self)
return self.font:getHeight()
end
}
end
system = {}
system.event_queue = {}
function system.enqueue_love_event(ev, a, b, c, d, e, f)
local function button_name(button)
if button == 1 then return 'left' end
if button == 2 then return 'right' end
if button == 3 then return 'middle' end
return '?'
end
local function key_name(key)
if key:sub(1, 2) == "kp" then
return "keypad " .. key:sub(3)
end
if key:sub(2) == "ctrl" or key:sub(2) == "shift" or key:sub(2) == "alt" or key:sub(2) == "gui" then
if key:sub(1, 1) == "l" then return "left " .. key:sub(2) end
return "right " .. key:sub(2)
end
return key
end
local function convert_love_event()
if ev == 'quit' then
return {'quit'}
elseif ev == 'resize' then
return {'resized', a, b}
elseif ev == 'filedropped' then
return {'filedropped', a:getFilename(), love.mouse.getX(), love.mouse.getY()}
elseif ev == 'keypressed' then
return {'keypressed', key_name(a or b)}
elseif ev == 'keyreleased' then
return {'keyreleased', key_name(a or b)}
elseif ev == 'textinput' then
return {'textinput', a}
elseif ev == 'mousepressed' then
return {'mousepressed', button_name(c), a, b, e}
elseif ev == 'mousereleased' then
return {'mousereleased', button_name(c), a, b}
elseif ev == 'mousemoved' then
return {'mousemoved', a, b, c, d}
elseif ev == 'wheelmoved' then
return {'mousewheel', b}
end
end
local liteev = convert_love_event()
if liteev then
table.insert(system.event_queue, liteev)
end
end
function system.poll_event()
local liteev = table.remove(system.event_queue, 1)
if liteev then
return unpack(liteev)
end
end
function system.wait_event(n)
-- no love2d equivalent
return false
end
function system.set_cursor(cursor)
if cursor == nil then cursor = 'arrow' end
if cursor == 'sizeh' then cursor = 'sizewe' end
if cursor == 'sizev' then cursor = 'sizens' end
love.mouse.setCursor(love.mouse.getSystemCursor(cursor))
end
function system.set_window_title(title)
love.window.setTitle(title)
end
function system.set_window_mode(mode)
love.window.setFullscreen(mode == 'fullscreen')
if mode == nil or mode == 'normal' then love.window.restore() end
if mode == 'maximized' then love.window.maximize() end
end
function system.window_has_focus()
return love.window.hasFocus()
end
function system.show_confirm_dialog(title, msg)
return love.window.showMessageBox(title, msg, { 'Yes', 'No', escapebutton = 2 }, 'warning') == 1
end
function system.chdir(dir)
-- not possible with love2d
end
function system.list_dir(path)
if path == '.' then path = '' end
local info = love.filesystem.getInfo(path)
if info and info.type == 'directory' then
return love.filesystem.getDirectoryItems(path)
elseif info and info.type == 'symlink' then
return love.filesystem.getDirectoryItems(path .. "/.")
end
return nil, "Not a directory"
end
function system.absolute_path(path)
return path -- love.filesystem.getRealDirectory(path)
end
function system.get_file_info(path)
local info = love.filesystem.getInfo(path)
if info then
local type = nil
if info.type == 'file' then
type = 'file'
elseif info.type == 'directory' then
type = 'dir'
elseif info.type == 'symlink' then
if love.filesystem.read(path, 1) then
type = 'file'
else
type = 'dir'
end
end
return {
modified = info.modtime,
size = info.size,
type = type
}
else
return nil, "Doesn't exist"
end
end
function system.get_clipboard()
return love.system.getClipboardText()
end
function system.set_clipboard(text)
love.system.setClipboardText(text)
end
function system.get_time()
return love.timer.getTime()
end
function system.sleep(s)
love.timer.sleep(s)
end
function system.exec(cmd)
-- ehhhh todo I guess
end
function system.fuzzy_match(str, ptn)
local istr = 1
local iptn = 1
local score = 0
local run = 0
while istr <= str:len() and iptn <= ptn:len() do
while str:sub(istr,istr) == ' ' do istr = istr + 1 end
while ptn:sub(iptn,iptn) == ' ' do iptn = iptn + 1 end
local cstr = str:sub(istr,istr)
local cptn = ptn:sub(iptn,iptn)
if cstr:lower() == cptn:lower() then
score = score + (run * 10)
if cstr ~= cptn then score = score - 1 end
run = run + 1
iptn = iptn + 1
else
score = score - 10
run = 0
end
istr = istr + 1
end
if iptn > ptn:len() then
return score - str:len() - istr + 1
end
end
table.unpack = unpack
PATHSEP = package.config:sub(1, 1)
ARGS = love.arg.parseGameArguments(arg)
VERSION = "1.11"
PLATFORM = "love2d"
SCALE = love.graphics.getDPIScale()
local modname = ...
local ilastdot = modname:reverse():find("%.")
EXEDIR = modname:gsub("%.", PATHSEP)
if ilastdot then
EXEDIR = EXEDIR:sub(1, (-1 - ilastdot))
else
EXEDIR = ""
end
local literoot = love.filesystem.getWorkingDirectory()
if #EXEDIR > 0 then
literoot = literoot .. PATHSEP .. EXEDIR
end
package.path = literoot .. '/data/?/init.lua;' .. package.path
package.path = literoot .. '/data/?.lua;' .. package.path
function love.run()
local core = require('core')
local style = require('core.style')
style.code_font = renderer.font.load(EXEDIR .. "/data/fonts/monospace.ttf", 15 * SCALE)
core.init()
if love.load then love.load(love.arg.parseGameArguments(arg), arg) end
-- We don't want the first frame's dt to include time taken by love.load.
if love.timer then love.timer.step() end
local dt = 0
-- Main loop time.
return function()
-- Process events.
if love.event then
love.event.pump()
for name, a,b,c,d,e,f in love.event.poll() do
system.enqueue_love_event(name, a, b, c, d, e, f)
if name == "quit" then
if not love.quit or not love.quit() then
return a or 0
end
end
love.handlers[name](a,b,c,d,e,f)
end
end
-- Update dt, as we'll be passing it to update
if love.timer then dt = love.timer.step() end
-- Call update and draw
if love.update then love.update(dt) end -- will pass 0 if love.timer is disabled
if love.graphics and love.graphics.isActive() then
love.graphics.origin()
love.graphics.clear(love.graphics.getBackgroundColor())
-- update lite & draw
core.redraw = true
core.frame_start = system.get_time()
core.step()
core.run_threads()
if love.draw then love.draw() end
love.graphics.present()
end
if love.timer then love.timer.sleep(0.001) end
end
end