Merge pull request 'feat/rebrand' (#77) from feat/rebrand into master

Reviewed-on: birb/birb-engine#77

.vscode/settings.json

@@ -3,7 +3,7 @@
         "love",
         "loadstring",
         "unpack",
-        "birb",
+        "framework",
         "utils",
         "core",
         "scenes",

CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- Project renamed to Birb and rebased entirely on Sonic Radiance codebase
+- Project renamed to Epervier Framework and rebased entirely on Sonic Radiance codebase
 
 - New loading system
 
@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **core/input:** extract virtualpads from the input controller
 
-- **core:** The core is now separated from the rest of birb
+- **core:** The core is now separated from the rest of the framework
 
 - **core+assets:** Music are now managed directly by the core
 

README.md

@@ -1,20 +1,40 @@
-# Birb Love2D Engine
+# Épervier Framework
 
-Birb aim to be an integrated, simple engine for love2D, in replacement of my old "gamecore" love2D engine. It aim to work as a set of managers to automatically handle inputs, screen, and several utilities to make game developpement easier and less repetitive. It's also specialized in game with RPG mechanics, with functions to serialize/deserialize easily datas.
+The Épervier Framework is an RPG-oriented framework for Love2D. It aim to work as a set of managers to automatically handle inputs, screen, and several utilities to make game developpement easier and less repetitive. It's also specialized in game with RPG mechanics, with functions to serialize/deserialize easily datas.
 
-Birb use [Classic](https://github.com/rxi/classic/) as its base Object.
+Épervier use [Classic](https://github.com/rxi/classic/) as its base Object.
 
-## How to load Birb
+## Core features
 
-The birb engine must be located in the `birb/` folder to work. After that, all you have to do is to load a gamecore based engine and then.
+Épervier provide a lot of feature that can be usefull to create an RPG. This is a non-exhaustive list of what the framework can do :
 
-Note : the `birb` and `utils` global namespace will be used by birb.
+- Scene system to be able to change your gameplay easily, with transitions
+- Easy data loading and parsing via the core.data module
+- A save system using data serialization
+- Tweening and time support via tween.lua
+- A world system with support for camera, multiple hitbox per actor, and two type of physics (bump2D and bump3D) and tiled map loading (via sti.lua)
+- A GUI system to make your game more easily have HUD and menus
+- Several utilities functions
 
-````
+## How to load Épervier
-require "birb"
 
-function love.load()
+The framework must be located in the `framework/` folder to work. After that, all you have to do is to load a gamecore based engine and then.
-  birb.startCore()
+
+Note : the `framework`, `core`, `game` and `utils` global namespaces will be used by the framework.
+
+```lua
+require "framework"
+
+function love.load(args)
+  framework.start("game", args)
 end
 
-````
+```
+
+### Launch in debug mode
+
+To launch in debug mode, the love2D game must be launched with a DEBUGLEVEL bigger than 1, for instance :
+
+```sh
+love ./examples DEBUGLEVEL=4
+```

birb/modules/transitions/init.lua

@@ -1,4 +0,0 @@
-return {
-    default = require "birb.modules.transitions.default",
-    circle = require "birb.modules.transitions.circle"
-}

examples/birb

@@ -1 +0,0 @@
-../birb/

examples/framework

@@ -0,0 +1 @@
+../framework/

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()

examples/main.lua

@@ -21,12 +21,12 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-require "birb"
+require "framework"
 
 scenes  = require "scenes"
 
 function love.load(args)
   print(utils.table.toString(args))
-  birb.start("game", args)
+  framework.start("game", args)
   scenes.MainMenu()
 end

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.scenes"
 local TestScene = Scene:extend()
 
-local MenuType  = require "birb.modules.gui.menus.listbox"
+local MenuType  = require "framework.scenes.gui.menus.listbox"
-local MenuType2 = require "birb.modules.gui.menus.flowbox"
+local MenuType2 = require "framework.scenes.gui.menus.flowbox"
-local MenuType3 = require "birb.modules.gui.menus.grid"
+local MenuType3 = require "framework.scenes.gui.menus.grid"
-local Widget    = require "birb.modules.gui.menus.widgets"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local MenuWidget = Widget.Text:extend()
 

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.scenes"
 local TestScene = Scene:extend()
 
 function TestScene:new()

examples/scenes/basic/test_scene2/actors/parent.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, w, h)

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.scenes"
 local TestScene = Scene:extend()
 
 local folder = "scenes/basic/test_scene2/"
 
-local World   = require "birb.modules.world.baseworld"
+local World   = require "framework.scenes.world.baseworld"
 
 function TestScene:new()
   TestScene.super.new(self)

examples/scenes/gameplay/action3D/actors/box.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Box = Base:extend()
 
 function Box:new(world, x, y, z)

examples/scenes/gameplay/action3D/actors/coin.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Coin = Base:extend()
 
 function Coin:new(world, x, y, z)

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.scenes.world.actors.gfx3D")
 
 Obj.index     = {}
 Obj.index["player"]   = Obj.Player

examples/scenes/gameplay/action3D/actors/parent.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, z, w, h, d, isSolid)

examples/scenes/gameplay/action3D/actors/wall.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, z, w, h, d)

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.scenes"
 local MovePlayer = Scene:extend()
 
