From 528c64d690c2d1cb4b3b70c37008b3ba37d904b9 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 5 Sep 2022 11:28:03 -0700 Subject: support drawings in the source editor --- main.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'main.lua') diff --git a/main.lua b/main.lua index 7b2da57..dad1723 100644 --- a/main.lua +++ b/main.lua @@ -24,6 +24,13 @@ load_file_from_source_or_save_directory('button.lua') -- both sides require (different parts of) the logging framework load_file_from_source_or_save_directory('log.lua') +-- both sides use drawings +load_file_from_source_or_save_directory('icons.lua') +load_file_from_source_or_save_directory('drawing.lua') + load_file_from_source_or_save_directory('geom.lua') + load_file_from_source_or_save_directory('help.lua') +load_file_from_source_or_save_directory('drawing_tests.lua') + -- but some files we want to only load sometimes function App.load() if love.filesystem.getInfo('config') then @@ -43,13 +50,8 @@ function App.load() load_file_from_source_or_save_directory('search.lua') load_file_from_source_or_save_directory('select.lua') load_file_from_source_or_save_directory('undo.lua') - load_file_from_source_or_save_directory('icons.lua') load_file_from_source_or_save_directory('text_tests.lua') load_file_from_source_or_save_directory('run_tests.lua') - load_file_from_source_or_save_directory('drawing.lua') - load_file_from_source_or_save_directory('geom.lua') - load_file_from_source_or_save_directory('help.lua') - load_file_from_source_or_save_directory('drawing_tests.lua') else load_file_from_source_or_save_directory('source_file.lua') load_file_from_source_or_save_directory('source.lua') -- cgit 1.4.1-2-gfad0 From 5ab541f160132d49697a44dea9e418ae10bd6533 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 5 Sep 2022 12:38:11 -0700 Subject: . --- main.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'main.lua') diff --git a/main.lua b/main.lua index dad1723..efb7419 100644 --- a/main.lua +++ b/main.lua @@ -52,7 +52,7 @@ function App.load() load_file_from_source_or_save_directory('undo.lua') load_file_from_source_or_save_directory('text_tests.lua') load_file_from_source_or_save_directory('run_tests.lua') - else + elseif Current_app == 'source' then load_file_from_source_or_save_directory('source_file.lua') load_file_from_source_or_save_directory('source.lua') load_file_from_source_or_save_directory('commands.lua') @@ -65,6 +65,8 @@ function App.load() load_file_from_source_or_save_directory('colorize.lua') load_file_from_source_or_save_directory('source_text_tests.lua') load_file_from_source_or_save_directory('source_tests.lua') + else + assert(false, 'unknown app "'..Current_app..'"') end end -- cgit 1.4.1-2-gfad0