10 files changed, 19 insertions, 18 deletions
diff --git a/src/lua/modules/graphics/bitmap.cpp b/src/lua/modules/graphics/bitmap.cpp
index f2ecb5f..9a396fb 100644
--- a/src/lua/modules/graphics/bitmap.cpp
+++ b/src/lua/modules/graphics/bitmap.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-    using namespace jin::graphics;
+    using namespace JinEngine::Graphics;
 
     typedef Ref<Bitmap>& BitmapRef;
 
diff --git a/src/lua/modules/graphics/canvas.cpp b/src/lua/modules/graphics/canvas.cpp
index 85ac49a..4639179 100644
--- a/src/lua/modules/graphics/canvas.cpp
+++ b/src/lua/modules/graphics/canvas.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-	using namespace jin::graphics;
+	using namespace JinEngine::Graphics;
 
     typedef Ref<Canvas>& CanvasRef;
 
diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp
index 31f6fba..9322765 100644
--- a/src/lua/modules/graphics/graphics.cpp
+++ b/src/lua/modules/graphics/graphics.cpp
@@ -11,9 +11,10 @@ namespace jin
 namespace lua
 {
     using namespace std;
-	using namespace jin::graphics;
-    using jin::filesystem::Filesystem;
-    using jin::filesystem::Buffer;
+    using namespace JinEngine;
+	using namespace JinEngine::Graphics;
+    using JinEngine::Filesystem::AssetDatabase;
+    using JinEngine::Filesystem::Buffer;
 
 #include "../../resources/font.ttf.h"
 
@@ -117,7 +118,7 @@ namespace lua
         else
         {
             const char* f = luax_checkstring(L, 1);
-            Filesystem* fs = Filesystem::get();
+            AssetDatabase* fs = AssetDatabase::get();
             if (!fs->exists(f))
             {
                 error(L, "No such image file %s", f);
@@ -186,7 +187,7 @@ namespace lua
     static int l_newShaderf(lua_State* L)
     {
         const char* path = luax_checkstring(L, 1);
-        Filesystem* fs = Filesystem::get();
+        AssetDatabase* fs = AssetDatabase::get();
         if (!fs->exists(path))
         {
             error(L, "No such shader file %s\n", path);
@@ -346,7 +347,7 @@ namespace lua
             luax_typerror(L, 2, "table");
             return 1;
         }
-        math::Quad q;
+        Math::Quad q;
         q.x = luax_rawgetnumber(L, 2, 1);
         q.y = luax_rawgetnumber(L, 2, 2);
         q.w = luax_rawgetnumber(L, 2, 3);
@@ -485,7 +486,7 @@ namespace lua
     {
         int x = luax_checknumber(L, 1);
         int y = luax_checknumber(L, 2);
-        jin::graphics::point(x, y);
+        JinEngine::Graphics::point(x, y);
         
         return 0; 
     }
@@ -496,7 +497,7 @@ namespace lua
         int y1 = luax_checknumber(L, 2);
         int x2 = luax_checknumber(L, 3);
         int y2 = luax_checknumber(L, 4);
-        jin::graphics::line(x1, y1, x2, y2);
+        JinEngine::Graphics::line(x1, y1, x2, y2);
         
         return 0; 
     }
@@ -609,7 +610,7 @@ namespace lua
         TTFData* fd = nullptr;
         {
             const char* path = luax_checkstring(L, 1);
-            Filesystem* fs = Filesystem::get();
+            AssetDatabase* fs = AssetDatabase::get();
             if (!fs->exists(path))
             {
                 error(L, "No such font %s\n", path);
diff --git a/src/lua/modules/graphics/page.cpp b/src/lua/modules/graphics/page.cpp
index c0a3184..e4ad829 100644
--- a/src/lua/modules/graphics/page.cpp
+++ b/src/lua/modules/graphics/page.cpp
@@ -10,7 +10,7 @@ namespace jin
 namespace lua
 {
 
-    using namespace jin::graphics;
+    using namespace JinEngine::Graphics;
 
     typedef Ref<Font>& FontRef;
 
diff --git a/src/lua/modules/graphics/shader.cpp b/src/lua/modules/graphics/shader.cpp
index a9603bc..1ea5447 100644
--- a/src/lua/modules/graphics/shader.cpp
+++ b/src/lua/modules/graphics/shader.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
     
-	using namespace jin::graphics;
+	using namespace JinEngine::Graphics;
 
 	typedef Ref<Shader>& ShaderRef;
 
diff --git a/src/lua/modules/graphics/text.cpp b/src/lua/modules/graphics/text.cpp
index c0136cc..9940f50 100644
--- a/src/lua/modules/graphics/text.cpp
+++ b/src/lua/modules/graphics/text.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-	using namespace  jin::graphics;
+	using namespace  JinEngine::Graphics;
 
 	static int l_gc(lua_State* L)
 	{
diff --git a/src/lua/modules/graphics/texture.cpp b/src/lua/modules/graphics/texture.cpp
index 77a93b8..980fe04 100644
--- a/src/lua/modules/graphics/texture.cpp
+++ b/src/lua/modules/graphics/texture.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-	using namespace jin::graphics;
+	using namespace JinEngine::Graphics;
 
 	typedef Ref<Texture>& TextureRef;
 
diff --git a/src/lua/modules/graphics/texture_font.cpp b/src/lua/modules/graphics/texture_font.cpp
index 4cf5bdd..bbb51cc 100644
--- a/src/lua/modules/graphics/texture_font.cpp
+++ b/src/lua/modules/graphics/texture_font.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-	using namespace jin::graphics;
+	using namespace JinEngine::Graphics;
 
 	static int l_gc(lua_State* L)
 	{
diff --git a/src/lua/modules/graphics/ttf.cpp b/src/lua/modules/graphics/ttf.cpp
index 3d88a62..39383e4 100644
--- a/src/lua/modules/graphics/ttf.cpp
+++ b/src/lua/modules/graphics/ttf.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-    using namespace jin::graphics;
+    using namespace JinEngine::Graphics;
 
     static int l_gc(lua_State* L)
     {
diff --git a/src/lua/modules/graphics/ttfData.cpp b/src/lua/modules/graphics/ttfData.cpp
index 5d4d03a..f61680f 100644
--- a/src/lua/modules/graphics/ttfData.cpp
+++ b/src/lua/modules/graphics/ttfData.cpp
@@ -8,7 +8,7 @@ namespace jin
 namespace lua
 {
 
-    using namespace jin::graphics;
+    using namespace JinEngine::Graphics;
 
     static int l_newTTF(lua_State* L)
     {