From 6d3c8de013a9be56ba42e766730f78a85b3afb09 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Fri, 12 Aug 2022 10:50:42 +0200 Subject: [PATCH] chore: rename the birb/ folder to framework/ --- birb/modules/transitions/init.lua | 4 ---- examples/birb | 1 - examples/framework | 1 + examples/game/init.lua | 2 +- examples/main.lua | 2 +- examples/scenes/basic/test_menus/init.lua | 10 +++++----- examples/scenes/basic/test_scene/init.lua | 2 +- .../scenes/basic/test_scene2/actors/parent.lua | 2 +- examples/scenes/basic/test_scene2/init.lua | 4 ++-- .../scenes/gameplay/action3D/actors/box.lua | 2 +- .../scenes/gameplay/action3D/actors/coin.lua | 2 +- .../scenes/gameplay/action3D/actors/init.lua | 2 +- .../scenes/gameplay/action3D/actors/parent.lua | 2 +- .../scenes/gameplay/action3D/actors/wall.lua | 2 +- examples/scenes/gameplay/action3D/init.lua | 4 ++-- .../gameplay/moveplayer/actors/parent.lua | 2 +- .../scenes/gameplay/moveplayer/actors/wall.lua | 2 +- examples/scenes/gameplay/moveplayer/init.lua | 4 ++-- .../gameplay/moveplayer3D/actors/parent.lua | 2 +- .../gameplay/moveplayer3D/actors/wall.lua | 2 +- examples/scenes/gameplay/moveplayer3D/init.lua | 4 ++-- .../scenes/gameplay/plateform/actors/coin.lua | 2 +- .../scenes/gameplay/plateform/actors/init.lua | 2 +- .../gameplay/plateform/actors/player.lua | 2 +- .../scenes/gameplay/plateform/actors/wall.lua | 2 +- examples/scenes/gameplay/plateform/init.lua | 4 ++-- examples/scenes/gameplay/plateform/pause.lua | 4 ++-- examples/scenes/mainmenu/init.lua | 2 +- examples/scenes/mainmenu/menu.lua | 4 ++-- examples/scenes/menus/inventory/init.lua | 8 ++++---- examples/scenes/menus/options/init.lua | 2 +- examples/scenes/menus/options/menu.lua | 2 +- examples/scenes/menus/options/widgets.lua | 2 +- {birb => framework}/callbacks.lua | 0 {birb => framework}/classes/2D/indexedrect.lua | 2 +- {birb => framework}/classes/2D/point.lua | 0 {birb => framework}/classes/2D/rect.lua | 2 +- {birb => framework}/classes/3D/box.lua | 2 +- {birb => framework}/classes/3D/indexedbox.lua | 2 +- {birb => framework}/classes/3D/point3D.lua | 0 {birb => framework}/classes/datapack.lua | 0 {birb => framework}/classes/parser.lua | 0 {birb => framework}/classes/predicate/init.lua | 2 +- .../classes/predicate/simple.lua | 2 +- .../classes/predicate/utils.lua | 0 .../classes/serializable/init.lua | 0 .../classes/serializable/serializer.lua | 4 ++-- {birb => framework}/classes/time/func.lua | 2 +- {birb => framework}/classes/time/init.lua | 8 ++++---- {birb => framework}/classes/time/timer.lua | 0 {birb => framework}/core/datas.lua | 4 ++-- {birb => framework}/core/debug.lua | 2 +- {birb => framework}/core/init.lua | 0 {birb => framework}/core/input.lua | 0 {birb => framework}/core/lang.lua | 0 {birb => framework}/core/music.lua | 0 {birb => framework}/core/options.lua | 2 +- {birb => framework}/core/scenemanager.lua | 0 {birb => framework}/core/screen.lua | 2 +- {birb => framework}/gamesystem/init.lua | 2 +- {birb => framework}/init.lua | 10 +++++----- {birb => framework}/libs/binser.lua | 0 {birb => framework}/libs/classic.lua | 0 {birb => framework}/libs/cscreen.lua | 0 {birb => framework}/libs/lovebird.lua | 0 {birb => framework}/libs/talkies.lua | 0 {birb => framework}/libs/tween.lua | 0 {birb => framework}/modules/assets/init.lua | 0 .../modules/assets/types/animator.lua | 0 .../modules/assets/types/autotile.lua | 0 .../modules/assets/types/background.lua | 0 .../modules/assets/types/fonts.lua | 0 .../modules/assets/types/imagefonts.lua | 0 .../modules/assets/types/sfx.lua | 0 .../modules/assets/types/sprites.lua | 0 .../modules/assets/types/texture.lua | 0 .../modules/assets/types/tileset.lua | 0 .../modules/gui/elements/assets.lua | 2 +- .../modules/gui/elements/canvas.lua | 2 +- .../modules/gui/elements/color.lua | 2 +- .../modules/gui/elements/composite.lua | 2 +- .../modules/gui/elements/counter.lua | 2 +- .../modules/gui/elements/drawable.lua | 2 +- .../modules/gui/elements/parent.lua | 4 ++-- .../modules/gui/elements/text.lua | 2 +- .../modules/gui/elements/tile.lua | 2 +- .../modules/gui/elements/variable.lua | 2 +- {birb => framework}/modules/gui/init.lua | 6 +++--- .../modules/gui/menus/flowbox.lua | 0 {birb => framework}/modules/gui/menus/grid.lua | 2 +- .../modules/gui/menus/hlistbox.lua | 0 .../modules/gui/menus/listbox.lua | 0 .../modules/gui/menus/model/init.lua | 2 +- .../modules/gui/menus/model/page.lua | 0 .../modules/gui/menus/parent.lua | 6 +++--- .../modules/gui/menus/views/view1D.lua | 0 .../modules/gui/menus/views/view2D.lua | 2 +- .../modules/gui/menus/widgets/base.lua | 0 .../modules/gui/menus/widgets/init.lua | 4 ++-- .../modules/gui/menus/widgets/text.lua | 2 +- .../modules/gui/mixins/elements.lua | 0 .../modules/gui/mixins/screens.lua | 0 .../modules/gui/screen/init.lua | 8 ++++---- .../modules/gui/screen/screenset.lua | 0 .../modules/gui/textmenu/init.lua | 4 ++-- .../modules/gui/textmenu/widgets/back.lua | 2 +- .../modules/gui/textmenu/widgets/basic.lua | 2 +- .../modules/gui/textmenu/widgets/init.lua | 6 +++--- .../modules/gui/textmenu/widgets/submenu.lua | 2 +- {birb => framework}/modules/gui/utils.lua | 0 {birb => framework}/modules/scenes.lua | 0 .../modules/transitions/canvas.lua | 2 +- .../modules/transitions/circle.lua | 2 +- .../modules/transitions/decal.lua | 2 +- .../modules/transitions/default.lua | 2 +- framework/modules/transitions/init.lua | 4 ++++ .../modules/transitions/parent.lua | 2 +- .../modules/world/actors/actor2D.lua | 14 +++++++------- .../modules/world/actors/actor3D.lua | 18 +++++++++--------- .../modules/world/actors/gfx2D.lua | 0 .../modules/world/actors/gfx3D.lua | 0 .../modules/world/actors/mixins/base.lua | 0 .../modules/world/actors/mixins/inputs.lua | 0 .../modules/world/actors/mixins/physics.lua | 2 +- .../modules/world/actors/mixins/shapes.lua | 0 .../modules/world/actors/mixins/sprites.lua | 2 +- .../modules/world/actors/mixins/timers.lua | 2 +- .../modules/world/actors/utils/boxes/init.lua | 0 .../world/actors/utils/boxes/mapped.lua | 0 .../world/actors/utils/boxes/parent.lua | 0 .../world/actors/utils/boxes/textured.lua | 0 .../modules/world/actors/utils/hitbox2D.lua | 2 +- .../modules/world/actors/utils/hitbox3D.lua | 2 +- .../modules/world/actors/utils/sprites.lua | 0 .../modules/world/baseworld.lua | 0 .../modules/world/camera/init.lua | 0 .../modules/world/camera/utils.lua | 0 .../modules/world/libs/bump-3dpd.lua | 0 .../modules/world/libs/bump.lua | 0 .../modules/world/libs/tsort.lua | 0 .../modules/world/maps/init.lua | 0 .../modules/world/maps/parent.lua | 0 .../modules/world/maps/tiled/init.lua | 6 +++--- .../world/maps/tiled/libs/sti/graphics.lua | 0 .../modules/world/maps/tiled/libs/sti/init.lua | 0 .../maps/tiled/libs/sti/plugins/box2d.lua | 0 .../world/maps/tiled/libs/sti/plugins/bump.lua | 0 .../world/maps/tiled/libs/sti/utils.lua | 0 .../modules/world/maps/tiled/mixins.lua | 0 .../modules/world/maps/tiled/stiwrapper.lua | 2 +- {birb => framework}/modules/world/world2D.lua | 0 {birb => framework}/modules/world/world3D.lua | 0 {birb => framework}/structures/box.lua | 0 {birb => framework}/structures/elementData.lua | 0 {birb => framework}/structures/hitbox.lua | 0 {birb => framework}/structures/rect.lua | 0 {birb => framework}/structures/tween.lua | 0 {birb => framework}/utils/bools.lua | 0 {birb => framework}/utils/datas.lua | 0 {birb => framework}/utils/enum.lua | 0 {birb => framework}/utils/filesystem.lua | 0 {birb => framework}/utils/graphics.lua | 0 {birb => framework}/utils/init.lua | 14 +++++++------- {birb => framework}/utils/math.lua | 0 {birb => framework}/utils/string.lua | 0 {birb => framework}/utils/table.lua | 2 +- {birb => framework}/utils/time.lua | 2 +- 167 files changed, 147 insertions(+), 147 deletions(-) delete mode 100644 birb/modules/transitions/init.lua delete mode 120000 examples/birb create mode 120000 examples/framework rename {birb => framework}/callbacks.lua (100%) rename {birb => framework}/classes/2D/indexedrect.lua (96%) rename {birb => framework}/classes/2D/point.lua (100%) rename {birb => framework}/classes/2D/rect.lua (97%) rename {birb => framework}/classes/3D/box.lua (97%) rename {birb => framework}/classes/3D/indexedbox.lua (97%) rename {birb => framework}/classes/3D/point3D.lua (100%) rename {birb => framework}/classes/datapack.lua (100%) rename {birb => framework}/classes/parser.lua (100%) rename {birb => framework}/classes/predicate/init.lua (97%) rename {birb => framework}/classes/predicate/simple.lua (96%) rename {birb => framework}/classes/predicate/utils.lua (100%) rename {birb => framework}/classes/serializable/init.lua (100%) rename {birb => framework}/classes/serializable/serializer.lua (95%) rename {birb => framework}/classes/time/func.lua (77%) rename {birb => framework}/classes/time/init.lua (95%) rename {birb => framework}/classes/time/timer.lua (100%) rename {birb => framework}/core/datas.lua (95%) rename {birb => framework}/core/debug.lua (98%) rename {birb => framework}/core/init.lua (100%) rename {birb => framework}/core/input.lua (100%) rename {birb => framework}/core/lang.lua (100%) rename {birb => framework}/core/music.lua (100%) rename {birb => framework}/core/options.lua (98%) rename {birb => framework}/core/scenemanager.lua (100%) rename {birb => framework}/core/screen.lua (98%) rename {birb => framework}/gamesystem/init.lua (96%) rename {birb => framework}/init.lua (89%) rename {birb => framework}/libs/binser.lua (100%) rename {birb => framework}/libs/classic.lua (100%) rename {birb => framework}/libs/cscreen.lua (100%) rename {birb => framework}/libs/lovebird.lua (100%) rename {birb => framework}/libs/talkies.lua (100%) rename {birb => framework}/libs/tween.lua (100%) rename {birb => framework}/modules/assets/init.lua (100%) rename {birb => framework}/modules/assets/types/animator.lua (100%) rename {birb => framework}/modules/assets/types/autotile.lua (100%) rename {birb => framework}/modules/assets/types/background.lua (100%) rename {birb => framework}/modules/assets/types/fonts.lua (100%) rename {birb => framework}/modules/assets/types/imagefonts.lua (100%) rename {birb => framework}/modules/assets/types/sfx.lua (100%) rename {birb => framework}/modules/assets/types/sprites.lua (100%) rename {birb => framework}/modules/assets/types/texture.lua (100%) rename {birb => framework}/modules/assets/types/tileset.lua (100%) rename {birb => framework}/modules/gui/elements/assets.lua (84%) rename {birb => framework}/modules/gui/elements/canvas.lua (96%) rename {birb => framework}/modules/gui/elements/color.lua (85%) rename {birb => framework}/modules/gui/elements/composite.lua (91%) rename {birb => framework}/modules/gui/elements/counter.lua (80%) rename {birb => framework}/modules/gui/elements/drawable.lua (90%) rename {birb => framework}/modules/gui/elements/parent.lua (96%) rename {birb => framework}/modules/gui/elements/text.lua (86%) rename {birb => framework}/modules/gui/elements/tile.lua (87%) rename {birb => framework}/modules/gui/elements/variable.lua (79%) rename {birb => framework}/modules/gui/init.lua (96%) rename {birb => framework}/modules/gui/menus/flowbox.lua (100%) rename {birb => framework}/modules/gui/menus/grid.lua (99%) rename {birb => framework}/modules/gui/menus/hlistbox.lua (100%) rename {birb => framework}/modules/gui/menus/listbox.lua (100%) rename {birb => framework}/modules/gui/menus/model/init.lua (98%) rename {birb => framework}/modules/gui/menus/model/page.lua (100%) rename {birb => framework}/modules/gui/menus/parent.lua (96%) rename {birb => framework}/modules/gui/menus/views/view1D.lua (100%) rename {birb => framework}/modules/gui/menus/views/view2D.lua (96%) rename {birb => framework}/modules/gui/menus/widgets/base.lua (100%) rename {birb => framework}/modules/gui/menus/widgets/init.lua (90%) rename {birb => framework}/modules/gui/menus/widgets/text.lua (98%) rename {birb => framework}/modules/gui/mixins/elements.lua (100%) rename {birb => framework}/modules/gui/mixins/screens.lua (100%) rename {birb => framework}/modules/gui/screen/init.lua (93%) rename {birb => framework}/modules/gui/screen/screenset.lua (100%) rename {birb => framework}/modules/gui/textmenu/init.lua (95%) rename {birb => framework}/modules/gui/textmenu/widgets/back.lua (93%) rename {birb => framework}/modules/gui/textmenu/widgets/basic.lua (95%) rename {birb => framework}/modules/gui/textmenu/widgets/init.lua (85%) rename {birb => framework}/modules/gui/textmenu/widgets/submenu.lua (93%) rename {birb => framework}/modules/gui/utils.lua (100%) rename {birb => framework}/modules/scenes.lua (100%) rename {birb => framework}/modules/transitions/canvas.lua (89%) rename {birb => framework}/modules/transitions/circle.lua (83%) rename {birb => framework}/modules/transitions/decal.lua (88%) rename {birb => framework}/modules/transitions/default.lua (79%) create mode 100644 framework/modules/transitions/init.lua rename {birb => framework}/modules/transitions/parent.lua (92%) rename {birb => framework}/modules/world/actors/actor2D.lua (89%) rename {birb => framework}/modules/world/actors/actor3D.lua (88%) rename {birb => framework}/modules/world/actors/gfx2D.lua (100%) rename {birb => framework}/modules/world/actors/gfx3D.lua (100%) rename {birb => framework}/modules/world/actors/mixins/base.lua (100%) rename {birb => framework}/modules/world/actors/mixins/inputs.lua (100%) rename {birb => framework}/modules/world/actors/mixins/physics.lua (98%) rename {birb => framework}/modules/world/actors/mixins/shapes.lua (100%) rename {birb => framework}/modules/world/actors/mixins/sprites.lua (97%) rename {birb => framework}/modules/world/actors/mixins/timers.lua (95%) rename {birb => framework}/modules/world/actors/utils/boxes/init.lua (100%) rename {birb => framework}/modules/world/actors/utils/boxes/mapped.lua (100%) rename {birb => framework}/modules/world/actors/utils/boxes/parent.lua (100%) rename {birb => framework}/modules/world/actors/utils/boxes/textured.lua (100%) rename {birb => framework}/modules/world/actors/utils/hitbox2D.lua (98%) rename {birb => framework}/modules/world/actors/utils/hitbox3D.lua (98%) rename {birb => framework}/modules/world/actors/utils/sprites.lua (100%) rename {birb => framework}/modules/world/baseworld.lua (100%) rename {birb => framework}/modules/world/camera/init.lua (100%) rename {birb => framework}/modules/world/camera/utils.lua (100%) rename {birb => framework}/modules/world/libs/bump-3dpd.lua (100%) rename {birb => framework}/modules/world/libs/bump.lua (100%) rename {birb => framework}/modules/world/libs/tsort.lua (100%) rename {birb => framework}/modules/world/maps/init.lua (100%) rename {birb => framework}/modules/world/maps/parent.lua (100%) rename {birb => framework}/modules/world/maps/tiled/init.lua (85%) rename {birb => framework}/modules/world/maps/tiled/libs/sti/graphics.lua (100%) rename {birb => framework}/modules/world/maps/tiled/libs/sti/init.lua (100%) rename {birb => framework}/modules/world/maps/tiled/libs/sti/plugins/box2d.lua (100%) rename {birb => framework}/modules/world/maps/tiled/libs/sti/plugins/bump.lua (100%) rename {birb => framework}/modules/world/maps/tiled/libs/sti/utils.lua (100%) rename {birb => framework}/modules/world/maps/tiled/mixins.lua (100%) rename {birb => framework}/modules/world/maps/tiled/stiwrapper.lua (99%) rename {birb => framework}/modules/world/world2D.lua (100%) rename {birb => framework}/modules/world/world3D.lua (100%) rename {birb => framework}/structures/box.lua (100%) rename {birb => framework}/structures/elementData.lua (100%) rename {birb => framework}/structures/hitbox.lua (100%) rename {birb => framework}/structures/rect.lua (100%) rename {birb => framework}/structures/tween.lua (100%) rename {birb => framework}/utils/bools.lua (100%) rename {birb => framework}/utils/datas.lua (100%) rename {birb => framework}/utils/enum.lua (100%) rename {birb => framework}/utils/filesystem.lua (100%) rename {birb => framework}/utils/graphics.lua (100%) rename {birb => framework}/utils/init.lua (78%) rename {birb => framework}/utils/math.lua (100%) rename {birb => framework}/utils/string.lua (100%) rename {birb => framework}/utils/table.lua (99%) rename {birb => framework}/utils/time.lua (93%) diff --git a/birb/modules/transitions/init.lua b/birb/modules/transitions/init.lua deleted file mode 100644 index 0a28aef..0000000 --- a/birb/modules/transitions/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - default = require "birb.modules.transitions.default", - circle = require "birb.modules.transitions.circle" -} \ No newline at end of file diff --git a/examples/birb b/examples/birb deleted file mode 120000 index 0629dda..0000000 --- a/examples/birb +++ /dev/null @@ -1 +0,0 @@ -../birb/ \ No newline at end of file diff --git a/examples/framework b/examples/framework new file mode 120000 index 0000000..0906d5b --- /dev/null +++ b/examples/framework @@ -0,0 +1 @@ +../framework/ \ No newline at end of file diff --git a/examples/game/init.lua b/examples/game/init.lua index aba2b14..1866c70 100644 --- a/examples/game/init.lua +++ b/examples/game/init.lua @@ -1,4 +1,4 @@ -local GameSystem = require "birb.gamesystem" +local GameSystem = require "framework.gamesystem" local Game = GameSystem:extend() function Game:new() diff --git a/examples/main.lua b/examples/main.lua index 18de69f..5c3f3ef 100644 --- a/examples/main.lua +++ b/examples/main.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -require "birb" +require "framework" scenes = require "scenes" diff --git a/examples/scenes/basic/test_menus/init.lua b/examples/scenes/basic/test_menus/init.lua index d317ef1..39dc6e8 100644 --- a/examples/scenes/basic/test_menus/init.lua +++ b/examples/scenes/basic/test_menus/init.lua @@ -21,13 +21,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local TestScene = Scene:extend() -local MenuType = require "birb.modules.gui.menus.listbox" -local MenuType2 = require "birb.modules.gui.menus.flowbox" -local MenuType3 = require "birb.modules.gui.menus.grid" -local Widget = require "birb.modules.gui.menus.widgets" +local MenuType = require "framework.modules.gui.menus.listbox" +local MenuType2 = require "framework.modules.gui.menus.flowbox" +local MenuType3 = require "framework.modules.gui.menus.grid" +local Widget = require "framework.modules.gui.menus.widgets" local MenuWidget = Widget.Text:extend() diff --git a/examples/scenes/basic/test_scene/init.lua b/examples/scenes/basic/test_scene/init.lua index af4a622..95460dc 100644 --- a/examples/scenes/basic/test_scene/init.lua +++ b/examples/scenes/basic/test_scene/init.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local TestScene = Scene:extend() function TestScene:new() diff --git a/examples/scenes/basic/test_scene2/actors/parent.lua b/examples/scenes/basic/test_scene2/actors/parent.lua index 60ba267..0c26297 100644 --- a/examples/scenes/basic/test_scene2/actors/parent.lua +++ b/examples/scenes/basic/test_scene2/actors/parent.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor2D" +local Base = require "framework.modules.world.actors.actor2D" local Parent = Base:extend() function Parent:new(world, type, x, y, w, h) diff --git a/examples/scenes/basic/test_scene2/init.lua b/examples/scenes/basic/test_scene2/init.lua index edd02df..9f22f51 100644 --- a/examples/scenes/basic/test_scene2/init.lua +++ b/examples/scenes/basic/test_scene2/init.lua @@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local TestScene = Scene:extend() local folder = "scenes/basic/test_scene2/" -local World = require "birb.modules.world.baseworld" +local World = require "framework.modules.world.baseworld" function TestScene:new() TestScene.super.new(self) diff --git a/examples/scenes/gameplay/action3D/actors/box.lua b/examples/scenes/gameplay/action3D/actors/box.lua index ed93259..73b4a9a 100644 --- a/examples/scenes/gameplay/action3D/actors/box.lua +++ b/examples/scenes/gameplay/action3D/actors/box.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor3D" +local Base = require "framework.modules.world.actors.actor3D" local Box = Base:extend() function Box:new(world, x, y, z) diff --git a/examples/scenes/gameplay/action3D/actors/coin.lua b/examples/scenes/gameplay/action3D/actors/coin.lua index cc324f1..d8807a7 100644 --- a/examples/scenes/gameplay/action3D/actors/coin.lua +++ b/examples/scenes/gameplay/action3D/actors/coin.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor3D" +local Base = require "framework.modules.world.actors.actor3D" local Coin = Base:extend() function Coin:new(world, x, y, z) diff --git a/examples/scenes/gameplay/action3D/actors/init.lua b/examples/scenes/gameplay/action3D/actors/init.lua index 69122db..94943db 100644 --- a/examples/scenes/gameplay/action3D/actors/init.lua +++ b/examples/scenes/gameplay/action3D/actors/init.lua @@ -5,7 +5,7 @@ local cwd = (...):gsub('%.init$', '') .. "." Obj.Player = require(cwd .. "player") Obj.Box = require(cwd .. "box") Obj.Coin = require(cwd .. "coin") -Obj.GFX = require("birb.modules.world.actors.gfx3D") +Obj.GFX = require("framework.modules.world.actors.gfx3D") Obj.index = {} Obj.index["player"] = Obj.Player diff --git a/examples/scenes/gameplay/action3D/actors/parent.lua b/examples/scenes/gameplay/action3D/actors/parent.lua index fd67fd8..48ccebf 100644 --- a/examples/scenes/gameplay/action3D/actors/parent.lua +++ b/examples/scenes/gameplay/action3D/actors/parent.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor3D" +local Base = require "framework.modules.world.actors.actor3D" local Parent = Base:extend() function Parent:new(world, type, x, y, z, w, h, d, isSolid) diff --git a/examples/scenes/gameplay/action3D/actors/wall.lua b/examples/scenes/gameplay/action3D/actors/wall.lua index 667bdda..07448f5 100644 --- a/examples/scenes/gameplay/action3D/actors/wall.lua +++ b/examples/scenes/gameplay/action3D/actors/wall.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor3D" +local Base = require "framework.modules.world.actors.actor3D" local Wall = Base:extend() function Wall:new(world, x, y, z, w, h, d) diff --git a/examples/scenes/gameplay/action3D/init.lua b/examples/scenes/gameplay/action3D/init.lua index 6e91136..1bed8c9 100644 --- a/examples/scenes/gameplay/action3D/init.lua +++ b/examples/scenes/gameplay/action3D/init.lua @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local MovePlayer = Scene:extend() -local World = require "birb.modules.world.world3D" +local World = require "framework.modules.world.world3D" function MovePlayer:new(playerNumber, cameraMode) local playerNumber = playerNumber or 1 diff --git a/examples/scenes/gameplay/moveplayer/actors/parent.lua b/examples/scenes/gameplay/moveplayer/actors/parent.lua index 39c049b..1ab7b24 100644 --- a/examples/scenes/gameplay/moveplayer/actors/parent.lua +++ b/examples/scenes/gameplay/moveplayer/actors/parent.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor2D" +local Base = require "framework.modules.world.actors.actor2D" local Parent = Base:extend() function Parent:new(world, type, x, y, w, h, isSolid) diff --git a/examples/scenes/gameplay/moveplayer/actors/wall.lua b/examples/scenes/gameplay/moveplayer/actors/wall.lua index 40b737d..8b0202f 100644 --- a/examples/scenes/gameplay/moveplayer/actors/wall.lua +++ b/examples/scenes/gameplay/moveplayer/actors/wall.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor2D" +local Base = require "framework.modules.world.actors.actor2D" local Wall = Base:extend() function Wall:new(world, x, y, w, h) diff --git a/examples/scenes/gameplay/moveplayer/init.lua b/examples/scenes/gameplay/moveplayer/init.lua index 7d2fde5..cc08fb7 100644 --- a/examples/scenes/gameplay/moveplayer/init.lua +++ b/examples/scenes/gameplay/moveplayer/init.lua @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local MovePlayer = Scene:extend() -local World = require "birb.modules.world.world2D" +local World = require "framework.modules.world.world2D" function MovePlayer:new(playerNumber, cameraMode) local playerNumber = playerNumber or 1 diff --git a/examples/scenes/gameplay/moveplayer3D/actors/parent.lua b/examples/scenes/gameplay/moveplayer3D/actors/parent.lua index f0cc900..a49826d 100644 --- a/examples/scenes/gameplay/moveplayer3D/actors/parent.lua +++ b/examples/scenes/gameplay/moveplayer3D/actors/parent.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor3D" +local Base = require "framework.modules.world.actors.actor3D" local Parent = Base:extend() function Parent:new(world, type, x, y, z, w, h, d, isSolid) diff --git a/examples/scenes/gameplay/moveplayer3D/actors/wall.lua b/examples/scenes/gameplay/moveplayer3D/actors/wall.lua index b303d62..e599af3 100644 --- a/examples/scenes/gameplay/moveplayer3D/actors/wall.lua +++ b/examples/scenes/gameplay/moveplayer3D/actors/wall.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor3D" +local Base = require "framework.modules.world.actors.actor3D" local Wall = Base:extend() function Wall:new(world, x, y, z, w, h, d) diff --git a/examples/scenes/gameplay/moveplayer3D/init.lua b/examples/scenes/gameplay/moveplayer3D/init.lua index 4f33cd4..52443e4 100644 --- a/examples/scenes/gameplay/moveplayer3D/init.lua +++ b/examples/scenes/gameplay/moveplayer3D/init.lua @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local MovePlayer = Scene:extend() -local World = require "birb.modules.world.world3D" +local World = require "framework.modules.world.world3D" function MovePlayer:new(playerNumber, cameraMode) local playerNumber = playerNumber or 1 diff --git a/examples/scenes/gameplay/plateform/actors/coin.lua b/examples/scenes/gameplay/plateform/actors/coin.lua index 17b6219..c3fb0b1 100644 --- a/examples/scenes/gameplay/plateform/actors/coin.lua +++ b/examples/scenes/gameplay/plateform/actors/coin.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor2D" +local Base = require "framework.modules.world.actors.actor2D" local Coin = Base:extend() function Coin:new(world, x, y) diff --git a/examples/scenes/gameplay/plateform/actors/init.lua b/examples/scenes/gameplay/plateform/actors/init.lua index 0fa7209..50e75e4 100644 --- a/examples/scenes/gameplay/plateform/actors/init.lua +++ b/examples/scenes/gameplay/plateform/actors/init.lua @@ -4,7 +4,7 @@ local Obj = {} local cwd = (...):gsub('%.init$', '') .. "." Obj.Player = require(cwd .. "player") -Obj.GFX = require("birb.modules.world.actors.gfx2D") +Obj.GFX = require("framework.modules.world.actors.gfx2D") Obj.index = {} Obj.index["player"] = require(cwd .. "player") diff --git a/examples/scenes/gameplay/plateform/actors/player.lua b/examples/scenes/gameplay/plateform/actors/player.lua index 44a5422..46ae764 100644 --- a/examples/scenes/gameplay/plateform/actors/player.lua +++ b/examples/scenes/gameplay/plateform/actors/player.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor2D" +local Base = require "framework.modules.world.actors.actor2D" local Player = Base:extend() function Player:new(world, x, y, id) diff --git a/examples/scenes/gameplay/plateform/actors/wall.lua b/examples/scenes/gameplay/plateform/actors/wall.lua index d5513e2..d5bcbf7 100644 --- a/examples/scenes/gameplay/plateform/actors/wall.lua +++ b/examples/scenes/gameplay/plateform/actors/wall.lua @@ -1,4 +1,4 @@ -local Base = require "birb.modules.world.actors.actor2D" +local Base = require "framework.modules.world.actors.actor2D" local Wall = Base:extend() function Wall:new(world, x, y, w, h) diff --git a/examples/scenes/gameplay/plateform/init.lua b/examples/scenes/gameplay/plateform/init.lua index e62d01a..cc12ee0 100644 --- a/examples/scenes/gameplay/plateform/init.lua +++ b/examples/scenes/gameplay/plateform/init.lua @@ -21,10 +21,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local Plateformer = Scene:extend() -local World = require "birb.modules.world.world2D" +local World = require "framework.modules.world.world2D" local Pause = require "scenes.gameplay.plateform.pause" function Plateformer:new() diff --git a/examples/scenes/gameplay/plateform/pause.lua b/examples/scenes/gameplay/plateform/pause.lua index 4b93cbd..2c9f683 100644 --- a/examples/scenes/gameplay/plateform/pause.lua +++ b/examples/scenes/gameplay/plateform/pause.lua @@ -1,5 +1,5 @@ -local ListMenu = require "birb.modules.gui.menus.listbox" -local Widget = require "birb.modules.gui.menus.widgets" +local ListMenu = require "framework.modules.gui.menus.listbox" +local Widget = require "framework.modules.gui.menus.widgets" local PauseMenu = ListMenu:extend() diff --git a/examples/scenes/mainmenu/init.lua b/examples/scenes/mainmenu/init.lua index 3930438..ce76b9b 100644 --- a/examples/scenes/mainmenu/init.lua +++ b/examples/scenes/mainmenu/init.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local MainMenu = Scene:extend() local Menu = require "scenes.mainmenu.menu" diff --git a/examples/scenes/mainmenu/menu.lua b/examples/scenes/mainmenu/menu.lua index 5ecd2ba..3033d7e 100644 --- a/examples/scenes/mainmenu/menu.lua +++ b/examples/scenes/mainmenu/menu.lua @@ -1,7 +1,7 @@ -local Parent = require "birb.modules.gui.textmenu" +local Parent = require "framework.modules.gui.textmenu" local MainMenu = Parent:extend() -local defTransitions = require "birb.modules.transitions" +local defTransitions = require "framework.modules.transitions" local MENU_X, MENU_Y = 24, 48 local MENU_W = 424/3 diff --git a/examples/scenes/menus/inventory/init.lua b/examples/scenes/menus/inventory/init.lua index 6bdf0b6..f829520 100644 --- a/examples/scenes/menus/inventory/init.lua +++ b/examples/scenes/menus/inventory/init.lua @@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local Inventory = Scene:extend() -local HListBox = require "birb.modules.gui.menus.hlistbox" -local FloxBox = require "birb.modules.gui.menus.flowbox" -local Widget = require "birb.modules.gui.menus.widgets" +local HListBox = require "framework.modules.gui.menus.hlistbox" +local FloxBox = require "framework.modules.gui.menus.flowbox" +local Widget = require "framework.modules.gui.menus.widgets" local InventoryWidget = Widget.Text:extend() local ItemWidget = Widget.Text:extend() diff --git a/examples/scenes/menus/options/init.lua b/examples/scenes/menus/options/init.lua index a1cef42..d879f3b 100644 --- a/examples/scenes/menus/options/init.lua +++ b/examples/scenes/menus/options/init.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Scene = require "birb.modules.scenes" +local Scene = require "framework.modules.scenes" local OptionsMenu = Scene:extend() local Widgets = require "scenes.menus.options.widgets" diff --git a/examples/scenes/menus/options/menu.lua b/examples/scenes/menus/options/menu.lua index 0a56960..4614bc5 100644 --- a/examples/scenes/menus/options/menu.lua +++ b/examples/scenes/menus/options/menu.lua @@ -1,4 +1,4 @@ -local TextMenu = require "birb.modules.gui.textmenu" +local TextMenu = require "framework.modules.gui.textmenu" local OptionMenu = TextMenu:extend() local consts = require "scenes.menus.options.consts" diff --git a/examples/scenes/menus/options/widgets.lua b/examples/scenes/menus/options/widgets.lua index 1711237..284e9d8 100644 --- a/examples/scenes/menus/options/widgets.lua +++ b/examples/scenes/menus/options/widgets.lua @@ -23,7 +23,7 @@ local widgets = {} -local Widget = require "birb.modules.gui.textmenu.widgets.basic" +local Widget = require "framework.modules.gui.textmenu.widgets.basic" local DoubleTextWidget = Widget:extend() widgets.SubMenu = DoubleTextWidget:extend() diff --git a/birb/callbacks.lua b/framework/callbacks.lua similarity index 100% rename from birb/callbacks.lua rename to framework/callbacks.lua diff --git a/birb/classes/2D/indexedrect.lua b/framework/classes/2D/indexedrect.lua similarity index 96% rename from birb/classes/2D/indexedrect.lua rename to framework/classes/2D/indexedrect.lua index 7511046..5d51935 100644 --- a/birb/classes/2D/indexedrect.lua +++ b/framework/classes/2D/indexedrect.lua @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Rect = require "birb.classes.2D.rect" +local Rect = require "framework.classes.2D.rect" local IndexedRect = Rect:extend() function IndexedRect:new(origin, ox, oy, w, h) diff --git a/birb/classes/2D/point.lua b/framework/classes/2D/point.lua similarity index 100% rename from birb/classes/2D/point.lua rename to framework/classes/2D/point.lua diff --git a/birb/classes/2D/rect.lua b/framework/classes/2D/rect.lua similarity index 97% rename from birb/classes/2D/rect.lua rename to framework/classes/2D/rect.lua index 75e46f0..5871261 100644 --- a/birb/classes/2D/rect.lua +++ b/framework/classes/2D/rect.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Point = require "birb.classes.2D.point" +local Point = require "framework.classes.2D.point" local Rect = Point:extend() function Rect:new(x, y, w, h) diff --git a/birb/classes/3D/box.lua b/framework/classes/3D/box.lua similarity index 97% rename from birb/classes/3D/box.lua rename to framework/classes/3D/box.lua index 904a1fe..c9a4528 100644 --- a/birb/classes/3D/box.lua +++ b/framework/classes/3D/box.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Point = require "birb.classes.3D.point3D" +local Point = require "framework.classes.3D.point3D" local Box = Point:extend() function Box:new(x, y, z, w, h, d) diff --git a/birb/classes/3D/indexedbox.lua b/framework/classes/3D/indexedbox.lua similarity index 97% rename from birb/classes/3D/indexedbox.lua rename to framework/classes/3D/indexedbox.lua index e8b2857..74359dd 100644 --- a/birb/classes/3D/indexedbox.lua +++ b/framework/classes/3D/indexedbox.lua @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Rect = require "birb.classes.2D.rect" +local Rect = require "framework.classes.2D.rect" local IndexedRect = Rect:extend() function IndexedRect:new(origin, ox, oy, oz, w, h, d) diff --git a/birb/classes/3D/point3D.lua b/framework/classes/3D/point3D.lua similarity index 100% rename from birb/classes/3D/point3D.lua rename to framework/classes/3D/point3D.lua diff --git a/birb/classes/datapack.lua b/framework/classes/datapack.lua similarity index 100% rename from birb/classes/datapack.lua rename to framework/classes/datapack.lua diff --git a/birb/classes/parser.lua b/framework/classes/parser.lua similarity index 100% rename from birb/classes/parser.lua rename to framework/classes/parser.lua diff --git a/birb/classes/predicate/init.lua b/framework/classes/predicate/init.lua similarity index 97% rename from birb/classes/predicate/init.lua rename to framework/classes/predicate/init.lua index 26abbbb..2675ad8 100644 --- a/birb/classes/predicate/init.lua +++ b/framework/classes/predicate/init.lua @@ -28,7 +28,7 @@ ]] local Predicate = Object:extend() -local SimplePredicate = require "birb.classes.predicate.simple" +local SimplePredicate = require "framework.classes.predicate.simple" function Predicate.createPredicate(data, solver, asker) local predicate = nil diff --git a/birb/classes/predicate/simple.lua b/framework/classes/predicate/simple.lua similarity index 96% rename from birb/classes/predicate/simple.lua rename to framework/classes/predicate/simple.lua index f342721..c23648c 100644 --- a/birb/classes/predicate/simple.lua +++ b/framework/classes/predicate/simple.lua @@ -34,7 +34,7 @@ local SEPARATOR = ":" local NOT = "not" local DEFAULT = "default" -SimplePredicate.utils = require "birb.classes.predicate.utils" +SimplePredicate.utils = require "framework.classes.predicate.utils" function SimplePredicate:new(data, solver, asker) self.solver = solver diff --git a/birb/classes/predicate/utils.lua b/framework/classes/predicate/utils.lua similarity index 100% rename from birb/classes/predicate/utils.lua rename to framework/classes/predicate/utils.lua diff --git a/birb/classes/serializable/init.lua b/framework/classes/serializable/init.lua similarity index 100% rename from birb/classes/serializable/init.lua rename to framework/classes/serializable/init.lua diff --git a/birb/classes/serializable/serializer.lua b/framework/classes/serializable/serializer.lua similarity index 95% rename from birb/classes/serializable/serializer.lua rename to framework/classes/serializable/serializer.lua index 24636b3..fc09bfa 100644 --- a/birb/classes/serializable/serializer.lua +++ b/framework/classes/serializable/serializer.lua @@ -20,9 +20,9 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Serializable = require "birb.classes.serializable" +local Serializable = require "framework.classes.serializable" local Serializer = Serializable:extend() -local binser = require("birb.libs.binser") +local binser = require("framework.libs.binser") function Serializer:new(serializeFields, listSerializable) Serializer.super.new(self, serializeFields, listSerializable) diff --git a/birb/classes/time/func.lua b/framework/classes/time/func.lua similarity index 77% rename from birb/classes/time/func.lua rename to framework/classes/time/func.lua index 3684bf4..7c50e98 100644 --- a/birb/classes/time/func.lua +++ b/framework/classes/time/func.lua @@ -1,4 +1,4 @@ -local Timer = require "birb.classes.time.timer" +local Timer = require "framework.classes.time.timer" local TimedFunction = Timer:extend() function TimedFunction:new(actor, name, func, t) diff --git a/birb/classes/time/init.lua b/framework/classes/time/init.lua similarity index 95% rename from birb/classes/time/init.lua rename to framework/classes/time/init.lua index c980378..460cdae 100644 --- a/birb/classes/time/init.lua +++ b/framework/classes/time/init.lua @@ -1,6 +1,6 @@ -- time.lua :: a timer, tweener and timed switch handler. --- This class need birb.libs.tween to work +-- This class need framework.libs.tween to work --[[ Copyright © 2019 Kazhnuz @@ -25,9 +25,9 @@ local TweenManager = Object:extend() -local tween = require "birb.libs.tween" -local Timer = require "birb.classes.time.timer" -local TimedFunction = require "birb.classes.time.func" +local tween = require "framework.libs.tween" +local Timer = require "framework.classes.time.timer" +local TimedFunction = require "framework.classes.time.func" function TweenManager:new(subject) self.subject = subject diff --git a/birb/classes/time/timer.lua b/framework/classes/time/timer.lua similarity index 100% rename from birb/classes/time/timer.lua rename to framework/classes/time/timer.lua diff --git a/birb/core/datas.lua b/framework/core/datas.lua similarity index 95% rename from birb/core/datas.lua rename to framework/core/datas.lua index 324e748..44f1d4a 100644 --- a/birb/core/datas.lua +++ b/framework/core/datas.lua @@ -24,8 +24,8 @@ ]] local DataManager = Object:extend() -local DataPack = require "birb.classes.datapack" -local Parser = require "birb.classes.parser" +local DataPack = require "framework.classes.datapack" +local Parser = require "framework.classes.parser" local index = require "datas.gamedata.index" function DataManager:new(core) diff --git a/birb/core/debug.lua b/framework/core/debug.lua similarity index 98% rename from birb/core/debug.lua rename to framework/core/debug.lua index 6e2531f..1f4d260 100644 --- a/birb/core/debug.lua +++ b/framework/core/debug.lua @@ -38,7 +38,7 @@ function DebugSystem:new(controller, debugLevel) self.debugLevel = debugLevel or Levels.WARNING self.active = (self.debugLevel == Levels.DEBUG) if (self.active) then - lovebird = require "birb.libs.lovebird" + lovebird = require "framework.libs.lovebird" lovebird.update() end end diff --git a/birb/core/init.lua b/framework/core/init.lua similarity index 100% rename from birb/core/init.lua rename to framework/core/init.lua diff --git a/birb/core/input.lua b/framework/core/input.lua similarity index 100% rename from birb/core/input.lua rename to framework/core/input.lua diff --git a/birb/core/lang.lua b/framework/core/lang.lua similarity index 100% rename from birb/core/lang.lua rename to framework/core/lang.lua diff --git a/birb/core/music.lua b/framework/core/music.lua similarity index 100% rename from birb/core/music.lua rename to framework/core/music.lua diff --git a/birb/core/options.lua b/framework/core/options.lua similarity index 98% rename from birb/core/options.lua rename to framework/core/options.lua index 5f6baf2..f5c48a0 100644 --- a/birb/core/options.lua +++ b/framework/core/options.lua @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Serializer = require "birb.classes.serializable.serializer" +local Serializer = require "framework.classes.serializable.serializer" local OptionsManager = Serializer:extend() local TRANSLATION_PATH = "datas/languages/" diff --git a/birb/core/scenemanager.lua b/framework/core/scenemanager.lua similarity index 100% rename from birb/core/scenemanager.lua rename to framework/core/scenemanager.lua diff --git a/birb/core/screen.lua b/framework/core/screen.lua similarity index 98% rename from birb/core/screen.lua rename to framework/core/screen.lua index 16651b9..76fca71 100644 --- a/birb/core/screen.lua +++ b/framework/core/screen.lua @@ -24,7 +24,7 @@ local ScreenManager = Object:extend() -local CScreen = require("birb.libs.cscreen") +local CScreen = require("framework.libs.cscreen") -- INIT FUNCTIONS -- Initialize and configure the screen manager diff --git a/birb/gamesystem/init.lua b/framework/gamesystem/init.lua similarity index 96% rename from birb/gamesystem/init.lua rename to framework/gamesystem/init.lua index aebf3dc..dfae995 100644 --- a/birb/gamesystem/init.lua +++ b/framework/gamesystem/init.lua @@ -21,7 +21,7 @@ ]] -local Serializer = require "birb.classes.serializable.serializer" +local Serializer = require "framework.classes.serializable.serializer" local GameSystem = Serializer:extend() local VAR_TO_SERIALIZE = { diff --git a/birb/init.lua b/framework/init.lua similarity index 89% rename from birb/init.lua rename to framework/init.lua index 200f211..d92ed23 100644 --- a/birb/init.lua +++ b/framework/init.lua @@ -28,11 +28,11 @@ framework = {} -- Load in the global namespace utilities that'll need to be reusable everywhere -- in the game -Object = require("birb.libs.classic") -utils = require("birb.utils") -enum = require("birb.utils.enum") +Object = require("framework.libs.classic") +utils = require("framework.utils") +enum = require("framework.utils.enum") -framework.Core = require("birb.core") +framework.Core = require("framework.core") function framework.start(gamemodule, args) framework.startCore(args) @@ -50,4 +50,4 @@ function framework.startGame(gamemodule) game = GameObject() end -require("birb.callbacks") \ No newline at end of file +require("framework.callbacks") \ No newline at end of file diff --git a/birb/libs/binser.lua b/framework/libs/binser.lua similarity index 100% rename from birb/libs/binser.lua rename to framework/libs/binser.lua diff --git a/birb/libs/classic.lua b/framework/libs/classic.lua similarity index 100% rename from birb/libs/classic.lua rename to framework/libs/classic.lua diff --git a/birb/libs/cscreen.lua b/framework/libs/cscreen.lua similarity index 100% rename from birb/libs/cscreen.lua rename to framework/libs/cscreen.lua diff --git a/birb/libs/lovebird.lua b/framework/libs/lovebird.lua similarity index 100% rename from birb/libs/lovebird.lua rename to framework/libs/lovebird.lua diff --git a/birb/libs/talkies.lua b/framework/libs/talkies.lua similarity index 100% rename from birb/libs/talkies.lua rename to framework/libs/talkies.lua diff --git a/birb/libs/tween.lua b/framework/libs/tween.lua similarity index 100% rename from birb/libs/tween.lua rename to framework/libs/tween.lua diff --git a/birb/modules/assets/init.lua b/framework/modules/assets/init.lua similarity index 100% rename from birb/modules/assets/init.lua rename to framework/modules/assets/init.lua diff --git a/birb/modules/assets/types/animator.lua b/framework/modules/assets/types/animator.lua similarity index 100% rename from birb/modules/assets/types/animator.lua rename to framework/modules/assets/types/animator.lua diff --git a/birb/modules/assets/types/autotile.lua b/framework/modules/assets/types/autotile.lua similarity index 100% rename from birb/modules/assets/types/autotile.lua rename to framework/modules/assets/types/autotile.lua diff --git a/birb/modules/assets/types/background.lua b/framework/modules/assets/types/background.lua similarity index 100% rename from birb/modules/assets/types/background.lua rename to framework/modules/assets/types/background.lua diff --git a/birb/modules/assets/types/fonts.lua b/framework/modules/assets/types/fonts.lua similarity index 100% rename from birb/modules/assets/types/fonts.lua rename to framework/modules/assets/types/fonts.lua diff --git a/birb/modules/assets/types/imagefonts.lua b/framework/modules/assets/types/imagefonts.lua similarity index 100% rename from birb/modules/assets/types/imagefonts.lua rename to framework/modules/assets/types/imagefonts.lua diff --git a/birb/modules/assets/types/sfx.lua b/framework/modules/assets/types/sfx.lua similarity index 100% rename from birb/modules/assets/types/sfx.lua rename to framework/modules/assets/types/sfx.lua diff --git a/birb/modules/assets/types/sprites.lua b/framework/modules/assets/types/sprites.lua similarity index 100% rename from birb/modules/assets/types/sprites.lua rename to framework/modules/assets/types/sprites.lua diff --git a/birb/modules/assets/types/texture.lua b/framework/modules/assets/types/texture.lua similarity index 100% rename from birb/modules/assets/types/texture.lua rename to framework/modules/assets/types/texture.lua diff --git a/birb/modules/assets/types/tileset.lua b/framework/modules/assets/types/tileset.lua similarity index 100% rename from birb/modules/assets/types/tileset.lua rename to framework/modules/assets/types/tileset.lua diff --git a/birb/modules/gui/elements/assets.lua b/framework/modules/gui/elements/assets.lua similarity index 84% rename from birb/modules/gui/elements/assets.lua rename to framework/modules/gui/elements/assets.lua index b12ca50..f5b6cae 100644 --- a/birb/modules/gui/elements/assets.lua +++ b/framework/modules/gui/elements/assets.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.drawable" +local Parent = require "framework.modules.gui.elements.drawable" local AssetElement = Parent:extend() function AssetElement:new(name, assetType, assetName, x, y,r,sx,sy,ox,oy, opacity) diff --git a/birb/modules/gui/elements/canvas.lua b/framework/modules/gui/elements/canvas.lua similarity index 96% rename from birb/modules/gui/elements/canvas.lua rename to framework/modules/gui/elements/canvas.lua index 7fb1e23..ff43e3a 100644 --- a/birb/modules/gui/elements/canvas.lua +++ b/framework/modules/gui/elements/canvas.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.parent" +local Parent = require "framework.modules.gui.elements.parent" local CanvasElement = Parent:extend() function CanvasElement:new(name, x, y, w, h, r,sx,sy,ox,oy, opacity) diff --git a/birb/modules/gui/elements/color.lua b/framework/modules/gui/elements/color.lua similarity index 85% rename from birb/modules/gui/elements/color.lua rename to framework/modules/gui/elements/color.lua index f1aa94f..8645e99 100644 --- a/birb/modules/gui/elements/color.lua +++ b/framework/modules/gui/elements/color.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.parent" +local Parent = require "framework.modules.gui.elements.parent" local ColorElement = Parent:extend() function ColorElement:new(name, r, g, b, opacity) diff --git a/birb/modules/gui/elements/composite.lua b/framework/modules/gui/elements/composite.lua similarity index 91% rename from birb/modules/gui/elements/composite.lua rename to framework/modules/gui/elements/composite.lua index d4d9aff..c17f3d9 100644 --- a/birb/modules/gui/elements/composite.lua +++ b/framework/modules/gui/elements/composite.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.parent" +local Parent = require "framework.modules.gui.elements.parent" local CompositeElement = Parent:extend() function CompositeElement:new(name, x, y, childrenList) diff --git a/birb/modules/gui/elements/counter.lua b/framework/modules/gui/elements/counter.lua similarity index 80% rename from birb/modules/gui/elements/counter.lua rename to framework/modules/gui/elements/counter.lua index 2730996..76e17f6 100644 --- a/birb/modules/gui/elements/counter.lua +++ b/framework/modules/gui/elements/counter.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.variable" +local Parent = require "framework.modules.gui.elements.variable" local CounterElement = Parent:extend() function CounterElement:new(name, fontName, object, varName, nbrs, x, y, align) diff --git a/birb/modules/gui/elements/drawable.lua b/framework/modules/gui/elements/drawable.lua similarity index 90% rename from birb/modules/gui/elements/drawable.lua rename to framework/modules/gui/elements/drawable.lua index e2ac258..d0adbad 100644 --- a/birb/modules/gui/elements/drawable.lua +++ b/framework/modules/gui/elements/drawable.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.parent" +local Parent = require "framework.modules.gui.elements.parent" local DrawableElement = Parent:extend() function DrawableElement:new(name, drawable, x, y,r,sx,sy,ox,oy, opacity) diff --git a/birb/modules/gui/elements/parent.lua b/framework/modules/gui/elements/parent.lua similarity index 96% rename from birb/modules/gui/elements/parent.lua rename to framework/modules/gui/elements/parent.lua index aa73138..6e508db 100644 --- a/birb/modules/gui/elements/parent.lua +++ b/framework/modules/gui/elements/parent.lua @@ -1,7 +1,7 @@ -local Rect = require "birb.classes.2D.rect" +local Rect = require "framework.classes.2D.rect" local GuiElement = Rect:extend() -local TweenManager = require "birb.classes.time" +local TweenManager = require "framework.classes.time" function GuiElement:new(name, x, y, w, h) GuiElement.super.new(self, x, y, w, h) diff --git a/birb/modules/gui/elements/text.lua b/framework/modules/gui/elements/text.lua similarity index 86% rename from birb/modules/gui/elements/text.lua rename to framework/modules/gui/elements/text.lua index 0db3ec0..7bef983 100644 --- a/birb/modules/gui/elements/text.lua +++ b/framework/modules/gui/elements/text.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.parent" +local Parent = require "framework.modules.gui.elements.parent" local TextElement = Parent:extend() function TextElement:new(name, fontName, text, x, y, align) diff --git a/birb/modules/gui/elements/tile.lua b/framework/modules/gui/elements/tile.lua similarity index 87% rename from birb/modules/gui/elements/tile.lua rename to framework/modules/gui/elements/tile.lua index 8ae9f46..49f05b1 100644 --- a/birb/modules/gui/elements/tile.lua +++ b/framework/modules/gui/elements/tile.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.drawable" +local Parent = require "framework.modules.gui.elements.drawable" local TileElement = Parent:extend() function TileElement:new(name, assetName, id, x, y,r,sx,sy,ox,oy, opacity) diff --git a/birb/modules/gui/elements/variable.lua b/framework/modules/gui/elements/variable.lua similarity index 79% rename from birb/modules/gui/elements/variable.lua rename to framework/modules/gui/elements/variable.lua index 32a95b4..a1dcea3 100644 --- a/birb/modules/gui/elements/variable.lua +++ b/framework/modules/gui/elements/variable.lua @@ -1,4 +1,4 @@ -local Parent = require "birb.modules.gui.elements.text" +local Parent = require "framework.modules.gui.elements.text" local VariableElement = Parent:extend() function VariableElement:new(name, fontName, object, varName, x, y, align) diff --git a/birb/modules/gui/init.lua b/framework/modules/gui/init.lua similarity index 96% rename from birb/modules/gui/init.lua rename to framework/modules/gui/init.lua index 2f2d7ce..00a4f44 100644 --- a/birb/modules/gui/init.lua +++ b/framework/modules/gui/init.lua @@ -23,12 +23,12 @@ local Gui = Object:extend() -local ElementList = require "birb.modules.gui.mixins.elements" -local ScreenList = require "birb.modules.gui.mixins.screens" +local ElementList = require "framework.modules.gui.mixins.elements" +local ScreenList = require "framework.modules.gui.mixins.screens" Gui:implement(ScreenList) Gui:implement(ElementList) -local TransformDataStruct = require "birb.structures.tween" +local TransformDataStruct = require "framework.structures.tween" function Gui:new(scene) self.scene = scene diff --git a/birb/modules/gui/menus/flowbox.lua b/framework/modules/gui/menus/flowbox.lua similarity index 100% rename from birb/modules/gui/menus/flowbox.lua rename to framework/modules/gui/menus/flowbox.lua diff --git a/birb/modules/gui/menus/grid.lua b/framework/modules/gui/menus/grid.lua similarity index 99% rename from birb/modules/gui/menus/grid.lua rename to framework/modules/gui/menus/grid.lua index afbd4c2..bf5f12f 100644 --- a/birb/modules/gui/menus/grid.lua +++ b/framework/modules/gui/menus/grid.lua @@ -26,7 +26,7 @@ local cwd = (...):gsub('%.grid$', '') .. "." local Menu = require(cwd .. "parent") local GridBox = Menu:extend() -local View2D = require "birb.modules.gui.menus.views.view2D" +local View2D = require "framework.modules.gui.menus.views.view2D" -- INIT FUNCTIONS -- Initialize and configure the menu diff --git a/birb/modules/gui/menus/hlistbox.lua b/framework/modules/gui/menus/hlistbox.lua similarity index 100% rename from birb/modules/gui/menus/hlistbox.lua rename to framework/modules/gui/menus/hlistbox.lua diff --git a/birb/modules/gui/menus/listbox.lua b/framework/modules/gui/menus/listbox.lua similarity index 100% rename from birb/modules/gui/menus/listbox.lua rename to framework/modules/gui/menus/listbox.lua diff --git a/birb/modules/gui/menus/model/init.lua b/framework/modules/gui/menus/model/init.lua similarity index 98% rename from birb/modules/gui/menus/model/init.lua rename to framework/modules/gui/menus/model/init.lua index 95ebeb1..39d0a29 100644 --- a/birb/modules/gui/menus/model/init.lua +++ b/framework/modules/gui/menus/model/init.lua @@ -1,5 +1,5 @@ local MenuModel = Object:extend() -local Page = require "birb.modules.gui.menus.model.page" +local Page = require "framework.modules.gui.menus.model.page" local function updateWidgetByOrder(a, b) if a.order ~= b.order then diff --git a/birb/modules/gui/menus/model/page.lua b/framework/modules/gui/menus/model/page.lua similarity index 100% rename from birb/modules/gui/menus/model/page.lua rename to framework/modules/gui/menus/model/page.lua diff --git a/birb/modules/gui/menus/parent.lua b/framework/modules/gui/menus/parent.lua similarity index 96% rename from birb/modules/gui/menus/parent.lua rename to framework/modules/gui/menus/parent.lua index 65ca974..74bf30b 100644 --- a/birb/modules/gui/menus/parent.lua +++ b/framework/modules/gui/menus/parent.lua @@ -21,12 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local GuiElement = require "birb.modules.gui.elements.canvas" +local GuiElement = require "framework.modules.gui.elements.canvas" local Menu = GuiElement:extend() -local MenuModel = require "birb.modules.gui.menus.model" +local MenuModel = require "framework.modules.gui.menus.model" -local menuUtils = require "birb.modules.gui.utils" +local menuUtils = require "framework.modules.gui.utils" -- INIT FUNCTIONS -- Initialize and configure functions. diff --git a/birb/modules/gui/menus/views/view1D.lua b/framework/modules/gui/menus/views/view1D.lua similarity index 100% rename from birb/modules/gui/menus/views/view1D.lua rename to framework/modules/gui/menus/views/view1D.lua diff --git a/birb/modules/gui/menus/views/view2D.lua b/framework/modules/gui/menus/views/view2D.lua similarity index 96% rename from birb/modules/gui/menus/views/view2D.lua rename to framework/modules/gui/menus/views/view2D.lua index feecf25..5043737 100644 --- a/birb/modules/gui/menus/views/view2D.lua +++ b/framework/modules/gui/menus/views/view2D.lua @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local View1D = require "birb.modules.gui.menus.views.view1D" +local View1D = require "framework.modules.gui.menus.views.view1D" local View2D = View1D:extend() function View2D:new(colNumber, lineNumber) diff --git a/birb/modules/gui/menus/widgets/base.lua b/framework/modules/gui/menus/widgets/base.lua similarity index 100% rename from birb/modules/gui/menus/widgets/base.lua rename to framework/modules/gui/menus/widgets/base.lua diff --git a/birb/modules/gui/menus/widgets/init.lua b/framework/modules/gui/menus/widgets/init.lua similarity index 90% rename from birb/modules/gui/menus/widgets/init.lua rename to framework/modules/gui/menus/widgets/init.lua index 0c8c4e8..b9d2b85 100644 --- a/birb/modules/gui/menus/widgets/init.lua +++ b/framework/modules/gui/menus/widgets/init.lua @@ -24,7 +24,7 @@ local Widget = {} -- Add the widget as subvariable to the returned table -Widget.Base = require "birb.modules.gui.menus.widgets.base" -Widget.Text = require "birb.modules.gui.menus.widgets.text" +Widget.Base = require "framework.modules.gui.menus.widgets.base" +Widget.Text = require "framework.modules.gui.menus.widgets.text" return Widget diff --git a/birb/modules/gui/menus/widgets/text.lua b/framework/modules/gui/menus/widgets/text.lua similarity index 98% rename from birb/modules/gui/menus/widgets/text.lua rename to framework/modules/gui/menus/widgets/text.lua index 7809d04..84d1e2f 100644 --- a/birb/modules/gui/menus/widgets/text.lua +++ b/framework/modules/gui/menus/widgets/text.lua @@ -20,7 +20,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local BaseWidget = require "birb.modules.gui.menus.widgets.base" +local BaseWidget = require "framework.modules.gui.menus.widgets.base" local TextWidget = BaseWidget:extend() -- TEXT WIDGET diff --git a/birb/modules/gui/mixins/elements.lua b/framework/modules/gui/mixins/elements.lua similarity index 100% rename from birb/modules/gui/mixins/elements.lua rename to framework/modules/gui/mixins/elements.lua diff --git a/birb/modules/gui/mixins/screens.lua b/framework/modules/gui/mixins/screens.lua similarity index 100% rename from birb/modules/gui/mixins/screens.lua rename to framework/modules/gui/mixins/screens.lua diff --git a/birb/modules/gui/screen/init.lua b/framework/modules/gui/screen/init.lua similarity index 93% rename from birb/modules/gui/screen/init.lua rename to framework/modules/gui/screen/init.lua index e95bd14..16eea34 100644 --- a/birb/modules/gui/screen/init.lua +++ b/framework/modules/gui/screen/init.lua @@ -1,11 +1,11 @@ local GuiScreen = Object:extend() -local ElementList = require "birb.modules.gui.mixins.elements" +local ElementList = require "framework.modules.gui.mixins.elements" GuiScreen:implement(ElementList) -local TweenManager = require "birb.classes.time" -local ScreenSet = require "birb.modules.gui.screen.screenset" +local TweenManager = require "framework.classes.time" +local ScreenSet = require "framework.modules.gui.screen.screenset" -local elementDataStruct = require "birb.structures.elementData" +local elementDataStruct = require "framework.structures.elementData" function GuiScreen:new(name) self:initWrapper() diff --git a/birb/modules/gui/screen/screenset.lua b/framework/modules/gui/screen/screenset.lua similarity index 100% rename from birb/modules/gui/screen/screenset.lua rename to framework/modules/gui/screen/screenset.lua diff --git a/birb/modules/gui/textmenu/init.lua b/framework/modules/gui/textmenu/init.lua similarity index 95% rename from birb/modules/gui/textmenu/init.lua rename to framework/modules/gui/textmenu/init.lua index b80898f..ca2e25f 100644 --- a/birb/modules/gui/textmenu/init.lua +++ b/framework/modules/gui/textmenu/init.lua @@ -24,10 +24,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local ListBox = require "birb.modules.gui.menus.listbox" +local ListBox = require "framework.modules.gui.menus.listbox" local TextMenu = ListBox:extend() -TextMenu.baseWidgets = require "birb.modules.gui.textmenu.widgets" +TextMenu.baseWidgets = require "framework.modules.gui.textmenu.widgets" local BASE_PADDING = 8 diff --git a/birb/modules/gui/textmenu/widgets/back.lua b/framework/modules/gui/textmenu/widgets/back.lua similarity index 93% rename from birb/modules/gui/textmenu/widgets/back.lua rename to framework/modules/gui/textmenu/widgets/back.lua index ad053dd..95a641a 100644 --- a/birb/modules/gui/textmenu/widgets/back.lua +++ b/framework/modules/gui/textmenu/widgets/back.lua @@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local TextMenuWidget = require "birb.modules.gui.textmenu.widgets.basic" +local TextMenuWidget = require "framework.modules.gui.textmenu.widgets.basic" local BackWidget = TextMenuWidget:extend() diff --git a/birb/modules/gui/textmenu/widgets/basic.lua b/framework/modules/gui/textmenu/widgets/basic.lua similarity index 95% rename from birb/modules/gui/textmenu/widgets/basic.lua rename to framework/modules/gui/textmenu/widgets/basic.lua index a69470e..6cc74b3 100644 --- a/birb/modules/gui/textmenu/widgets/basic.lua +++ b/framework/modules/gui/textmenu/widgets/basic.lua @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local TextWidget = require "birb.modules.gui.menus.widgets.text" +local TextWidget = require "framework.modules.gui.menus.widgets.text" local TextMenuWidget = TextWidget:extend() diff --git a/birb/modules/gui/textmenu/widgets/init.lua b/framework/modules/gui/textmenu/widgets/init.lua similarity index 85% rename from birb/modules/gui/textmenu/widgets/init.lua rename to framework/modules/gui/textmenu/widgets/init.lua index 5c5e761..69c0f48 100644 --- a/birb/modules/gui/textmenu/widgets/init.lua +++ b/framework/modules/gui/textmenu/widgets/init.lua @@ -24,8 +24,8 @@ local Widget = {} -- Add the widget as subvariable to the returned table -Widget.Base = require "birb.modules.gui.textmenu.widgets.basic" -Widget.SubMenu= require "birb.modules.gui.textmenu.widgets.submenu" -Widget.Back = require "birb.modules.gui.textmenu.widgets.back" +Widget.Base = require "framework.modules.gui.textmenu.widgets.basic" +Widget.SubMenu= require "framework.modules.gui.textmenu.widgets.submenu" +Widget.Back = require "framework.modules.gui.textmenu.widgets.back" return Widget diff --git a/birb/modules/gui/textmenu/widgets/submenu.lua b/framework/modules/gui/textmenu/widgets/submenu.lua similarity index 93% rename from birb/modules/gui/textmenu/widgets/submenu.lua rename to framework/modules/gui/textmenu/widgets/submenu.lua index a38d390..b3d8253 100644 --- a/birb/modules/gui/textmenu/widgets/submenu.lua +++ b/framework/modules/gui/textmenu/widgets/submenu.lua @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local TextMenuWidget = require "birb.modules.gui.textmenu.widgets.basic" +local TextMenuWidget = require "framework.modules.gui.textmenu.widgets.basic" local SubmenuWidget = TextMenuWidget:extend() diff --git a/birb/modules/gui/utils.lua b/framework/modules/gui/utils.lua similarity index 100% rename from birb/modules/gui/utils.lua rename to framework/modules/gui/utils.lua diff --git a/birb/modules/scenes.lua b/framework/modules/scenes.lua similarity index 100% rename from birb/modules/scenes.lua rename to framework/modules/scenes.lua diff --git a/birb/modules/transitions/canvas.lua b/framework/modules/transitions/canvas.lua similarity index 89% rename from birb/modules/transitions/canvas.lua rename to framework/modules/transitions/canvas.lua index 04df3bd..468d378 100644 --- a/birb/modules/transitions/canvas.lua +++ b/framework/modules/transitions/canvas.lua @@ -1,4 +1,4 @@ -local TransitionParent = require "birb.modules.transitions.parent" +local TransitionParent = require "framework.modules.transitions.parent" local CanvasTransition = TransitionParent:extend() function CanvasTransition:new(func, ox, oy, fadeOut, easeIn, easeOut, duration, wait) diff --git a/birb/modules/transitions/circle.lua b/framework/modules/transitions/circle.lua similarity index 83% rename from birb/modules/transitions/circle.lua rename to framework/modules/transitions/circle.lua index 360063d..7ea4422 100644 --- a/birb/modules/transitions/circle.lua +++ b/framework/modules/transitions/circle.lua @@ -1,4 +1,4 @@ -local TransitionParent = require "birb.modules.transitions.canvas" +local TransitionParent = require "framework.modules.transitions.canvas" local DefaultTransition = TransitionParent:extend() function DefaultTransition:new(func, ox, oy, fadeOut) diff --git a/birb/modules/transitions/decal.lua b/framework/modules/transitions/decal.lua similarity index 88% rename from birb/modules/transitions/decal.lua rename to framework/modules/transitions/decal.lua index 7be07b2..54e71e5 100644 --- a/birb/modules/transitions/decal.lua +++ b/framework/modules/transitions/decal.lua @@ -1,4 +1,4 @@ -local TransitionParent = require "birb.modules.transitions.canvas" +local TransitionParent = require "framework.modules.transitions.canvas" local DecalTransition = TransitionParent:extend() function DecalTransition:new(func, ox, oy, fadeOut, decal) diff --git a/birb/modules/transitions/default.lua b/framework/modules/transitions/default.lua similarity index 79% rename from birb/modules/transitions/default.lua rename to framework/modules/transitions/default.lua index 4727a34..a1d7800 100644 --- a/birb/modules/transitions/default.lua +++ b/framework/modules/transitions/default.lua @@ -1,4 +1,4 @@ -local TransitionParent = require "birb.modules.transitions.parent" +local TransitionParent = require "framework.modules.transitions.parent" local DefaultTransition = TransitionParent:extend() function DefaultTransition:new(func, ox, oy, fadeOut) diff --git a/framework/modules/transitions/init.lua b/framework/modules/transitions/init.lua new file mode 100644 index 0000000..8ba0eb4 --- /dev/null +++ b/framework/modules/transitions/init.lua @@ -0,0 +1,4 @@ +return { + default = require "framework.modules.transitions.default", + circle = require "framework.modules.transitions.circle" +} \ No newline at end of file diff --git a/birb/modules/transitions/parent.lua b/framework/modules/transitions/parent.lua similarity index 92% rename from birb/modules/transitions/parent.lua rename to framework/modules/transitions/parent.lua index 32dd61f..d654de3 100644 --- a/birb/modules/transitions/parent.lua +++ b/framework/modules/transitions/parent.lua @@ -1,5 +1,5 @@ local TransitionParent = Object:extend() -local TweenManager = require "birb.classes.time" +local TweenManager = require "framework.classes.time" function TransitionParent:new(func, ox, oy, fadeOut, easeIn, easeOut, duration, wait) self.tween = TweenManager(self) diff --git a/birb/modules/world/actors/actor2D.lua b/framework/modules/world/actors/actor2D.lua similarity index 89% rename from birb/modules/world/actors/actor2D.lua rename to framework/modules/world/actors/actor2D.lua index 90e4b0b..5ddcda7 100644 --- a/birb/modules/world/actors/actor2D.lua +++ b/framework/modules/world/actors/actor2D.lua @@ -21,13 +21,13 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Rect = require "birb.classes.2D.rect" +local Rect = require "framework.classes.2D.rect" -local BaseActor = require "birb.modules.world.actors.mixins.base" -local SpritedActor = require("birb.modules.world.actors.mixins.sprites") -local TimedActor = require("birb.modules.world.actors.mixins.timers") -local InputActor = require("birb.modules.world.actors.mixins.inputs") -local PhysicalActor = require("birb.modules.world.actors.mixins.physics") +local BaseActor = require "framework.modules.world.actors.mixins.base" +local SpritedActor = require("framework.modules.world.actors.mixins.sprites") +local TimedActor = require("framework.modules.world.actors.mixins.timers") +local InputActor = require("framework.modules.world.actors.mixins.inputs") +local PhysicalActor = require("framework.modules.world.actors.mixins.physics") local Actor2D = Rect:extend() Actor2D:implement(BaseActor) @@ -36,7 +36,7 @@ Actor2D:implement(TimedActor) Actor2D:implement(InputActor) Actor2D:implement(PhysicalActor) -local Hitbox = require "birb.modules.world.actors.utils.hitbox2D" +local Hitbox = require "framework.modules.world.actors.utils.hitbox2D" -- INIT FUNCTIONS -- Initialise the actor and its base functions diff --git a/birb/modules/world/actors/actor3D.lua b/framework/modules/world/actors/actor3D.lua similarity index 88% rename from birb/modules/world/actors/actor3D.lua rename to framework/modules/world/actors/actor3D.lua index e99964c..7b628ff 100644 --- a/birb/modules/world/actors/actor3D.lua +++ b/framework/modules/world/actors/actor3D.lua @@ -22,16 +22,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -local Hitbox = require("birb.modules.world.actors.utils.hitbox3D") -local Boxes = require("birb.modules.world.actors.utils.boxes") -local BasicBox = require "birb.classes.3D.box" +local Hitbox = require("framework.modules.world.actors.utils.hitbox3D") +local Boxes = require("framework.modules.world.actors.utils.boxes") +local BasicBox = require "framework.classes.3D.box" -local BaseActor = require("birb.modules.world.actors.mixins.base") -local SpritedActor = require("birb.modules.world.actors.mixins.sprites") -local TimedActor = require("birb.modules.world.actors.mixins.timers") -local InputActor = require("birb.modules.world.actors.mixins.inputs") -local PhysicalActor = require("birb.modules.world.actors.mixins.physics") -local Shape3DActor = require("birb.modules.world.actors.mixins.shapes") +local BaseActor = require("framework.modules.world.actors.mixins.base") +local SpritedActor = require("framework.modules.world.actors.mixins.sprites") +local TimedActor = require("framework.modules.world.actors.mixins.timers") +local InputActor = require("framework.modules.world.actors.mixins.inputs") +local PhysicalActor = require("framework.modules.world.actors.mixins.physics") +local Shape3DActor = require("framework.modules.world.actors.mixins.shapes") local Actor3D = BasicBox:extend() Actor3D:implement(BaseActor) diff --git a/birb/modules/world/actors/gfx2D.lua b/framework/modules/world/actors/gfx2D.lua similarity index 100% rename from birb/modules/world/actors/gfx2D.lua rename to framework/modules/world/actors/gfx2D.lua diff --git a/birb/modules/world/actors/gfx3D.lua b/framework/modules/world/actors/gfx3D.lua similarity index 100% rename from birb/modules/world/actors/gfx3D.lua rename to framework/modules/world/actors/gfx3D.lua diff --git a/birb/modules/world/actors/mixins/base.lua b/framework/modules/world/actors/mixins/base.lua similarity index 100% rename from birb/modules/world/actors/mixins/base.lua rename to framework/modules/world/actors/mixins/base.lua diff --git a/birb/modules/world/actors/mixins/inputs.lua b/framework/modules/world/actors/mixins/inputs.lua similarity index 100% rename from birb/modules/world/actors/mixins/inputs.lua rename to framework/modules/world/actors/mixins/inputs.lua diff --git a/birb/modules/world/actors/mixins/physics.lua b/framework/modules/world/actors/mixins/physics.lua similarity index 98% rename from birb/modules/world/actors/mixins/physics.lua rename to framework/modules/world/actors/mixins/physics.lua index 2b99ed5..ff4225b 100644 --- a/birb/modules/world/actors/mixins/physics.lua +++ b/framework/modules/world/actors/mixins/physics.lua @@ -1,5 +1,5 @@ PhysicalActor = Object:extend() -local hitboxStructure = require "birb.structures.hitbox" +local hitboxStructure = require "framework.structures.hitbox" -- PHYSICS FUNCTIONS -- Raw implementation of everything common in physics diff --git a/birb/modules/world/actors/mixins/shapes.lua b/framework/modules/world/actors/mixins/shapes.lua similarity index 100% rename from birb/modules/world/actors/mixins/shapes.lua rename to framework/modules/world/actors/mixins/shapes.lua diff --git a/birb/modules/world/actors/mixins/sprites.lua b/framework/modules/world/actors/mixins/sprites.lua similarity index 97% rename from birb/modules/world/actors/mixins/sprites.lua rename to framework/modules/world/actors/mixins/sprites.lua index 4641190..e473a19 100644 --- a/birb/modules/world/actors/mixins/sprites.lua +++ b/framework/modules/world/actors/mixins/sprites.lua @@ -22,7 +22,7 @@ ]] local SpritedActor = Object:extend() -local Sprite = require("birb.modules.world.actors.utils.sprites") +local Sprite = require("framework.modules.world.actors.utils.sprites") function SpritedActor:initSprite() self:addUpdateFunction(self.updateSprite) diff --git a/birb/modules/world/actors/mixins/timers.lua b/framework/modules/world/actors/mixins/timers.lua similarity index 95% rename from birb/modules/world/actors/mixins/timers.lua rename to framework/modules/world/actors/mixins/timers.lua index 4dacbfb..929c86c 100644 --- a/birb/modules/world/actors/mixins/timers.lua +++ b/framework/modules/world/actors/mixins/timers.lua @@ -23,7 +23,7 @@ local TimedActor = Object:extend() -local TweenManager = require "birb.classes.time" +local TweenManager = require "framework.classes.time" -- TIMER FUNCTIONS -- Control the integrated timers of the actor diff --git a/birb/modules/world/actors/utils/boxes/init.lua b/framework/modules/world/actors/utils/boxes/init.lua similarity index 100% rename from birb/modules/world/actors/utils/boxes/init.lua rename to framework/modules/world/actors/utils/boxes/init.lua diff --git a/birb/modules/world/actors/utils/boxes/mapped.lua b/framework/modules/world/actors/utils/boxes/mapped.lua similarity index 100% rename from birb/modules/world/actors/utils/boxes/mapped.lua rename to framework/modules/world/actors/utils/boxes/mapped.lua diff --git a/birb/modules/world/actors/utils/boxes/parent.lua b/framework/modules/world/actors/utils/boxes/parent.lua similarity index 100% rename from birb/modules/world/actors/utils/boxes/parent.lua rename to framework/modules/world/actors/utils/boxes/parent.lua diff --git a/birb/modules/world/actors/utils/boxes/textured.lua b/framework/modules/world/actors/utils/boxes/textured.lua similarity index 100% rename from birb/modules/world/actors/utils/boxes/textured.lua rename to framework/modules/world/actors/utils/boxes/textured.lua diff --git a/birb/modules/world/actors/utils/hitbox2D.lua b/framework/modules/world/actors/utils/hitbox2D.lua similarity index 98% rename from birb/modules/world/actors/utils/hitbox2D.lua rename to framework/modules/world/actors/utils/hitbox2D.lua index cd9571a..b6b9b10 100644 --- a/birb/modules/world/actors/utils/hitbox2D.lua +++ b/framework/modules/world/actors/utils/hitbox2D.lua @@ -23,7 +23,7 @@ ]] local Hitbox2D = Object:extend() -local rectStructure = require "birb.structures.rect" +local rectStructure = require "framework.structures.rect" -- INIT FUNCTIONS -- Initialise the actor and its base functions diff --git a/birb/modules/world/actors/utils/hitbox3D.lua b/framework/modules/world/actors/utils/hitbox3D.lua similarity index 98% rename from birb/modules/world/actors/utils/hitbox3D.lua rename to framework/modules/world/actors/utils/hitbox3D.lua index 261e104..a89f4bd 100644 --- a/birb/modules/world/actors/utils/hitbox3D.lua +++ b/framework/modules/world/actors/utils/hitbox3D.lua @@ -23,7 +23,7 @@ ]] local Hitbox3D = Object:extend() -local boxStructure = require "birb.structures.box" +local boxStructure = require "framework.structures.box" -- INIT FUNCTIONS -- Initialise the actor and its base functions diff --git a/birb/modules/world/actors/utils/sprites.lua b/framework/modules/world/actors/utils/sprites.lua similarity index 100% rename from birb/modules/world/actors/utils/sprites.lua rename to framework/modules/world/actors/utils/sprites.lua diff --git a/birb/modules/world/baseworld.lua b/framework/modules/world/baseworld.lua similarity index 100% rename from birb/modules/world/baseworld.lua rename to framework/modules/world/baseworld.lua diff --git a/birb/modules/world/camera/init.lua b/framework/modules/world/camera/init.lua similarity index 100% rename from birb/modules/world/camera/init.lua rename to framework/modules/world/camera/init.lua diff --git a/birb/modules/world/camera/utils.lua b/framework/modules/world/camera/utils.lua similarity index 100% rename from birb/modules/world/camera/utils.lua rename to framework/modules/world/camera/utils.lua diff --git a/birb/modules/world/libs/bump-3dpd.lua b/framework/modules/world/libs/bump-3dpd.lua similarity index 100% rename from birb/modules/world/libs/bump-3dpd.lua rename to framework/modules/world/libs/bump-3dpd.lua diff --git a/birb/modules/world/libs/bump.lua b/framework/modules/world/libs/bump.lua similarity index 100% rename from birb/modules/world/libs/bump.lua rename to framework/modules/world/libs/bump.lua diff --git a/birb/modules/world/libs/tsort.lua b/framework/modules/world/libs/tsort.lua similarity index 100% rename from birb/modules/world/libs/tsort.lua rename to framework/modules/world/libs/tsort.lua diff --git a/birb/modules/world/maps/init.lua b/framework/modules/world/maps/init.lua similarity index 100% rename from birb/modules/world/maps/init.lua rename to framework/modules/world/maps/init.lua diff --git a/birb/modules/world/maps/parent.lua b/framework/modules/world/maps/parent.lua similarity index 100% rename from birb/modules/world/maps/parent.lua rename to framework/modules/world/maps/parent.lua diff --git a/birb/modules/world/maps/tiled/init.lua b/framework/modules/world/maps/tiled/init.lua similarity index 85% rename from birb/modules/world/maps/tiled/init.lua rename to framework/modules/world/maps/tiled/init.lua index 23dc460..103a662 100644 --- a/birb/modules/world/maps/tiled/init.lua +++ b/framework/modules/world/maps/tiled/init.lua @@ -1,8 +1,8 @@ -local Parent = require "birb.modules.world.maps.parent" +local Parent = require "framework.modules.world.maps.parent" local TiledMap = Parent:extend() -local StiWrapper = require "birb.modules.world.maps.tiled.stiwrapper" +local StiWrapper = require "framework.modules.world.maps.tiled.stiwrapper" -local TiledMixins = require "birb.modules.world.maps.tiled.mixins" +local TiledMixins = require "framework.modules.world.maps.tiled.mixins" TiledMap:implement(TiledMixins) diff --git a/birb/modules/world/maps/tiled/libs/sti/graphics.lua b/framework/modules/world/maps/tiled/libs/sti/graphics.lua similarity index 100% rename from birb/modules/world/maps/tiled/libs/sti/graphics.lua rename to framework/modules/world/maps/tiled/libs/sti/graphics.lua diff --git a/birb/modules/world/maps/tiled/libs/sti/init.lua b/framework/modules/world/maps/tiled/libs/sti/init.lua similarity index 100% rename from birb/modules/world/maps/tiled/libs/sti/init.lua rename to framework/modules/world/maps/tiled/libs/sti/init.lua diff --git a/birb/modules/world/maps/tiled/libs/sti/plugins/box2d.lua b/framework/modules/world/maps/tiled/libs/sti/plugins/box2d.lua similarity index 100% rename from birb/modules/world/maps/tiled/libs/sti/plugins/box2d.lua rename to framework/modules/world/maps/tiled/libs/sti/plugins/box2d.lua diff --git a/birb/modules/world/maps/tiled/libs/sti/plugins/bump.lua b/framework/modules/world/maps/tiled/libs/sti/plugins/bump.lua similarity index 100% rename from birb/modules/world/maps/tiled/libs/sti/plugins/bump.lua rename to framework/modules/world/maps/tiled/libs/sti/plugins/bump.lua diff --git a/birb/modules/world/maps/tiled/libs/sti/utils.lua b/framework/modules/world/maps/tiled/libs/sti/utils.lua similarity index 100% rename from birb/modules/world/maps/tiled/libs/sti/utils.lua rename to framework/modules/world/maps/tiled/libs/sti/utils.lua diff --git a/birb/modules/world/maps/tiled/mixins.lua b/framework/modules/world/maps/tiled/mixins.lua similarity index 100% rename from birb/modules/world/maps/tiled/mixins.lua rename to framework/modules/world/maps/tiled/mixins.lua diff --git a/birb/modules/world/maps/tiled/stiwrapper.lua b/framework/modules/world/maps/tiled/stiwrapper.lua similarity index 99% rename from birb/modules/world/maps/tiled/stiwrapper.lua rename to framework/modules/world/maps/tiled/stiwrapper.lua index a6ae593..5a2288c 100644 --- a/birb/modules/world/maps/tiled/stiwrapper.lua +++ b/framework/modules/world/maps/tiled/stiwrapper.lua @@ -1,5 +1,5 @@ local StiWrapper = Object:extend() -local STI = require "birb.modules.world.maps.tiled.libs.sti" +local STI = require "framework.modules.world.maps.tiled.libs.sti" function StiWrapper:new(owner, mapfile, x, y, canLoadPlayer) self.sti = STI(mapfile) diff --git a/birb/modules/world/world2D.lua b/framework/modules/world/world2D.lua similarity index 100% rename from birb/modules/world/world2D.lua rename to framework/modules/world/world2D.lua diff --git a/birb/modules/world/world3D.lua b/framework/modules/world/world3D.lua similarity index 100% rename from birb/modules/world/world3D.lua rename to framework/modules/world/world3D.lua diff --git a/birb/structures/box.lua b/framework/structures/box.lua similarity index 100% rename from birb/structures/box.lua rename to framework/structures/box.lua diff --git a/birb/structures/elementData.lua b/framework/structures/elementData.lua similarity index 100% rename from birb/structures/elementData.lua rename to framework/structures/elementData.lua diff --git a/birb/structures/hitbox.lua b/framework/structures/hitbox.lua similarity index 100% rename from birb/structures/hitbox.lua rename to framework/structures/hitbox.lua diff --git a/birb/structures/rect.lua b/framework/structures/rect.lua similarity index 100% rename from birb/structures/rect.lua rename to framework/structures/rect.lua diff --git a/birb/structures/tween.lua b/framework/structures/tween.lua similarity index 100% rename from birb/structures/tween.lua rename to framework/structures/tween.lua diff --git a/birb/utils/bools.lua b/framework/utils/bools.lua similarity index 100% rename from birb/utils/bools.lua rename to framework/utils/bools.lua diff --git a/birb/utils/datas.lua b/framework/utils/datas.lua similarity index 100% rename from birb/utils/datas.lua rename to framework/utils/datas.lua diff --git a/birb/utils/enum.lua b/framework/utils/enum.lua similarity index 100% rename from birb/utils/enum.lua rename to framework/utils/enum.lua diff --git a/birb/utils/filesystem.lua b/framework/utils/filesystem.lua similarity index 100% rename from birb/utils/filesystem.lua rename to framework/utils/filesystem.lua diff --git a/birb/utils/graphics.lua b/framework/utils/graphics.lua similarity index 100% rename from birb/utils/graphics.lua rename to framework/utils/graphics.lua diff --git a/birb/utils/init.lua b/framework/utils/init.lua similarity index 78% rename from birb/utils/init.lua rename to framework/utils/init.lua index 4e7ee8f..1953aab 100644 --- a/birb/utils/init.lua +++ b/framework/utils/init.lua @@ -25,11 +25,11 @@ local cwd = (...):gsub('%.init$', '') .. "." -- load the different elements from loveutils return { - math = require "birb.utils.math", - graphics = require "birb.utils.graphics", - filesystem = require "birb.utils.filesystem", - table = require "birb.utils.table", - string = require "birb.utils.string", - time = require "birb.utils.time", - datas = require "birb.utils.datas" + math = require "framework.utils.math", + graphics = require "framework.utils.graphics", + filesystem = require "framework.utils.filesystem", + table = require "framework.utils.table", + string = require "framework.utils.string", + time = require "framework.utils.time", + datas = require "framework.utils.datas" } diff --git a/birb/utils/math.lua b/framework/utils/math.lua similarity index 100% rename from birb/utils/math.lua rename to framework/utils/math.lua diff --git a/birb/utils/string.lua b/framework/utils/string.lua similarity index 100% rename from birb/utils/string.lua rename to framework/utils/string.lua diff --git a/birb/utils/table.lua b/framework/utils/table.lua similarity index 99% rename from birb/utils/table.lua rename to framework/utils/table.lua index ce08309..41a6229 100644 --- a/birb/utils/table.lua +++ b/framework/utils/table.lua @@ -22,7 +22,7 @@ ]] local Table = {} -local Bools = require "birb.utils.bools" +local Bools = require "framework.utils.bools" --- Get the sum of a liste of number ---@param table table the table which you want to find if it contain the content diff --git a/birb/utils/time.lua b/framework/utils/time.lua similarity index 93% rename from birb/utils/time.lua rename to framework/utils/time.lua index 1134176..03ced6f 100644 --- a/birb/utils/time.lua +++ b/framework/utils/time.lua @@ -1,4 +1,4 @@ -local Math = require "birb.utils.math" +local Math = require "framework.utils.math" Time = {}