-local World = require "birb.modules.world.world3D"
+local World = require "framework.scenes.world.world3D"
 
 function MovePlayer:new(playerNumber, cameraMode)
   local playerNumber  = playerNumber or 1

examples/scenes/gameplay/moveplayer/actors/parent.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, w, h, isSolid)

examples/scenes/gameplay/moveplayer/actors/wall.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, w, h)

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.scenes"
 local MovePlayer = Scene:extend()
 
-local World = require "birb.modules.world.world2D"
+local World = require "framework.scenes.world.world2D"
 
 function MovePlayer:new(playerNumber, cameraMode)
   local playerNumber  = playerNumber or 1

examples/scenes/gameplay/moveplayer3D/actors/parent.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, z, w, h, d, isSolid)

examples/scenes/gameplay/moveplayer3D/actors/wall.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, z, w, h, d)

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.scenes"
 local MovePlayer = Scene:extend()
 
-local World = require "birb.modules.world.world3D"
+local World = require "framework.scenes.world.world3D"
 
 function MovePlayer:new(playerNumber, cameraMode)
   local playerNumber  = playerNumber or 1

examples/scenes/gameplay/plateform/actors/coin.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Coin = Base:extend()
 
 function Coin:new(world, x, y)

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.scenes.world.actors.gfx2D")
 
 Obj.index     = {}
 Obj.index["player"]     = require(cwd ..  "player")

examples/scenes/gameplay/plateform/actors/player.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Player = Base:extend()
 
 function Player:new(world, x, y, id)

examples/scenes/gameplay/plateform/actors/wall.lua

@@ -1,4 +1,4 @@
-local Base = require "birb.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, w, h)

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.scenes"
 local Plateformer = Scene:extend()
 
-local World = require "birb.modules.world.world2D"
+local World = require "framework.scenes.world.world2D"
 local Pause = require "scenes.gameplay.plateform.pause"
 
 function Plateformer:new()

examples/scenes/gameplay/plateform/pause.lua

@@ -1,5 +1,5 @@
-local ListMenu  = require "birb.modules.gui.menus.listbox"
+local ListMenu  = require "framework.scenes.gui.menus.listbox"
-local Widget    = require "birb.modules.gui.menus.widgets"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local PauseMenu = ListMenu:extend()
 

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.scenes"
 local MainMenu  = Scene:extend()
 
 local Menu = require "scenes.mainmenu.menu"

examples/scenes/mainmenu/menu.lua

@@ -1,7 +1,7 @@
-local Parent = require "birb.modules.gui.textmenu"
+local Parent = require "framework.scenes.gui.textmenu"
 local MainMenu = Parent:extend()
 
-local defTransitions = require "birb.modules.transitions"
+local defTransitions = require "framework.scenes.transitions"
 
 local MENU_X, MENU_Y = 24, 48
 local MENU_W = 424/3

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.scenes"
 local Inventory   = Scene:extend()
 
-local HListBox  = require "birb.modules.gui.menus.hlistbox"
+local HListBox  = require "framework.scenes.gui.menus.hlistbox"
-local FloxBox      = require "birb.modules.gui.menus.flowbox"
+local FloxBox      = require "framework.scenes.gui.menus.flowbox"
-local Widget    = require "birb.modules.gui.menus.widgets"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local InventoryWidget = Widget.Text:extend()
 local ItemWidget      = Widget.Text:extend()

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.scenes"
 local OptionsMenu  = Scene:extend()
 
 local Widgets   = require "scenes.menus.options.widgets"

examples/scenes/menus/options/menu.lua

@@ -1,4 +1,4 @@
-local TextMenu   = require "birb.modules.gui.textmenu"
+local TextMenu   = require "framework.scenes.gui.textmenu"
 local OptionMenu = TextMenu:extend()
 
 local consts = require "scenes.menus.options.consts"

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.scenes.gui.textmenu.widgets.basic"
 local DoubleTextWidget  = Widget:extend()
 
 widgets.SubMenu       = DoubleTextWidget:extend()

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)

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)

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)

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)

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

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

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)

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)

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 tween = require "framework.libs.tween"
-local Timer = require "birb.classes.time.timer"
+local Timer = require "framework.classes.time.timer"
-local TimedFunction = require "birb.classes.time.func"
+local TimedFunction = require "framework.classes.time.func"
 
 function TweenManager:new(subject)
   self.subject  = subject

framework/core/datas.lua

@@ -24,8 +24,8 @@
 ]]
 
 local DataManager = Object:extend()
