hmm refactoring

JUIlib.lua

@@ -1,12 +1,12 @@
 return {
-    UIContainer  = require("classes/UIContainer"),
-    Frame        = require("classes/Frame"),
-    TextBox      = require("classes/TextBox"),
+    UIContainer  = require("lib.classes.UIContainer"),
+    Frame        = require("lib.classes.Frame"),
+    TextBox      = require("lib.classes.TextBox"),
 
     -- Datatypes
-    Vector2D     = require("classes/Vector2D"),
-    Dimension    = require("classes/Dimension"),
-    RGBColor     = require("classes/RGBColor"),
+    Vector2D     = require("lib.datatypes.Vector2D"),
+    Dimension    = require("lib.datatypes.Dimension"),
+    RGBColor     = require("lib.datatypes.RGBColor"),
 
     parent = function(parent, child)
         parent:addChild(child)

lib/classes/Event.lua

@@ -1,4 +1,4 @@
-local newclass = require("classes/YACI")
+local newclass = require("lib.YACI")
 
 local Event = newclass("Event")
 

lib/classes/Frame.lua

@@ -1,4 +1,4 @@
-local UIRect = require("classes/UIRect")
+local UIRect = require("lib.classes.UIRect")
 
 local Frame = UIRect:subclass("Frame")
 

lib/classes/TextBox.lua

@@ -1,5 +1,5 @@
-local UIRect = require("classes/UIRect")
-local RGBColor = require("classes/RGBColor")
+local UIRect = require("lib.classes.UIRect")
+local RGBColor = require("lib.datatypes.RGBColor")
 
 local TextBox = UIRect:subclass("TextBox")
 

lib/classes/UIBase.lua

@@ -1,6 +1,6 @@
-local newclass = require("classes/YACI")
-local Dimension = require("classes/Dimension")
-local Vector2D = require("classes/Vector2D")
+local newclass = require("lib.YACI")
+local Dimension = require("lib.datatypes.Dimension")
+local Vector2D = require("lib.datatypes.Vector2D")
 -- Class --
 local UIBase = newclass("UIBase")
 

lib/classes/UIContainer.lua

@@ -1,6 +1,6 @@
-local UIBase = require("classes/UIBase")
-local Dimension = require("classes/Dimension")
-local Vector2D = require("classes/Vector2D")
+local UIBase = require("lib.classes.UIBase")
+local Dimension = require("lib.datatypes.Dimension")
+local Vector2D = require("lib.datatypes.Vector2D")
 
 local UIContainer = UIBase:subclass("UIContainer")
 

lib/classes/UIRect.lua

@@ -1,8 +1,8 @@
-local UIBase = require("classes/UIBase")
-local Dimension = require("classes/Dimension")
-local Vector2D = require("classes/Vector2D")
-local RGBColor = require("classes/RGBColor")
-local Event = require("classes/Event")
+local UIBase = require("lib.classes.UIBase")
+local Dimension = require("lib.datatypes.Dimension")
+local Vector2D = require("lib.datatypes.Vector2D")
+local RGBColor = require("lib.datatypes.RGBColor")
+local Event = require("lib.classes.Event")
 
 local UIRect = UIBase:subclass("UIRect")
 

lib/datatypes/Color.lua

@@ -0,0 +1,22 @@
+local DataType = require("lib.datatypes.DataType")
+
+
+local Color = DataType:subclass("Color")
+
+function Color:init(red, green, blue)
+    self.r = red or 1
+    self.g = green or 1
+    self.b = blue or 1
+end
+
+function Color:out()
+    return self.r, self.g, self.b
+end
+
+function Color:outTable()
+    return {
+        self.r,
+        self.g,
+        self.b
+    }
+end

lib/datatypes/DataType.lua

@@ -1,4 +1,4 @@
-local newclass = require("classes/YACI")
+local newclass = require("lib.YACI")
 
 
 local DataType = newclass("DataType")

lib/datatypes/Dimension.lua

@@ -1,4 +1,4 @@
-local DataType = require("classes/DataType")
+local DataType = require("lib.datatypes.DataType")
 
 
 local Dimension = DataType:subclass("Dimension")

lib/datatypes/HexColor.lua

@@ -0,0 +1,21 @@
+local Color = require("lib.datatypes.Color")
+
+local HexColor = Color:subclass("HexColor")
+
+function HexColor:init(color)
+    self.color = color
+end
+
+function HexColor:out()
+    local hex = self.color:gsub("#","")
+    return tonumber("0x"..hex:sub(1,2)), tonumber("0x"..hex:sub(3,4)), tonumber("0x"..hex:sub(5,6))
+end
+
+function HexColor:outTable()
+    local hex = self.color:gsub("#","")
+    return {
+        tonumber("0x"..hex:sub(1,2)),
+        tonumber("0x"..hex:sub(3,4)),
+        tonumber("0x"..hex:sub(5,6))
+    }
+end

lib/datatypes/RGBColor.lua

@@ -1,4 +1,4 @@
-local DataType = require("classes/DataType")
+local DataType = require("lib.datatypes.DataType")
 
 
 local RGBColor = DataType:subclass("RGBColor")

lib/datatypes/Vector2D.lua

@@ -1,4 +1,4 @@
-local DataType = require("classes/DataType")
+local DataType = require("lib.datatypes.DataType")
 
 
 local Vector2D = DataType:subclass("Vector2D")