diff --git a/two_player_cleaning_game/assets/battery_bar.aseprite b/game/assets/battery_bar.aseprite similarity index 100% rename from two_player_cleaning_game/assets/battery_bar.aseprite rename to game/assets/battery_bar.aseprite diff --git a/two_player_cleaning_game/assets/battery_bar.png b/game/assets/battery_bar.png similarity index 100% rename from two_player_cleaning_game/assets/battery_bar.png rename to game/assets/battery_bar.png diff --git a/two_player_cleaning_game/assets/charging_station.aseprite b/game/assets/charging_station.aseprite similarity index 100% rename from two_player_cleaning_game/assets/charging_station.aseprite rename to game/assets/charging_station.aseprite diff --git a/two_player_cleaning_game/assets/curiosities-1x.png b/game/assets/curiosities-1x.png similarity index 100% rename from two_player_cleaning_game/assets/curiosities-1x.png rename to game/assets/curiosities-1x.png diff --git a/two_player_cleaning_game/assets/doors.aseprite b/game/assets/doors.aseprite similarity index 100% rename from two_player_cleaning_game/assets/doors.aseprite rename to game/assets/doors.aseprite diff --git a/two_player_cleaning_game/assets/dust_001.aseprite b/game/assets/dust_001.aseprite similarity index 100% rename from two_player_cleaning_game/assets/dust_001.aseprite rename to game/assets/dust_001.aseprite diff --git a/two_player_cleaning_game/assets/dust_001.png b/game/assets/dust_001.png similarity index 100% rename from two_player_cleaning_game/assets/dust_001.png rename to game/assets/dust_001.png diff --git a/two_player_cleaning_game/assets/gen_levels.bb b/game/assets/gen_levels.bb similarity index 100% rename from two_player_cleaning_game/assets/gen_levels.bb rename to game/assets/gen_levels.bb diff --git a/two_player_cleaning_game/assets/level_002.png b/game/assets/level_002.png similarity index 100% rename from two_player_cleaning_game/assets/level_002.png rename to game/assets/level_002.png diff --git a/two_player_cleaning_game/assets/objects.aseprite b/game/assets/objects.aseprite similarity index 100% rename from two_player_cleaning_game/assets/objects.aseprite rename to game/assets/objects.aseprite diff --git a/two_player_cleaning_game/assets/objects.png b/game/assets/objects.png similarity index 100% rename from two_player_cleaning_game/assets/objects.png rename to game/assets/objects.png diff --git a/two_player_cleaning_game/assets/player.aseprite b/game/assets/player.aseprite similarity index 100% rename from two_player_cleaning_game/assets/player.aseprite rename to game/assets/player.aseprite diff --git a/two_player_cleaning_game/assets/player.png b/game/assets/player.png similarity index 100% rename from two_player_cleaning_game/assets/player.png rename to game/assets/player.png diff --git a/two_player_cleaning_game/assets/tiled/dev.tmx b/game/assets/tiled/dev.tmx similarity index 100% rename from two_player_cleaning_game/assets/tiled/dev.tmx rename to game/assets/tiled/dev.tmx diff --git a/two_player_cleaning_game/assets/tiled/level_001.tmx b/game/assets/tiled/level_001.tmx similarity index 100% rename from two_player_cleaning_game/assets/tiled/level_001.tmx rename to game/assets/tiled/level_001.tmx diff --git a/two_player_cleaning_game/assets/tiled/objects.tsx b/game/assets/tiled/objects.tsx similarity index 100% rename from two_player_cleaning_game/assets/tiled/objects.tsx rename to game/assets/tiled/objects.tsx diff --git a/two_player_cleaning_game/assets/tiled/tutorial.tmx b/game/assets/tiled/tutorial.tmx similarity index 100% rename from two_player_cleaning_game/assets/tiled/tutorial.tmx rename to game/assets/tiled/tutorial.tmx diff --git a/two_player_cleaning_game/assets/tiled/untitled.tiled-project b/game/assets/tiled/untitled.tiled-project similarity index 100% rename from two_player_cleaning_game/assets/tiled/untitled.tiled-project rename to game/assets/tiled/untitled.tiled-project diff --git a/two_player_cleaning_game/assets/tiled/untitled.tiled-session b/game/assets/tiled/untitled.tiled-session similarity index 100% rename from two_player_cleaning_game/assets/tiled/untitled.tiled-session rename to game/assets/tiled/untitled.tiled-session diff --git a/two_player_cleaning_game/assets/tiled/walls.tsx b/game/assets/tiled/walls.tsx similarity index 100% rename from two_player_cleaning_game/assets/tiled/walls.tsx rename to game/assets/tiled/walls.tsx diff --git a/two_player_cleaning_game/assets/ui.aseprite b/game/assets/ui.aseprite similarity index 100% rename from two_player_cleaning_game/assets/ui.aseprite rename to game/assets/ui.aseprite diff --git a/two_player_cleaning_game/assets/ui.png b/game/assets/ui.png similarity index 100% rename from two_player_cleaning_game/assets/ui.png rename to game/assets/ui.png diff --git a/two_player_cleaning_game/assets/walls.aseprite b/game/assets/walls.aseprite similarity index 100% rename from two_player_cleaning_game/assets/walls.aseprite rename to game/assets/walls.aseprite diff --git a/two_player_cleaning_game/assets/walls.png b/game/assets/walls.png similarity index 100% rename from two_player_cleaning_game/assets/walls.png rename to game/assets/walls.png diff --git a/two_player_cleaning_game/fennel.lua b/game/fennel.lua similarity index 100% rename from two_player_cleaning_game/fennel.lua rename to game/fennel.lua diff --git a/two_player_cleaning_game/levels.fnl b/game/levels.fnl similarity index 100% rename from two_player_cleaning_game/levels.fnl rename to game/levels.fnl diff --git a/two_player_cleaning_game/libs/beholder.lua b/game/libs/beholder.lua similarity index 100% rename from two_player_cleaning_game/libs/beholder.lua rename to game/libs/beholder.lua diff --git a/two_player_cleaning_game/libs/bump.lua b/game/libs/bump.lua similarity index 100% rename from two_player_cleaning_game/libs/bump.lua rename to game/libs/bump.lua diff --git a/two_player_cleaning_game/libs/nata.lua b/game/libs/nata.lua similarity index 100% rename from two_player_cleaning_game/libs/nata.lua rename to game/libs/nata.lua diff --git a/two_player_cleaning_game/libs/tiny.lua b/game/libs/tiny.lua similarity index 100% rename from two_player_cleaning_game/libs/tiny.lua rename to game/libs/tiny.lua diff --git a/two_player_cleaning_game/main.fnl b/game/main.fnl similarity index 100% rename from two_player_cleaning_game/main.fnl rename to game/main.fnl diff --git a/two_player_cleaning_game/main.lua b/game/main.lua similarity index 100% rename from two_player_cleaning_game/main.lua rename to game/main.lua diff --git a/two_player_cleaning_game/src/assets.fnl b/game/src/assets.fnl similarity index 100% rename from two_player_cleaning_game/src/assets.fnl rename to game/src/assets.fnl diff --git a/two_player_cleaning_game/src/colors.fnl b/game/src/colors.fnl similarity index 100% rename from two_player_cleaning_game/src/colors.fnl rename to game/src/colors.fnl diff --git a/two_player_cleaning_game/src/entities/info-pad.fnl b/game/src/entities/info-pad.fnl similarity index 100% rename from two_player_cleaning_game/src/entities/info-pad.fnl rename to game/src/entities/info-pad.fnl diff --git a/two_player_cleaning_game/src/entities/player.fnl b/game/src/entities/player.fnl similarity index 100% rename from two_player_cleaning_game/src/entities/player.fnl rename to game/src/entities/player.fnl diff --git a/two_player_cleaning_game/src/levels/dev.fnl b/game/src/levels/dev.fnl similarity index 100% rename from two_player_cleaning_game/src/levels/dev.fnl rename to game/src/levels/dev.fnl diff --git a/two_player_cleaning_game/src/levels/tutorial.fnl b/game/src/levels/tutorial.fnl similarity index 100% rename from two_player_cleaning_game/src/levels/tutorial.fnl rename to game/src/levels/tutorial.fnl diff --git a/two_player_cleaning_game/src/network.fnl b/game/src/network.fnl similarity index 100% rename from two_player_cleaning_game/src/network.fnl rename to game/src/network.fnl diff --git a/two_player_cleaning_game/src/systems/camera.fnl b/game/src/systems/camera.fnl similarity index 100% rename from two_player_cleaning_game/src/systems/camera.fnl rename to game/src/systems/camera.fnl diff --git a/two_player_cleaning_game/src/systems/hud.fnl b/game/src/systems/hud.fnl similarity index 100% rename from two_player_cleaning_game/src/systems/hud.fnl rename to game/src/systems/hud.fnl diff --git a/two_player_cleaning_game/src/systems/walls.fnl b/game/src/systems/walls.fnl similarity index 100% rename from two_player_cleaning_game/src/systems/walls.fnl rename to game/src/systems/walls.fnl diff --git a/two_player_cleaning_game/src/utils.fnl b/game/src/utils.fnl similarity index 100% rename from two_player_cleaning_game/src/utils.fnl rename to game/src/utils.fnl diff --git a/hello_world/fennel.lua b/hello_world/fennel.lua deleted file mode 120000 index f331bf8..0000000 --- a/hello_world/fennel.lua +++ /dev/null @@ -1 +0,0 @@ -../fennel-1.5.3.lua \ No newline at end of file diff --git a/hello_world/main.fnl b/hello_world/main.fnl deleted file mode 100644 index b7b8d58..0000000 --- a/hello_world/main.fnl +++ /dev/null @@ -1,15 +0,0 @@ -(fn love.load [] - ;; start a thread listening on stdin - (: (love.thread.newThread "require('love.event') -while 1 do love.event.push('stdin', io.read('*line')) end") :start)) - -(fn love.handlers.stdin [line] - ;; evaluate lines read from stdin as fennel code - (let [(ok val) (pcall fennel.eval line)] - (print (if ok (fennel.view val) val)))) - -(fn love.draw [] - (love.graphics.print "Hello from Fennel!\nPress any key to quit" 10 10)) - -(fn love.keypressed [key] - (love.event.quit)) \ No newline at end of file diff --git a/hello_world/main.lua b/hello_world/main.lua deleted file mode 120000 index 3cfdabb..0000000 --- a/hello_world/main.lua +++ /dev/null @@ -1 +0,0 @@ -../fennel_bootstrap.lua \ No newline at end of file diff --git a/hello_world_lua/main.lua b/hello_world_lua/main.lua deleted file mode 100644 index bc46983..0000000 --- a/hello_world_lua/main.lua +++ /dev/null @@ -1,3 +0,0 @@ -function love.draw() - love.graphics.print("Hello World", 400, 300) -end \ No newline at end of file diff --git a/one_line/main.fnl b/one_line/main.fnl deleted file mode 100644 index 764e730..0000000 --- a/one_line/main.fnl +++ /dev/null @@ -1,119 +0,0 @@ -(local scale 6) -(local canvas-w (* scale 88)) -(local canvas-h (* scale 31)) -(local canvas-x (* -1 (/ canvas-w 2))) -(local canvas-y (* -1 (/ canvas-h 2))) -(local app-state { - :mode :draw ; draw or preview -}) -(local theme { - :white (lambda [cb] (cb (love.math.colorFromBytes 247 246 246))) - :black (lambda [cb] (cb (love.math.colorFromBytes 60 54 51))) -}) - -(lambda set-center-origin [] - (let [(w h f) (love.window.getMode) - x (/ w 2) - y (/ h 2) - ] - (love.graphics.push) - (love.graphics.translate x y))) - -; setup pixels for image that we are drawing -(var pixel-canvas nil) -(local pixels { - :export-ordered-keys [] - :drawn-ordered-keys [] - :cords {} -}) -(for [y 1 31] - (for [x 1 88] - (let [key (.. x "," y)] - (tset pixels.cords key {: x : y :val false}) - (table.insert pixels.export-ordered-keys key)))) - -(fn draw-canvases [] - "Draw main drawing canvas and preview canvas to screen" - (pixel-canvas:setFilter "nearest" "nearest") - (love.graphics.draw pixel-canvas canvas-x canvas-y 0 scale scale) - (love.graphics.draw pixel-canvas canvas-x (- canvas-y 60))) - -(fn update-canvas [] - (love.graphics.setCanvas pixel-canvas) - (love.graphics.clear 0 0 0 0) - (each [key {: x : y : val} (pairs pixels.cords)] - (when val (love.graphics.points x y))) - (love.graphics.setCanvas) -) - -(fn love.update [] - (let [ - (w h _) (love.window.getMode) - (mouse-x-raw mouse-y-raw) (love.mouse.getPosition) - mouse-x (- mouse-x-raw (/ w 2)) - mouse-y (- mouse-y-raw (/ h 2)) - ] - (when (and (> mouse-x canvas-x) (> mouse-y canvas-y) (< mouse-x (+ canvas-x canvas-w)) (< mouse-y (+ canvas-y canvas-h))) - (let [ - x (+ 1 (math.floor (/ (+ (/ canvas-w 2) mouse-x) scale))) - y (+ 1 (math.floor (/ (+ (/ canvas-h 2) mouse-y) scale))) - key (.. x "," y) - ] - (tset (. pixels.cords key) :val true) - (table.insert pixels.drawn-ordered-keys key) - (update-canvas) - ; (print (.. x "," y)) - )))) - -(fn love.load [] - ;; 480p 720×480 - (love.window.setMode 720 480) - - ; prep canvas - (set pixel-canvas (love.graphics.newCanvas 88 31)) - (update-canvas) - - ;; start a thread listening on stdin - (: (love.thread.newThread "require('love.event') -while 1 do love.event.push('stdin', io.read('*line')) end") :start)) - -(fn love.handlers.stdin [line] - ; evaluate lines read from stdin as fennel code - (let [(ok val) (pcall fennel.eval line)] - (print (if ok (fennel.view val) val)))) - -(lambda draw-static-bg [] - ; canvas outline and text - (love.graphics.print "Canvas:" canvas-x (- canvas-y 20)) - (love.graphics.rectangle "line" canvas-x canvas-y canvas-w canvas-h) - ; preview outline and text - (love.graphics.print "Preview:" canvas-x (- canvas-y 80)) - (love.graphics.rectangle "line" canvas-x (- canvas-y 60) 89 32) - - ; future preview outlines and text - (for [i 0 4] - (let [ - gap (/ (- canvas-w (* 5 89)) 4) - txt (case i - 0 "After 1 day" - 1 "After 2 days" - 2 "After 3 days" - 3 "After 4 days" - 4 "After 5 days")] - (love.graphics.print txt (+ (* i (+ 89 gap)) canvas-x) (+ (+ 20 canvas-h) canvas-y)) - (love.graphics.rectangle "line" (+ (* i (+ 89 gap)) canvas-x) (+ (+ 40 canvas-h) canvas-y) 89 32))) -) - -(fn love.draw [] - (set-center-origin) - (theme.white love.graphics.setBackgroundColor) - (theme.black love.graphics.setColor) - (draw-static-bg) - (draw-canvases) - (love.graphics.pop)) - -(fn love.keypressed [key] - (match key - "d" (tset app-state :mode "draw") - "p" (tset app-state :mode "preview"))) - ; (love.event.quit)) diff --git a/one_line/main.lua b/one_line/main.lua deleted file mode 100644 index 5aa5958..0000000 --- a/one_line/main.lua +++ /dev/null @@ -1,11 +0,0 @@ -fennel = require("fennel") -debug.traceback = fennel.traceback -table.insert(package.loaders, function(filename) - if love.filesystem.getInfo(filename) then - return function(...) - return fennel.eval(love.filesystem.read(filename), {env=_G, filename=filename}, ...), filename - end - end -end) --- jump into Fennel -require("main.fnl") \ No newline at end of file