-local DataPack = require "birb.classes.datapack"
+local DataPack = require "framework.classes.datapack"
-local Parser = require "birb.classes.parser"
+local Parser = require "framework.classes.parser"
 local index = require "datas.gamedata.index"
 
 function DataManager:new(core)

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

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/"

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

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 = {

framework/init.lua

@@ -1,4 +1,5 @@
--- birb :: The main birb script, loading the core and main utilities
+-- framework :: The main Épervier Framework script, loading the core and main 
+-- utilities
 
 --[[
   Copyright © 2021 Kazhnuz
@@ -21,32 +22,32 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-birb = {}
+framework = {}
 
 -- GLOBAL UTILS/FUNCTION LOADING
 -- Load in the global namespace utilities that'll need to be reusable everywhere
 -- in the game
 
-Object  = require("birb.libs.classic")
+Object  = require("framework.libs.classic")
-utils   = require("birb.utils")
+utils   = require("framework.utils")
-enum    = require("birb.utils.enum")
+enum    = require("framework.utils.enum")
 
-birb.Core = require("birb.core")
+framework.Core = require("framework.core")
 
-function birb.start(gamemodule, args)
+function framework.start(gamemodule, args)
-  birb.startCore(args)
+  framework.startCore(args)
   if (gamemodule ~= nil) then
-    birb.startGame(gamemodule)
+    framework.startGame(gamemodule)
   end
 end
 
-function birb.startCore(args)
+function framework.startCore(args)
-  core = birb.Core(args)
+  core = framework.Core(args)
 end
 
-function birb.startGame(gamemodule)
+function framework.startGame(gamemodule)
   local GameObject = require(gamemodule)
   game = GameObject()
 end
 
-require("birb.callbacks")
+require("framework.callbacks")

framework/scenes/gui/elements/assets.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.drawable"
+local Parent = require "framework.scenes.gui.elements.drawable"
 local AssetElement = Parent:extend()
 
 function AssetElement:new(name, assetType, assetName, x, y,r,sx,sy,ox,oy, opacity)

framework/scenes/gui/elements/canvas.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local CanvasElement = Parent:extend()
 
 function CanvasElement:new(name, x, y, w, h, r,sx,sy,ox,oy, opacity)

framework/scenes/gui/elements/color.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local ColorElement = Parent:extend()
 
 function ColorElement:new(name, r, g, b, opacity)

framework/scenes/gui/elements/composite.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local CompositeElement = Parent:extend()
 
 function CompositeElement:new(name, x, y, childrenList)

framework/scenes/gui/elements/counter.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.variable"
+local Parent = require "framework.scenes.gui.elements.variable"
 local CounterElement = Parent:extend()
 
 function CounterElement:new(name, fontName, object, varName, nbrs, x, y, align)

framework/scenes/gui/elements/drawable.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local DrawableElement = Parent:extend()
 
 function DrawableElement:new(name, drawable, x, y,r,sx,sy,ox,oy, opacity)

framework/scenes/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)

framework/scenes/gui/elements/text.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local TextElement = Parent:extend()
 
 function TextElement:new(name, fontName, text, x, y, align)

framework/scenes/gui/elements/tile.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.drawable"
+local Parent = require "framework.scenes.gui.elements.drawable"
 local TileElement = Parent:extend()
 
 function TileElement:new(name, assetName, id, x, y,r,sx,sy,ox,oy, opacity)

framework/scenes/gui/elements/variable.lua

@@ -1,4 +1,4 @@
-local Parent = require "birb.modules.gui.elements.text"
+local Parent = require "framework.scenes.gui.elements.text"
 local VariableElement = Parent:extend()
 
 function VariableElement:new(name, fontName, object, varName, x, y, align)

framework/scenes/gui/init.lua

@@ -23,12 +23,12 @@
 
 local Gui = Object:extend()
 
-local ElementList = require "birb.modules.gui.mixins.elements"
+local ElementList = require "framework.scenes.gui.mixins.elements"
-local ScreenList = require "birb.modules.gui.mixins.screens"
+local ScreenList = require "framework.scenes.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

framework/scenes/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.scenes.gui.menus.views.view2D"
 
 -- INIT FUNCTIONS
 -- Initialize and configure the menu

framework/scenes/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.scenes.gui.menus.model.page"
 
 local function updateWidgetByOrder(a, b)
     if a.order ~= b.order then

framework/scenes/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.scenes.gui.elements.canvas"
 
 local Menu = GuiElement:extend()
-local MenuModel = require "birb.modules.gui.menus.model"
+local MenuModel = require "framework.scenes.gui.menus.model"
 
-local menuUtils = require "birb.modules.gui.utils"
+local menuUtils = require "framework.scenes.gui.utils"
 
 -- INIT FUNCTIONS
 -- Initialize and configure functions.

framework/scenes/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.scenes.gui.menus.views.view1D"
 local View2D = View1D:extend()
 
 function View2D:new(colNumber, lineNumber)