Merge branch 'wip/great-rebase' into master

birb/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.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 local IndexedRect = Rect:extend()
 
 function IndexedRect:new(origin, ox, oy, w, h)

birb/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.objects.2D.point"
+local Point = require "birb.classes.2D.point"
 local Rect = Point:extend()
 
 function Rect:new(x, y, w, h)

birb/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.objects.3D.point3D"
+local Point = require "birb.classes.3D.point3D"
 local Box = Point:extend()
 
 function Box:new(x, y, z, w, h, d)

birb/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.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 local IndexedRect = Rect:extend()
 
 function IndexedRect:new(origin, ox, oy, oz, w, h, d)

birb/modules/menusystem/parent.lua

@@ -1,4 +1,4 @@
-local Rect = require "birb.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 
 local GuiElement = Rect:extend()
 

birb/modules/world/actors/actor2D.lua

@@ -22,7 +22,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Rect = require "birb.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 
 local BaseActor = require("birb.modules.world.actors.mixins.base")
 local SpritedActor = require("birb.modules.world.actors.mixins.sprites")

birb/modules/world/actors/actor3D.lua

@@ -22,7 +22,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local BasicBox = require "birb.objects.3D.box"
+local BasicBox = require "birb.classes.3D.box"
 
 local BaseActor = require("birb.modules.world.actors.mixins.base")
 local SpritedActor = require("birb.modules.world.actors.mixins.sprites")