From 823092ad9582a5e377cb55431e15a485de327ccf Mon Sep 17 00:00:00 2001 From: fnicon Date: Fri, 20 Mar 2026 00:45:36 +0900 Subject: [PATCH] Update path reference --- game/love_src/data/map/sprites.json | 6 +- game/love_src/src/modes/racing.lua | 2 +- game/love_src/src/modes/raising_sim.lua | 2 +- game/love_src/src/world/1_intro/init.lua | 14 +-- .../love_src/src/world/2_town_square/init.lua | 10 +- .../2_town_square/pseudo3d/render/road.lua | 2 +- .../2_town_square/pseudo3d/roadsegment.lua | 12 +- .../2_town_square/system/perspective.lua | 12 +- .../src/world/2_town_square/template/road.lua | 8 +- .../src/world/common/component/animation.lua | 2 +- .../src/world/common/component/audio.lua | 2 +- .../src/world/common/component/image.lua | 4 +- .../src/world/common/component/video.lua | 2 +- .../world/common/system/debug_world_draw.lua | 6 +- .../love_src/src/world/common/system/flip.lua | 6 +- .../world/common/system/trigger_button.lua | 4 +- .../src/world/common/system/video_render.lua | 4 +- .../src/world/common/template/book.lua | 30 ++--- .../src/world/common/template/button.lua | 2 +- .../world/common/template/debug_entity.lua | 2 +- .../src/world/common/template/video.lua | 2 +- game/love_src/src/world/main_menu/init.lua | 8 +- game/love_src/src/world/race/init.lua | 14 +-- game/love_src/src/world/train/init.lua | 6 +- game/love_src/wrapper/Concord/world.lua | 2 +- game/main.lua | 112 +++++++++--------- 26 files changed, 138 insertions(+), 138 deletions(-) diff --git a/game/love_src/data/map/sprites.json b/game/love_src/data/map/sprites.json index a41d6d7..b89a207 100644 --- a/game/love_src/data/map/sprites.json +++ b/game/love_src/data/map/sprites.json @@ -1,17 +1,17 @@ [ { "index" : 200, - "texture" : "asset/image/sample/javascript-racer-master/images/sprites/column.png", + "texture" : "love_src/asset/image/sample/javascript-racer-master/images/sprites/column.png", "offset" : -0.1 }, { "index" : 200, - "texture" : "asset/image/sample/javascript-racer-master/images/sprites/cactus.png", + "texture" : "love_src/asset/image/sample/javascript-racer-master/images/sprites/cactus.png", "offset" : 4 }, { "index" : 150, - "texture" : "asset/image/sample/javascript-racer-master/images/sprites/stump.png", + "texture" : "love_src/asset/image/sample/javascript-racer-master/images/sprites/stump.png", "offset" : 0 } ] diff --git a/game/love_src/src/modes/racing.lua b/game/love_src/src/modes/racing.lua index e00d3ed..f0f4141 100644 --- a/game/love_src/src/modes/racing.lua +++ b/game/love_src/src/modes/racing.lua @@ -1,4 +1,4 @@ -local racer = require("src.entities.racing.racer") +local racer = require("love_src.src.entities.racing.racer") local mode = {} diff --git a/game/love_src/src/modes/raising_sim.lua b/game/love_src/src/modes/raising_sim.lua index 95afef6..f9c3d17 100644 --- a/game/love_src/src/modes/raising_sim.lua +++ b/game/love_src/src/modes/raising_sim.lua @@ -1,5 +1,5 @@ -local trainee = require("src.entities.raising.trainee") +local trainee = require("love_src.src.entities.raising.trainee") local mode = {} diff --git a/game/love_src/src/world/1_intro/init.lua b/game/love_src/src/world/1_intro/init.lua index 3dbd806..b14ed21 100644 --- a/game/love_src/src/world/1_intro/init.lua +++ b/game/love_src/src/world/1_intro/init.lua @@ -2,12 +2,12 @@ local reap = require("lib.reap") local BASE = reap.base_path(...) -local world = require("wrapper.Concord.world") +local world = require("love_src.wrapper.Concord.world") -local debug_entity = require("src.world.common.template.debug_entity") -local button = require("src.world.common.template.button") -local video = require("src.world.common.template.video") -local c_video = require("src.world.common.component.video") +local debug_entity = require("love_src.src.world.common.template.debug_entity") +local button = require("love_src.src.world.common.template.button") +local video = require("love_src.src.world.common.template.video") +local c_video = require("love_src.src.world.common.component.video") local wm = require("world_map") local wrapper = world:extend() @@ -22,7 +22,7 @@ end function wrapper:load(_args) wrapper.super.load(self, { - "src/world/common/system/" + "love_src/src/world/common/system/" }, { { assemblage = debug_entity.assembleDebug, @@ -47,7 +47,7 @@ function wrapper:load(_args) { assemblage = video.assemble, data = { - path = "asset/video/1_intro.ogv" + path = "love_src/asset/video/1_intro.ogv" } } }) diff --git a/game/love_src/src/world/2_town_square/init.lua b/game/love_src/src/world/2_town_square/init.lua index 4fb747e..10367f4 100644 --- a/game/love_src/src/world/2_town_square/init.lua +++ b/game/love_src/src/world/2_town_square/init.lua @@ -2,10 +2,10 @@ local reap = require("lib.reap") local BASE = reap.base_path(...) -local world = require("wrapper.Concord.world") +local world = require("love_src.wrapper.Concord.world") -local debug_entity = require("src.world.common.template.debug_entity") -local road = require("src.world.2_town_square.template.road") +local debug_entity = require("love_src.src.world.common.template.debug_entity") +local road = require("love_src.src.world.2_town_square.template.road") local wm = require("world_map") @@ -17,8 +17,8 @@ end function wrapper:load(_args) wrapper.super.load(self, { - "src/world/common/system/", - "src/world/2_town_square/system" + "love_src/src/world/common/system/", + "love_src/src/world/2_town_square/system" }, { { assemblage = debug_entity.assembleDebug, diff --git a/game/love_src/src/world/2_town_square/pseudo3d/render/road.lua b/game/love_src/src/world/2_town_square/pseudo3d/render/road.lua index 983524d..ace58b7 100644 --- a/game/love_src/src/world/2_town_square/pseudo3d/render/road.lua +++ b/game/love_src/src/world/2_town_square/pseudo3d/render/road.lua @@ -1,4 +1,4 @@ -local ease = require("src.world.2_town_square.pseudo3d.ease") +local ease = require("love_src.src.world.2_town_square.pseudo3d.ease") local utils = {} diff --git a/game/love_src/src/world/2_town_square/pseudo3d/roadsegment.lua b/game/love_src/src/world/2_town_square/pseudo3d/roadsegment.lua index a3a2795..f34775e 100644 --- a/game/love_src/src/world/2_town_square/pseudo3d/roadsegment.lua +++ b/game/love_src/src/world/2_town_square/pseudo3d/roadsegment.lua @@ -4,8 +4,8 @@ local BASE = reap.base_path(...) local easeFN = require(BASE .. ".ease") local json = require("lib.json") -local QuadCache = require("wrapper.lappy.new.quad").obj -local ImageCache = require("wrapper.lappy.new.image").obj +local QuadCache = require("love_src.wrapper.lappy.new.quad").obj +local ImageCache = require("love_src.wrapper.lappy.new.image").obj local utils = {} @@ -114,11 +114,11 @@ function utils.addSegment(segments, segmentLength, rumbleLength, curve, y, width local y1 = lastY(segments) local y2 = y - local fQuads, fImage = utils.addQuads("asset/image/sample/javascript-racer-master/images/sprites/column.png", "vertical", w1, w2) - local cQuads, cImage = utils.addQuads("asset/image/sample/javascript-racer-master/images/sprites/column.png", "vertical", w1, w2) + local fQuads, fImage = utils.addQuads("love_src/asset/image/sample/javascript-racer-master/images/sprites/column.png", "vertical", w1, w2) + local cQuads, cImage = utils.addQuads("love_src/asset/image/sample/javascript-racer-master/images/sprites/column.png", "vertical", w1, w2) - local lQuads, lImage = utils.addQuads("asset/image/sample/javascript-racer-master/images/sprites/column.png", "horizontal", y1, y2) - local rQuads, rImage = utils.addQuads("asset/image/sample/javascript-racer-master/images/sprites/column.png", "horizontal", y1, y2) + local lQuads, lImage = utils.addQuads("love_src/asset/image/sample/javascript-racer-master/images/sprites/column.png", "horizontal", y1, y2) + local rQuads, rImage = utils.addQuads("love_src/asset/image/sample/javascript-racer-master/images/sprites/column.png", "horizontal", y1, y2) return { --- index for seeking diff --git a/game/love_src/src/world/2_town_square/system/perspective.lua b/game/love_src/src/world/2_town_square/system/perspective.lua index da9d8b5..f1f3894 100644 --- a/game/love_src/src/world/2_town_square/system/perspective.lua +++ b/game/love_src/src/world/2_town_square/system/perspective.lua @@ -1,14 +1,14 @@ -local system_constructor = require("wrapper.Concord.system") +local system_constructor = require("love_src.wrapper.Concord.system") -local roadsegment = require("src.world.2_town_square.pseudo3d.roadsegment") +local roadsegment = require("love_src.src.world.2_town_square.pseudo3d.roadsegment") -local perspective = require("src.world.2_town_square.component.perspective") -local pos3d = require("src.world.2_town_square.component.pos3d") +local perspective = require("love_src.src.world.2_town_square.component.perspective") +local pos3d = require("love_src.src.world.2_town_square.component.pos3d") local projection = require("lib.choro.projection") -local ease = require("src.world.2_town_square.pseudo3d.ease") +local ease = require("love_src.src.world.2_town_square.pseudo3d.ease") local vm = require("lib.vornmath") -local roaddraw = require("src.world.2_town_square.pseudo3d.render.road") +local roaddraw = require("love_src.src.world.2_town_square.pseudo3d.render.road") local system = {} diff --git a/game/love_src/src/world/2_town_square/template/road.lua b/game/love_src/src/world/2_town_square/template/road.lua index 0779080..b6bb94f 100644 --- a/game/love_src/src/world/2_town_square/template/road.lua +++ b/game/love_src/src/world/2_town_square/template/road.lua @@ -1,5 +1,5 @@ -local perspective = require("src.world.2_town_square.component.perspective") -local pos3d = require("src.world.2_town_square.component.pos3d") +local perspective = require("love_src.src.world.2_town_square.component.perspective") +local pos3d = require("love_src.src.world.2_town_square.component.pos3d") local template = {} @@ -29,8 +29,8 @@ template.default_data = { rumble_length = 3, - segment_path = "data/map/segment.json", - segment_sprite_map_path = "data/map/sprites.json", + segment_path = "love_src/data/map/segment.json", + segment_sprite_map_path = "love_src/data/map/sprites.json", } function template.assemble(e, data) diff --git a/game/love_src/src/world/common/component/animation.lua b/game/love_src/src/world/common/component/animation.lua index f3cc6c8..40de9c0 100644 --- a/game/love_src/src/world/common/component/animation.lua +++ b/game/love_src/src/world/common/component/animation.lua @@ -1,4 +1,4 @@ -local image = require("wrapper.lappy.new.image").obj +local image = require("love_src.wrapper.lappy.new.image").obj local components = {} diff --git a/game/love_src/src/world/common/component/audio.lua b/game/love_src/src/world/common/component/audio.lua index 6f30d83..4e2d041 100644 --- a/game/love_src/src/world/common/component/audio.lua +++ b/game/love_src/src/world/common/component/audio.lua @@ -1,4 +1,4 @@ -local source = require("wrapper.lappy.new.source").obj +local source = require("love_src.wrapper.lappy.new.source").obj local components = {} diff --git a/game/love_src/src/world/common/component/image.lua b/game/love_src/src/world/common/component/image.lua index f82d8f0..91d63c4 100644 --- a/game/love_src/src/world/common/component/image.lua +++ b/game/love_src/src/world/common/component/image.lua @@ -1,5 +1,5 @@ -local quad = require("wrapper.lappy.new.quad").obj -local image = require("wrapper.lappy.new.image").obj +local quad = require("love_src.wrapper.lappy.new.quad").obj +local image = require("love_src.wrapper.lappy.new.image").obj local components = {} diff --git a/game/love_src/src/world/common/component/video.lua b/game/love_src/src/world/common/component/video.lua index 40d2a1a..95a0480 100644 --- a/game/love_src/src/world/common/component/video.lua +++ b/game/love_src/src/world/common/component/video.lua @@ -1,4 +1,4 @@ -local video = require("wrapper.lappy.new.video").obj +local video = require("love_src.wrapper.lappy.new.video").obj local components = {} diff --git a/game/love_src/src/world/common/system/debug_world_draw.lua b/game/love_src/src/world/common/system/debug_world_draw.lua index 943cb5c..f963651 100644 --- a/game/love_src/src/world/common/system/debug_world_draw.lua +++ b/game/love_src/src/world/common/system/debug_world_draw.lua @@ -1,6 +1,6 @@ -local system_constructor = require("wrapper.Concord.system") -local debug_label = require("src.world.common.component.debug_label") -local transform = require("src.world.common.component.transform") +local system_constructor = require("love_src.wrapper.Concord.system") +local debug_label = require("love_src.src.world.common.component.debug_label") +local transform = require("love_src.src.world.common.component.transform") local system = {} diff --git a/game/love_src/src/world/common/system/flip.lua b/game/love_src/src/world/common/system/flip.lua index b493a17..de10491 100644 --- a/game/love_src/src/world/common/system/flip.lua +++ b/game/love_src/src/world/common/system/flip.lua @@ -1,8 +1,8 @@ local floor = math.floor -local system_constructor = require("wrapper.Concord.system") -local audio = require("src.world.common.component.audio") -local animation = require("src.world.common.component.animation") +local system_constructor = require("love_src.wrapper.Concord.system") +local audio = require("love_src.src.world.common.component.audio") +local animation = require("love_src.src.world.common.component.animation") local system = {} diff --git a/game/love_src/src/world/common/system/trigger_button.lua b/game/love_src/src/world/common/system/trigger_button.lua index a90ccd0..b485e65 100644 --- a/game/love_src/src/world/common/system/trigger_button.lua +++ b/game/love_src/src/world/common/system/trigger_button.lua @@ -1,5 +1,5 @@ -local system_constructor = require("wrapper.Concord.system") -local c_button = require("src.world.common.component.button") +local system_constructor = require("love_src.wrapper.Concord.system") +local c_button = require("love_src.src.world.common.component.button") local system = {} diff --git a/game/love_src/src/world/common/system/video_render.lua b/game/love_src/src/world/common/system/video_render.lua index 123e204..886258d 100644 --- a/game/love_src/src/world/common/system/video_render.lua +++ b/game/love_src/src/world/common/system/video_render.lua @@ -1,5 +1,5 @@ -local system_constructor = require("wrapper.Concord.system") -local c_video = require("src.world.common.component.video") +local system_constructor = require("love_src.wrapper.Concord.system") +local c_video = require("love_src.src.world.common.component.video") local system = {} diff --git a/game/love_src/src/world/common/template/book.lua b/game/love_src/src/world/common/template/book.lua index 4003813..cd04245 100644 --- a/game/love_src/src/world/common/template/book.lua +++ b/game/love_src/src/world/common/template/book.lua @@ -1,26 +1,26 @@ -local flip = require("src.world.common.system.flip") -local transform = require("src.world.common.component.transform") +local flip = require("love_src.src.world.common.system.flip") +local transform = require("love_src.src.world.common.component.transform") local template = {} template.default_data = { - sfx = "asset/audio/sfx/book_flip.1.ogg", + sfx = "love_src/asset/audio/sfx/book_flip.1.ogg", anim_direction = 1, fps = 12, frame_i = 1, image_frame = { - "asset/image/book/StoryMode.png", - "asset/image/book/StoryModeBook.png", - "asset/image/book/StoryModeBook2.png", - "asset/image/book/StoryModeBook3.png", - "asset/image/book/StoryModeBook4.png", - "asset/image/book/StoryModeBook5.png", - "asset/image/book/StoryModeBook6.png", - "asset/image/book/StoryModeBook7.png", - "asset/image/book/StoryModeBook8.png", - "asset/image/book/StoryModeBook9.png", - "asset/image/book/StoryModeBook11.png", - "asset/image/book/StoryModeBook16.png", + "love_src/asset/image/book/StoryMode.png", + "love_src/asset/image/book/StoryModeBook.png", + "love_src/asset/image/book/StoryModeBook2.png", + "love_src/asset/image/book/StoryModeBook3.png", + "love_src/asset/image/book/StoryModeBook4.png", + "love_src/asset/image/book/StoryModeBook5.png", + "love_src/asset/image/book/StoryModeBook6.png", + "love_src/asset/image/book/StoryModeBook7.png", + "love_src/asset/image/book/StoryModeBook8.png", + "love_src/asset/image/book/StoryModeBook9.png", + "love_src/asset/image/book/StoryModeBook11.png", + "love_src/asset/image/book/StoryModeBook16.png", }, next_trigger_frame = 1, run_time = 0, diff --git a/game/love_src/src/world/common/template/button.lua b/game/love_src/src/world/common/template/button.lua index 8c19399..36ae583 100644 --- a/game/love_src/src/world/common/template/button.lua +++ b/game/love_src/src/world/common/template/button.lua @@ -1,4 +1,4 @@ -local button = require("src.world.common.component.button") +local button = require("love_src.src.world.common.component.button") local template = {} diff --git a/game/love_src/src/world/common/template/debug_entity.lua b/game/love_src/src/world/common/template/debug_entity.lua index 6375cac..e0bc1dc 100644 --- a/game/love_src/src/world/common/template/debug_entity.lua +++ b/game/love_src/src/world/common/template/debug_entity.lua @@ -1,4 +1,4 @@ -local debug_world_draw = require("src.world.common.system.debug_world_draw") +local debug_world_draw = require("love_src.src.world.common.system.debug_world_draw") local template = {} diff --git a/game/love_src/src/world/common/template/video.lua b/game/love_src/src/world/common/template/video.lua index 0e7767e..d036897 100644 --- a/game/love_src/src/world/common/template/video.lua +++ b/game/love_src/src/world/common/template/video.lua @@ -1,4 +1,4 @@ -local video = require("src.world.common.component.video") +local video = require("love_src.src.world.common.component.video") local template = {} diff --git a/game/love_src/src/world/main_menu/init.lua b/game/love_src/src/world/main_menu/init.lua index 4d4c5ac..d01aa24 100644 --- a/game/love_src/src/world/main_menu/init.lua +++ b/game/love_src/src/world/main_menu/init.lua @@ -2,10 +2,10 @@ local reap = require("lib.reap") local BASE = reap.base_path(...) -local world = require("wrapper.Concord.world") +local world = require("love_src.wrapper.Concord.world") -local debug_entity = require("src.world.common.template.debug_entity") -local button = require("src.world.common.template.button") +local debug_entity = require("love_src.src.world.common.template.debug_entity") +local button = require("love_src.src.world.common.template.button") local wm = require("world_map") local wrapper = world:extend() @@ -20,7 +20,7 @@ end function wrapper:load(_args) wrapper.super.load(self, { - "src/world/common/system/" + "love_src/src/world/common/system/" }, { { assemblage = debug_entity.assembleDebug, diff --git a/game/love_src/src/world/race/init.lua b/game/love_src/src/world/race/init.lua index d4b86b9..98b10ce 100644 --- a/game/love_src/src/world/race/init.lua +++ b/game/love_src/src/world/race/init.lua @@ -1,15 +1,15 @@ local reap = require("lib.reap") local BASE = reap.base_path(...) -local image = require("wrapper.lappy.new.image").obj +local image = require("love_src.wrapper.lappy.new.image").obj -local world = require("wrapper.Concord.world") +local world = require("love_src.wrapper.Concord.world") -local debug_entity = require("src.world.common.template.debug_entity") -local book = require("src.world.common.template.book") +local debug_entity = require("love_src.src.world.common.template.debug_entity") +local book = require("love_src.src.world.common.template.book") -local animation = require("src.world.common.component.animation") -local transform = require("src.world.common.component.transform") +local animation = require("love_src.src.world.common.component.animation") +local transform = require("love_src.src.world.common.component.transform") local wrapper = world:extend() @@ -19,7 +19,7 @@ end function wrapper:load(_args) wrapper.super.load(self, { - "src/world/common/system/" + "love_src/src/world/common/system/" }, { { assemblage = debug_entity.assembleDebug, diff --git a/game/love_src/src/world/train/init.lua b/game/love_src/src/world/train/init.lua index 6ba5d80..d7181b6 100644 --- a/game/love_src/src/world/train/init.lua +++ b/game/love_src/src/world/train/init.lua @@ -2,9 +2,9 @@ local reap = require("lib.reap") local BASE = reap.base_path(...) -local world = require("wrapper.Concord.world") +local world = require("love_src.wrapper.Concord.world") -local debug_entity = require("src.world.common.template.debug_entity") +local debug_entity = require("love_src.src.world.common.template.debug_entity") local wrapper = world:extend() @@ -14,7 +14,7 @@ end function wrapper:load(_args) wrapper.super.load(self, { - "src/world/common/system/" + "love_src/src/world/common/system/" }, { { assemblage = debug_entity.assembleDebug, diff --git a/game/love_src/wrapper/Concord/world.lua b/game/love_src/wrapper/Concord/world.lua index 15053e1..d9f24e8 100644 --- a/game/love_src/wrapper/Concord/world.lua +++ b/game/love_src/wrapper/Concord/world.lua @@ -14,7 +14,7 @@ local Component = Concord.component local System = Concord.system local World = Concord.world -local main_wrapper = require "wrapper.lappy.world" +local main_wrapper = require "love_src.wrapper.lappy.world" ---@class wrappers.Concord.world : lappy.world local wrapper = main_wrapper:extend() diff --git a/game/main.lua b/game/main.lua index 9bf1a60..19c1d0a 100644 --- a/game/main.lua +++ b/game/main.lua @@ -140,69 +140,69 @@ end -- end -- end -function love.load(args) - init() - local width, height, flags = love.window.getMode() - test.update_window(width, height) -end - -function love.update(time) - update(time) - - if (love.mouse.isDown(1)) then - local x, y = love.mouse.getPosition() - test.update_mouse(x, y) - end -end - -function love.draw() - -- draw() - love.graphics.push() - - love.graphics.setCanvas() - love.graphics.setShader() - love.graphics.line(0, 0, love.graphics.getDimensions()) - love.graphics.pop() - -end - --- local wm = require("world_map") - --- world = { --- ["main_menu"] = require("src.world.main_menu")(), --- ["1_intro"] = require("src.world.1_intro")(), --- ["2_town_square"] = require("src.world.2_town_square")(), --- ["race"] = require("src.world.race")(), --- ["train"] = require("src.world.train")(), --- }; - --- current = wm["2_town_square"] - --- function load_world(world_to_load) --- current = world_to_load --- world[current]:reload() +-- function love.load(args) +-- init() +-- local width, height, flags = love.window.getMode() +-- test.update_window(width, height) -- end --- function love.load() --- world[current]:load() --- end +-- function love.update(time) +-- update(time) --- function love.update(dt) --- world[current]:update(dt) +-- if (love.mouse.isDown(1)) then +-- local x, y = love.mouse.getPosition() +-- test.update_mouse(x, y) +-- end -- end -- function love.draw() --- world[current]:draw() +-- draw() +-- love.graphics.push() + +-- love.graphics.setCanvas() +-- love.graphics.setShader() +-- love.graphics.line(0, 0, love.graphics.getDimensions()) +-- love.graphics.pop() + -- end --- function love.keyreleased(key, scancode) --- world[current]:keyreleased(key, scancode) --- end +local wm = require("world_map") --- function love.keypressed(key, scancode, isrepeat) --- world[current]:keypressed(key, scancode, isrepeat) --- end +world = { + ["main_menu"] = require("love_src.src.world.main_menu")(), + ["1_intro"] = require("love_src.src.world.1_intro")(), + ["2_town_square"] = require("love_src.src.world.2_town_square")(), + ["race"] = require("love_src.src.world.race")(), + ["train"] = require("love_src.src.world.train")(), +}; --- function love.mousereleased(x, y, button, istouch, presses) --- world[current]:mousereleased(x, y, button, istouch, presses) --- end +current = wm["2_town_square"] + +function load_world(world_to_load) + current = world_to_load + world[current]:reload() +end + +function love.load() + world[current]:load() +end + +function love.update(dt) + world[current]:update(dt) +end + +function love.draw() + world[current]:draw() +end + +function love.keyreleased(key, scancode) + world[current]:keyreleased(key, scancode) +end + +function love.keypressed(key, scancode, isrepeat) + world[current]:keypressed(key, scancode, isrepeat) +end + +function love.mousereleased(x, y, button, istouch, presses) + world[current]:mousereleased(x, y, button, istouch, presses) +end