*misc

20 files changed, 448 insertions, 482 deletions

diff --git a/bin/Jin.exe b/bin/Jin.exe
index 5686e11..dae29ff 100644
--- a/bin/Jin.exe
+++ b/bin/Jin.exe
diff --git a/bin/jin.exe b/bin/jin.exe
index 5686e11..dae29ff 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
diff --git a/bin/main.lua b/bin/main.lua
index 590debe..338287a 100644
--- a/bin/main.lua
+++ b/bin/main.lua
@@ -4,6 +4,8 @@ local shader
 local text
 local page
 local tf
+local sprites
+local ttf
 function jin.core.onLoad()
 	shader = jin.graphics.newShaderf("font.shader")
 	-- local bitmap = jin.graphics.newBitmap("defaultfont.png")
@@ -11,6 +13,11 @@ function jin.core.onLoad()
 	-- tf = tfdata:newTTF(13)
 	-- page = tf:typeset("this is a test")
 	jin.graphics.setClearColor(100, 100, 100, 255)
+	local bitmap = jin.graphics.newBitmap("sprites.png")
+	sprites = jin.graphics.newTexture(bitmap)
+	bitmap = nil
+	local ttfdata = jin.graphics.newTTFData("font_pixel.ttf")
+	ttf = ttfdata:newTTF(22);
 end
 
 function jin.core.onEvent(e)
@@ -39,35 +46,8 @@ function run()
 end 
 
 function jin.core.onDraw()
-	jin.graphics.print([[
-	;:-_/|\!'"+=*()[]{}&%
-function jin.core.onLoad()
-	shader = jin.graphics.newShaderf("font.shader")
-	-- local bitmap = jin.graphics.newBitmap("defaultfont.png")
-	-- local tfdata = jin.graphics.newTTFData("font.ttf")
-	-- tf = tfdata:newTTF(13)
-	-- page = tf:typeset("this is a test")
-end	
-function jin.core.onLoad()
-	shader = jin.graphics.newShaderf("font.shader")
-	-- local bitmap = jin.graphics.newBitmap("defaultfont.png")
-	-- local tfdata = jin.graphics.newTTFData("font.ttf")
-	-- tf = tfdata:newTTF(13)
-	-- page = tf:typeset("this is a test")
-end	
-function jin.core.onLoad()
-	shader = jin.graphics.newShaderf("font.shader")
-	-- local bitmap = jin.graphics.newBitmap("defaultfont.png")
-	-- local tfdata = jin.graphics.newTTFData("font.ttf")
-	-- tf = tfdata:newTTF(13)
-	-- page = tf:typeset("this is a test")
-end	
-function jin.core.onLoad()
-	shader = jin.graphics.newShaderf("font.shader")
-	-- local bitmap = jin.graphics.newBitmap("defaultfont.png")
-	-- local tfdata = jin.graphics.newTTFData("font.ttf")
-	-- tf = tfdata:newTTF(13)
-	-- page = tf:typeset("this is a test")
-end	
-]], 10,10)
+	jin.graphics.setColor(255, 255, 255)
+	jin.graphics.draw(sprites, 10, 10, 1, 1)
+	jin.graphics.setFont(ttf)
+	jin.graphics.print("this is a demo")
 end
\ No newline at end of file
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index b71d835..77a3fff 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -170,7 +170,6 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Image.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Particles\Particle.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\base.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\default.shader.h" />
@@ -232,7 +231,6 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Image.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Particles\Particle.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Sprite.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 5e67e60..6030f3c 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -67,9 +67,6 @@
     <Filter Include="Source\Graphics\Font">
       <UniqueIdentifier>{ce02dfa9-2afe-4295-b14f-c786d65456cd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source\Graphics\Particles">
-      <UniqueIdentifier>{be281e38-d048-40c5-a891-38703cfa9bfa}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source\3rdparty\base64">
       <UniqueIdentifier>{086e2fe7-2366-4d52-b059-212ada075da4}</UniqueIdentifier>
     </Filter>
@@ -246,9 +243,6 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Font\TTF.h">
       <Filter>Source\Graphics\Font</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Particles\Particle.h">
-      <Filter>Source\Graphics\Particles</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\Bitmap.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
@@ -383,9 +377,6 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Font\TTF.cpp">
       <Filter>Source\Graphics\Font</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Particles\Particle.cpp">
-      <Filter>Source\Graphics\Particles</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\Bitmap.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
diff --git a/src/libjin/Filesystem/Filesystem.cpp b/src/libjin/Filesystem/Filesystem.cpp
index c3d271c..3f91274 100644
--- a/src/libjin/Filesystem/Filesystem.cpp
+++ b/src/libjin/Filesystem/Filesystem.cpp
@@ -43,8 +43,6 @@ namespace filesystem
         return smtread(S, path, len);
     }
 
-
-
     const char* Filesystem::getFull(const char* path)
     {
         return smtfullpath(S, path);
diff --git a/src/libjin/Game/Game.cpp b/src/libjin/Game/Game.cpp
index f4e672d..65baaaa 100644
--- a/src/libjin/Game/Game.cpp
+++ b/src/libjin/Game/Game.cpp
@@ -17,6 +17,7 @@ namespace core
 
     Game::Game() :_running(true) {};
 
+    /* default game loop */
     void Game::run()
     {
 		if (_onLoad != nullptr)
diff --git a/src/libjin/Graphics/Drawable.cpp b/src/libjin/Graphics/Drawable.cpp
index 4be1cc2..b9a0b36 100644
--- a/src/libjin/Graphics/Drawable.cpp
+++ b/src/libjin/Graphics/Drawable.cpp
@@ -8,111 +8,111 @@
 
 namespace jin
 {
-namespace graphics
-{
-
-    Drawable::Drawable(int w, int h)
-        : texture(0)
-        , size(w, h)
-        , anchor(0, 0)
-    {
-        vertex_coords[0] = 0; vertex_coords[1] = 0;
-        vertex_coords[2] = 0; vertex_coords[3] = h;
-        vertex_coords[4] = w; vertex_coords[5] = h;
-        vertex_coords[6] = w; vertex_coords[7] = 0;
-
-        texture_coords[0] = 0; texture_coords[1] = 0;
-        texture_coords[2] = 0; texture_coords[3] = 1;
-        texture_coords[4] = 1; texture_coords[5] = 1;
-        texture_coords[6] = 1; texture_coords[7] = 0;
-    }
-
-    Drawable::Drawable(const Bitmap* bitmap)
-        : texture(0)
-        , anchor(0, 0)
-    {
-        unsigned int w = size.w = bitmap->getWidth();
-        unsigned int h = size.h = bitmap->getHeight();
-
-        vertex_coords[0] = 0; vertex_coords[1] = 0;
-        vertex_coords[2] = 0; vertex_coords[3] = h;
-        vertex_coords[4] = w; vertex_coords[5] = h;
-        vertex_coords[6] = w; vertex_coords[7] = 0;
-
-        texture_coords[0] = 0; texture_coords[1] = 0;
-        texture_coords[2] = 0; texture_coords[3] = 1;
-        texture_coords[4] = 1; texture_coords[5] = 1;
-        texture_coords[6] = 1; texture_coords[7] = 0;
-
-        const Color* pixels = bitmap->getPixels();
-
-        texture = gl.genTexture();
-        gl.bindTexture(texture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        gl.texImage(GL_RGBA8, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-        gl.bindTexture(0);
-    }
-
-    Drawable::~Drawable()
-    {
-        glDeleteTextures(1, &texture);
-    }
-
-    void Drawable::setAnchor(int x, int y)
+    namespace graphics
     {
-        anchor.x = x; 
-        anchor.y = y;
-    }
 
-    void Drawable::draw(int x, int y, float sx, float sy, float r)
-    {
-        gl.ModelMatrix.setTransformation(x, y, r, sx, sy, anchor.x, anchor.y);
-
-		Shader* shader = Shader::getCurrentShader();
-		shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
-		shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
-		shader->bindVertexPointer(2, GL_FLOAT, 0, vertex_coords);
-		shader->bindUVPointer(2, GL_FLOAT, 0, texture_coords);
-
-        gl.bindTexture(texture);
-        gl.drawArrays(GL_QUADS, 0, 4);
-        gl.bindTexture(0);
-    }
-
-    void Drawable::draw(const math::Quad& slice, int x, int y, float sx, float sy, float r, float ax, float ay)
-    {
-        float vertCoords[8] = {
-            0,       0, 
-            0,       slice.h,
-            slice.w, slice.h,
-            slice.w, 0
-        };
-        float slx = slice.x / size.w;
-        float sly = slice.y / size.h;
-        float slw = slice.w / size.w;
-        float slh = slice.h / size.h;
-        float texCoords[8] = {
-            slx,       sly, 
-            slx,       sly + slh,
-            slx + slw, sly + slh, 
-            slx + slw, sly
-        };
-
-        gl.ModelMatrix.setTransformation(x, y, r, sx, sy, ax, ay);
-
-        Shader* shader = Shader::getCurrentShader();
-        shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
-        shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
-        shader->bindVertexPointer(2, GL_FLOAT, 0, vertCoords);
-        shader->bindUVPointer(2, GL_FLOAT, 0, texCoords);
-
-        gl.bindTexture(texture);
-        gl.drawArrays(GL_QUADS, 0, 4);
-        gl.bindTexture(0);
-    }
-
-} // render
+        Drawable::Drawable(int w, int h)
+            : texture(0)
+            , size(w, h)
+            , anchor(0, 0)
+        {
+            vertex_coords[0] = 0; vertex_coords[1] = 0;
+            vertex_coords[2] = 0; vertex_coords[3] = h;
+            vertex_coords[4] = w; vertex_coords[5] = h;
+            vertex_coords[6] = w; vertex_coords[7] = 0;
+
+            texture_coords[0] = 0; texture_coords[1] = 0;
+            texture_coords[2] = 0; texture_coords[3] = 1;
+            texture_coords[4] = 1; texture_coords[5] = 1;
+            texture_coords[6] = 1; texture_coords[7] = 0;
+        }
+
+        Drawable::Drawable(const Bitmap* bitmap)
+            : texture(0)
+            , anchor(0, 0)
+        {
+            unsigned int w = size.w = bitmap->getWidth();
+            unsigned int h = size.h = bitmap->getHeight();
+
+            vertex_coords[0] = 0; vertex_coords[1] = 0;
+            vertex_coords[2] = 0; vertex_coords[3] = h;
+            vertex_coords[4] = w; vertex_coords[5] = h;
+            vertex_coords[6] = w; vertex_coords[7] = 0;
+
+            texture_coords[0] = 0; texture_coords[1] = 0;
+            texture_coords[2] = 0; texture_coords[3] = 1;
+            texture_coords[4] = 1; texture_coords[5] = 1;
+            texture_coords[6] = 1; texture_coords[7] = 0;
+
+            const Color* pixels = bitmap->getPixels();
+
+            texture = gl.genTexture();
+            gl.bindTexture(texture);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+            gl.texImage(GL_RGBA8, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+            gl.bindTexture(0);
+        }
+
+        Drawable::~Drawable()
+        {
+            glDeleteTextures(1, &texture);
+        }
+
+        void Drawable::setAnchor(int x, int y)
+        {
+            anchor.x = x; 
+            anchor.y = y;
+        }
+
+        void Drawable::draw(int x, int y, float sx, float sy, float r)
+        {
+            gl.ModelMatrix.setTransformation(x, y, r, sx, sy, anchor.x, anchor.y);
+
+		    Shader* shader = Shader::getCurrentShader();
+		    shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+		    shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
+		    shader->bindVertexPointer(2, GL_FLOAT, 0, vertex_coords);
+		    shader->bindUVPointer(2, GL_FLOAT, 0, texture_coords);
+
+            gl.bindTexture(texture);
+            gl.drawArrays(GL_QUADS, 0, 4);
+            gl.bindTexture(0);
+        }
+
+        void Drawable::draw(const math::Quad& slice, int x, int y, float sx, float sy, float r, float ax, float ay)
+        {
+            float vertCoords[8] = {
+                0,       0, 
+                0,       slice.h,
+                slice.w, slice.h,
+                slice.w, 0
+            };
+            float slx = slice.x / size.w;
+            float sly = slice.y / size.h;
+            float slw = slice.w / size.w;
+            float slh = slice.h / size.h;
+            float texCoords[8] = {
+                slx,       sly, 
+                slx,       sly + slh,
+                slx + slw, sly + slh, 
+                slx + slw, sly
+            };
+
+            gl.ModelMatrix.setTransformation(x, y, r, sx, sy, ax, ay);
+
+            Shader* shader = Shader::getCurrentShader();
+            shader->sendMatrix4(SHADER_MODEL_MATRIX, &gl.ModelMatrix);
+            shader->sendMatrix4(SHADER_PROJECTION_MATRIX, &gl.ProjectionMatrix);
+            shader->bindVertexPointer(2, GL_FLOAT, 0, vertCoords);
+            shader->bindUVPointer(2, GL_FLOAT, 0, texCoords);
+
+            gl.bindTexture(texture);
+            gl.drawArrays(GL_QUADS, 0, 4);
+            gl.bindTexture(0);
+        }
+
+    } // render
 } // jin
 
 #endif // LIBJIN_MODULES_RENDER
\ No newline at end of file
diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h
index 0c4c3ef..29f1946 100644
--- a/src/libjin/Graphics/Drawable.h
+++ b/src/libjin/Graphics/Drawable.h
@@ -10,39 +10,39 @@
 
 namespace jin 
 {
-namespace graphics
-{
-
-    class Drawable
+    namespace graphics
     {
-    public:
-        Drawable(int w = 0, int h = 0);
-        Drawable(const Bitmap* bitmap);
-        virtual ~Drawable();
 
-        void setAnchor(int x, int y); 
-        void draw(int x, int y, float sx = 1, float sy = 1, float r = 0);
-        void draw(const math::Quad& slice, int x, int y, float sx = 1, float sy = 1, float r = 0, float ax = 0, float ay = 0);
-        inline int getWidth() const { return size.w; }
-        inline int getHeight() const { return size.h; }
-        inline GLuint getTexture() const { return texture; }
+        class Drawable
+        {
+        public:
+            Drawable(int w = 0, int h = 0);
+            Drawable(const Bitmap* bitmap);
+            virtual ~Drawable();
+
+            void setAnchor(int x, int y); 
+            void draw(int x, int y, float sx = 1, float sy = 1, float r = 0);
+            void draw(const math::Quad& slice, int x, int y, float sx = 1, float sy = 1, float r = 0, float ax = 0, float ay = 0);
+            inline int getWidth() const { return size.w; }
+            inline int getHeight() const { return size.h; }
+            inline GLuint getTexture() const { return texture; }
 
-    protected:
-        static const int DRAWABLE_V_SIZE = 8;
+        protected:
+            static const int DRAWABLE_V_SIZE = 8;
 
-        GLuint texture;
-        GLuint vbo;
-        /* TODO: vertex buffer object */
-        /* GLuint vbo; */
-        jin::math::Vector2<unsigned int> size;
-        jin::math::Vector2<int> anchor;
-        float vertex_coords[DRAWABLE_V_SIZE];
-        float texture_coords[DRAWABLE_V_SIZE];
+            GLuint texture;
+            GLuint vbo;
+            /* TODO: vertex buffer object */
+            /* GLuint vbo; */
+            jin::math::Vector2<unsigned int> size;
+            jin::math::Vector2<int> anchor;
+            float vertex_coords[DRAWABLE_V_SIZE];
+            float texture_coords[DRAWABLE_V_SIZE];
         
-    };
+        };
     
-} // render
-} // jin
+    } // namespace render
+} // namespace jin
 
 #endif // LIBJIN_MODULES_RENDER
 #endif // __LIBJIN_DRAWABLE
\ No newline at end of file
diff --git a/src/libjin/Graphics/Font/TextureFont.cpp b/src/libjin/Graphics/Font/TextureFont.cpp
index 7ee1962..a1f2b27 100644
--- a/src/libjin/Graphics/Font/TextureFont.cpp
+++ b/src/libjin/Graphics/Font/TextureFont.cpp
@@ -70,8 +70,7 @@ namespace graphics
 
 		for (Codepoint c : text)
 		{
-			if (c == 0x0D)
-				continue;
+			if (c == 0x0D) continue;
 			if (c == 0x0A)
 			{
 				/* new line */
@@ -80,8 +79,7 @@ namespace graphics
 				continue;
 			}
 			glyph = findGlyph(c);																	
-			if (glyph == nullptr)
-				continue;
+			if (glyph == nullptr) continue;
 			if (texture != this->texture)														
 			{																
 				texture = this->texture;
diff --git a/src/libjin/Graphics/Image.cpp b/src/libjin/Graphics/Image.cpp
index 5700f60..358a144 100644
--- a/src/libjin/Graphics/Image.cpp
+++ b/src/libjin/Graphics/Image.cpp
@@ -4,42 +4,42 @@
 
 namespace jin
 {
-namespace graphics
-{
+    namespace graphics
+    {
 
-    using namespace filesystem;
+        using namespace filesystem;
 
-	/*static*/ Image* Image::createImage(const void* imgData, size_t size)
-	{
-		if (imgData == nullptr)
-			return nullptr;
-		int w, h;
-		void* data = stbi_load_from_memory((unsigned char *)imgData, size, &w, &h, NULL, STBI_rgb_alpha);
-		if (data == nullptr)
-			return nullptr;
-		Image* image = new Image();
-		image->pixels = (Color*)data;
-		image->width = w;
-		image->height = h;
-		return image;
-	}
+	    /*static*/ Image* Image::createImage(const void* imgData, size_t size)
+	    {
+		    if (imgData == nullptr)
+			    return nullptr;
+		    int w, h;
+		    void* data = stbi_load_from_memory((unsigned char *)imgData, size, &w, &h, NULL, STBI_rgb_alpha);
+		    if (data == nullptr)
+			    return nullptr;
+		    Image* image = new Image();
+		    image->pixels = (Color*)data;
+		    image->width = w;
+		    image->height = h;
+		    return image;
+	    }
 
-    Image* Image::createImage(const char* path)
-    {
-        Filesystem* fs = Filesystem::get(); 
-        Buffer buffer;
-        fs->read(path, &buffer);
-        return createImage(buffer.data, buffer.size);
-    }
+        Image* Image::createImage(const char* path)
+        {
+            Filesystem* fs = Filesystem::get(); 
+            Buffer buffer;
+            fs->read(path, &buffer);
+            return createImage(buffer.data, buffer.size);
+        }
 
-	Image::Image()
-		: Bitmap()
-	{
-	}
+	    Image::Image()
+		    : Bitmap()
+	    {
+	    }
 
-	Image::~Image()
-	{
-	}
+	    Image::~Image()
+	    {
+	    }
 
-}
-}
+    } // namespace graphics
+} // namespace jin 
diff --git a/src/libjin/Graphics/Image.h b/src/libjin/Graphics/Image.h
index 215ac34..bed1986 100644
--- a/src/libjin/Graphics/Image.h
+++ b/src/libjin/Graphics/Image.h
@@ -5,31 +5,31 @@
 
 namespace jin
 {
-namespace graphics
-{
-
-	/* just like bitmap but only from image file*/
-	/* readonly bitmap */
-	class Image : public Bitmap
-	{
-	public:
-        static Image* createImage(const char* path);
-		static Image* createImage(const void* imgData, size_t size);
-		~Image();
-
-	private:
-		Image();
-
-		void bind(Color* pixels, int w, int h);
-		void resetPixels(const Color* pixels, int w, int h);
-		void resetPixels(const Color& pixels, int w, int h);
-		void setPixel(const Color& pixel, int x, int y);
-		void setPixels(Color pixels);
-		void setPixels(Color* pixels);
-
-	};
-
-}
+    namespace graphics
+    {
+
+	    /* just like bitmap but only from image file*/
+	    /* readonly bitmap */
+	    class Image : public Bitmap
+	    {
+	    public:
+            static Image* createImage(const char* path);
+		    static Image* createImage(const void* imgData, size_t size);
+		    ~Image();
+
+	    private:
+		    Image();
+
+		    void bind(Color* pixels, int w, int h);
+		    void resetPixels(const Color* pixels, int w, int h);
+		    void resetPixels(const Color& pixels, int w, int h);
+		    void setPixel(const Color& pixel, int x, int y);
+		    void setPixels(Color pixels);
+		    void setPixels(Color* pixels);
+
+	    };
+
+    }
 }
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/Graphics/Particles/Particle.cpp b/src/libjin/Graphics/Particles/Particle.cpp
deleted file mode 100644
index e69de29..0000000
--- a/src/libjin/Graphics/Particles/Particle.cpp
+++ /dev/null
diff --git a/src/libjin/Graphics/Particles/Particle.h b/src/libjin/Graphics/Particles/Particle.h
deleted file mode 100644
index e69de29..0000000
--- a/src/libjin/Graphics/Particles/Particle.h
+++ /dev/null
diff --git a/src/libjin/Graphics/Sprite.h b/src/libjin/Graphics/Sprite.h
index 0d73464..2c7e0f5 100644
--- a/src/libjin/Graphics/Sprite.h
+++ b/src/libjin/Graphics/Sprite.h
@@ -3,16 +3,16 @@
 
 namespace jin
 {
-namespace graphics
-{
+    namespace graphics
+    {
 
-	/* just like texture but with x,y */
-	class Sprite
-	{
+	    /* just like texture but with x,y */
+	    class Sprite
+	    {
 
-	};
+	    };
 
-}
+    }
 }
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/Input/Event.h b/src/libjin/Input/Event.h
index 7ab07da..9a31c06 100644
--- a/src/libjin/Input/Event.h
+++ b/src/libjin/Input/Event.h
@@ -5,101 +5,101 @@
 
 namespace jin
 {
-namespace input
-{ 
-#if LIBJIN_INPUT_SDL
-#include "SDL.h"
+    namespace input
+    { 
+    #if LIBJIN_INPUT_SDL
+    #include "SDL.h"
     
-    typedef SDL_Event           Event;
-    typedef SDL_Keycode         Key;
-    typedef SDL_MouseWheelEvent Wheel;
+        typedef SDL_Event           Event;
+        typedef SDL_Keycode         Key;
+        typedef SDL_MouseWheelEvent Wheel;
 
-    enum EventType {
-        QUIT            = SDL_QUIT,
-        /* keyboard events */
-        KEY_DOWN         = SDL_KEYDOWN,
-        KEY_UP           = SDL_KEYUP,
-        /* mouse events */
-        MOUSE_MOTION     = SDL_MOUSEMOTION,
-        MOUSE_BUTTON_DOWN = SDL_MOUSEBUTTONDOWN,
-        MOUSE_BUTTON_UP   = SDL_MOUSEBUTTONUP,
-        MOUSE_WHEEL      = SDL_MOUSEWHEEL,
-        /* joypad events */
-        JOYBUTTONDOWN         = SDL_JOYBUTTONDOWN,
-        JOYBUTTONUP           = SDL_JOYBUTTONUP,
-        JOYAXISMOTION         = SDL_JOYAXISMOTION,
-        JOYBALLMOTION         = SDL_JOYBALLMOTION,
-        JOYHATMOTION          = SDL_JOYHATMOTION,
-        JOYDEVICEADDED        = SDL_JOYDEVICEADDED,
-        JOYDEVICEREMOVED      = SDL_JOYDEVICEREMOVED,
-        CONTROLLERBUTTONDOWN  = SDL_CONTROLLERBUTTONDOWN,
-        CONTROLLERBUTTONUP    = SDL_CONTROLLERBUTTONUP,
-        CONTROLLERAXISMOTION  = SDL_CONTROLLERAXISMOTION,
-        /* window evnets */
-        WINDOW_EVENT = SDL_WINDOWEVENT,
-    };
+        enum EventType {
+            QUIT            = SDL_QUIT,
+            /* keyboard events */
+            KEY_DOWN         = SDL_KEYDOWN,
+            KEY_UP           = SDL_KEYUP,
+            /* mouse events */
+            MOUSE_MOTION     = SDL_MOUSEMOTION,
+            MOUSE_BUTTON_DOWN = SDL_MOUSEBUTTONDOWN,
+            MOUSE_BUTTON_UP   = SDL_MOUSEBUTTONUP,
+            MOUSE_WHEEL      = SDL_MOUSEWHEEL,
+            /* joypad events */
+            JOYBUTTONDOWN         = SDL_JOYBUTTONDOWN,
+            JOYBUTTONUP           = SDL_JOYBUTTONUP,
+            JOYAXISMOTION         = SDL_JOYAXISMOTION,
+            JOYBALLMOTION         = SDL_JOYBALLMOTION,
+            JOYHATMOTION          = SDL_JOYHATMOTION,
+            JOYDEVICEADDED        = SDL_JOYDEVICEADDED,
+            JOYDEVICEREMOVED      = SDL_JOYDEVICEREMOVED,
+            CONTROLLERBUTTONDOWN  = SDL_CONTROLLERBUTTONDOWN,
+            CONTROLLERBUTTONUP    = SDL_CONTROLLERBUTTONUP,
+            CONTROLLERAXISMOTION  = SDL_CONTROLLERAXISMOTION,
+            /* window evnets */
+            WINDOW_EVENT = SDL_WINDOWEVENT,
+        };
 
-    enum WindowEvent {
-        WINDOW_SHOWN       = SDL_WINDOWEVENT_SHOWN      , 
-        WINDOW_HIDDEN      = SDL_WINDOWEVENT_HIDDEN     ,
-        WINDOW_EXPOSED     = SDL_WINDOWEVENT_EXPOSED    ,
-        WINDOW_MOVED       = SDL_WINDOWEVENT_MOVED      ,
-        WINDOW_RESIZED     = SDL_WINDOWEVENT_RESIZED     ,
-        WINDOW_SIZE_CAHNGE  = SDL_WINDOWEVENT_SIZE_CHANGED ,
-        WINDOW_MINIMIZED   = SDL_WINDOWEVENT_MINIMIZED  ,
-        WINDOW_MAXIMIZED   = SDL_WINDOWEVENT_MAXIMIZED  ,
-        WINDOW_RESTORED    = SDL_WINDOWEVENT_RESTORED   ,
-        WINDOW_ENTER       = SDL_WINDOWEVENT_ENTER      ,
-        WINDOW_LEAVE       = SDL_WINDOWEVENT_LEAVE      ,
-        WINDOW_FOCUS_GAINED = SDL_WINDOWEVENT_FOCUS_GAINED,
-        WINDOW_FOCUS_LOST   = SDL_WINDOWEVENT_FOCUS_LOST  ,
-        WINDOW_CLOSE       = SDL_WINDOWEVENT_CLOSE       ,
-        WINDOW_TAKE_FOCUS   = SDL_WINDOWEVENT_TAKE_FOCUS  ,
-        WINDOW_HIT_TEST     = SDL_WINDOWEVENT_HIT_TEST    ,
-    };
+        enum WindowEvent {
+            WINDOW_SHOWN       = SDL_WINDOWEVENT_SHOWN      , 
+            WINDOW_HIDDEN      = SDL_WINDOWEVENT_HIDDEN     ,
+            WINDOW_EXPOSED     = SDL_WINDOWEVENT_EXPOSED    ,
+            WINDOW_MOVED       = SDL_WINDOWEVENT_MOVED      ,
+            WINDOW_RESIZED     = SDL_WINDOWEVENT_RESIZED     ,
+            WINDOW_SIZE_CAHNGE  = SDL_WINDOWEVENT_SIZE_CHANGED ,
+            WINDOW_MINIMIZED   = SDL_WINDOWEVENT_MINIMIZED  ,
+            WINDOW_MAXIMIZED   = SDL_WINDOWEVENT_MAXIMIZED  ,
+            WINDOW_RESTORED    = SDL_WINDOWEVENT_RESTORED   ,
+            WINDOW_ENTER       = SDL_WINDOWEVENT_ENTER      ,
+            WINDOW_LEAVE       = SDL_WINDOWEVENT_LEAVE      ,
+            WINDOW_FOCUS_GAINED = SDL_WINDOWEVENT_FOCUS_GAINED,
+            WINDOW_FOCUS_LOST   = SDL_WINDOWEVENT_FOCUS_LOST  ,
+            WINDOW_CLOSE       = SDL_WINDOWEVENT_CLOSE       ,
+            WINDOW_TAKE_FOCUS   = SDL_WINDOWEVENT_TAKE_FOCUS  ,
+            WINDOW_HIT_TEST     = SDL_WINDOWEVENT_HIT_TEST    ,
+        };
 
-    inline int pollEvent(Event* e)
-    {
-        return SDL_PollEvent(e);
-    }
+        inline int pollEvent(Event* e)
+        {
+            return SDL_PollEvent(e);
+        }
 
-    inline const char* getKeyName(Key key)
-    {
-        return SDL_GetKeyName(key);
-    }
+        inline const char* getKeyName(Key key)
+        {
+            return SDL_GetKeyName(key);
+        }
 
-    inline const char* getButtonName(int button)
-    {
-        switch (button) 
+        inline const char* getButtonName(int button)
         {
-            case 1: return "Left";
-            case 2: return "Middle";
-            case 3: return "Right";
-            case 4: return "WheelUp";
-            case 5: return "WheelDown";
-            default: return "?";
+            switch (button) 
+            {
+                case 1: return "Left";
+                case 2: return "Middle";
+                case 3: return "Right";
+                case 4: return "WheelUp";
+                case 5: return "WheelDown";
+                default: return "?";
+            }
         }
-    }
 
-/*
-    inline const char* getWheelName(Wheel wheel)
-    {
-        if (wheel.x == -1)
-            return "left";
-        else if (wheel.x == 1)
-            return "right";
-        else if (wheel.y == -1)
-            return "near";
-        else if (wheel.y == 1)
-            return "far";
-        else
-            return "none";
-    }
-*/
+    /*
+        inline const char* getWheelName(Wheel wheel)
+        {
+            if (wheel.x == -1)
+                return "left";
+            else if (wheel.x == 1)
+                return "right";
+            else if (wheel.y == -1)
+                return "near";
+            else if (wheel.y == 1)
+                return "far";
+            else
+                return "none";
+        }
+    */
 
-#endif // LIBJIN_INPUT_SDL
-} // input
-} // jin
+    #endif // LIBJIN_INPUT_SDL
+    } // input
+    } // jin
 
-#endif // LIBJIN_MODULES_INPUT
+    #endif // LIBJIN_MODULES_INPUT
 #endif
\ No newline at end of file
diff --git a/src/libjin/Input/Joypad.h b/src/libjin/Input/Joypad.h
index b630aa5..50cbe01 100644
--- a/src/libjin/Input/Joypad.h
+++ b/src/libjin/Input/Joypad.h
@@ -5,46 +5,46 @@
 
 namespace jin
 {
-namespace input
-{
-
-    inline const char* getJoyButtonName(int button)
+    namespace input
     {
-        switch (button)
+
+        inline const char* getJoyButtonName(int button)
         {
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_A: return "A"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_B : return "B"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_X : return "X"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_Y: return "Y"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK: return "Back"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE: return "Guide"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_START: return "Start"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSTICK: return "LeftStick"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSTICK: return "RightStick"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return "LeftShoulder"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return "RightShoulder"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP: return "DpadUp"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN: return "DpadDown"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT: return "DpadLeft"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT: return "DpadRight"; break;
-            default: return NULL;
+            switch (button)
+            {
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_A: return "A"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_B : return "B"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_X : return "X"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_Y: return "Y"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK: return "Back"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE: return "Guide"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_START: return "Start"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSTICK: return "LeftStick"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSTICK: return "RightStick"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return "LeftShoulder"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return "RightShoulder"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP: return "DpadUp"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN: return "DpadDown"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT: return "DpadLeft"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT: return "DpadRight"; break;
+                default: return NULL;
+            }
         }
-    }
 
-    inline const char* getJoyAxisName(int axis)
-    {
-        switch (axis)
+        inline const char* getJoyAxisName(int axis)
         {
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX: return "LeftX"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY: return "LeftY"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX: return "RightX"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY: return "RightY"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERLEFT: return "TriggerLeft"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERRIGHT: return "TriggerRight"; break;
+            switch (axis)
+            {
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX: return "LeftX"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY: return "LeftY"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX: return "RightX"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY: return "RightY"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERLEFT: return "TriggerLeft"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERRIGHT: return "TriggerRight"; break;
+            }
         }
-    }
 
-} // input
+    } // input
 } // jin
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/input/event.h b/src/libjin/input/event.h
index 7ab07da..9a31c06 100644
--- a/src/libjin/input/event.h
+++ b/src/libjin/input/event.h
@@ -5,101 +5,101 @@
 
 namespace jin
 {
-namespace input
-{ 
-#if LIBJIN_INPUT_SDL
-#include "SDL.h"
+    namespace input
+    { 
+    #if LIBJIN_INPUT_SDL
+    #include "SDL.h"
     
-    typedef SDL_Event           Event;
-    typedef SDL_Keycode         Key;
-    typedef SDL_MouseWheelEvent Wheel;
+        typedef SDL_Event           Event;
+        typedef SDL_Keycode         Key;
+        typedef SDL_MouseWheelEvent Wheel;
 
-    enum EventType {
-        QUIT            = SDL_QUIT,
-        /* keyboard events */
-        KEY_DOWN         = SDL_KEYDOWN,
-        KEY_UP           = SDL_KEYUP,
-        /* mouse events */
-        MOUSE_MOTION     = SDL_MOUSEMOTION,
-        MOUSE_BUTTON_DOWN = SDL_MOUSEBUTTONDOWN,
-        MOUSE_BUTTON_UP   = SDL_MOUSEBUTTONUP,
-        MOUSE_WHEEL      = SDL_MOUSEWHEEL,
-        /* joypad events */
-        JOYBUTTONDOWN         = SDL_JOYBUTTONDOWN,
-        JOYBUTTONUP           = SDL_JOYBUTTONUP,
-        JOYAXISMOTION         = SDL_JOYAXISMOTION,
-        JOYBALLMOTION         = SDL_JOYBALLMOTION,
-        JOYHATMOTION          = SDL_JOYHATMOTION,
-        JOYDEVICEADDED        = SDL_JOYDEVICEADDED,
-        JOYDEVICEREMOVED      = SDL_JOYDEVICEREMOVED,
-        CONTROLLERBUTTONDOWN  = SDL_CONTROLLERBUTTONDOWN,
-        CONTROLLERBUTTONUP    = SDL_CONTROLLERBUTTONUP,
-        CONTROLLERAXISMOTION  = SDL_CONTROLLERAXISMOTION,
-        /* window evnets */
-        WINDOW_EVENT = SDL_WINDOWEVENT,
-    };
+        enum EventType {
+            QUIT            = SDL_QUIT,
+            /* keyboard events */
+            KEY_DOWN         = SDL_KEYDOWN,
+            KEY_UP           = SDL_KEYUP,
+            /* mouse events */
+            MOUSE_MOTION     = SDL_MOUSEMOTION,
+            MOUSE_BUTTON_DOWN = SDL_MOUSEBUTTONDOWN,
+            MOUSE_BUTTON_UP   = SDL_MOUSEBUTTONUP,
+            MOUSE_WHEEL      = SDL_MOUSEWHEEL,
+            /* joypad events */
+            JOYBUTTONDOWN         = SDL_JOYBUTTONDOWN,
+            JOYBUTTONUP           = SDL_JOYBUTTONUP,
+            JOYAXISMOTION         = SDL_JOYAXISMOTION,
+            JOYBALLMOTION         = SDL_JOYBALLMOTION,
+            JOYHATMOTION          = SDL_JOYHATMOTION,
+            JOYDEVICEADDED        = SDL_JOYDEVICEADDED,
+            JOYDEVICEREMOVED      = SDL_JOYDEVICEREMOVED,
+            CONTROLLERBUTTONDOWN  = SDL_CONTROLLERBUTTONDOWN,
+            CONTROLLERBUTTONUP    = SDL_CONTROLLERBUTTONUP,
+            CONTROLLERAXISMOTION  = SDL_CONTROLLERAXISMOTION,
+            /* window evnets */
+            WINDOW_EVENT = SDL_WINDOWEVENT,
+        };
 
-    enum WindowEvent {
-        WINDOW_SHOWN       = SDL_WINDOWEVENT_SHOWN      , 
-        WINDOW_HIDDEN      = SDL_WINDOWEVENT_HIDDEN     ,
-        WINDOW_EXPOSED     = SDL_WINDOWEVENT_EXPOSED    ,
-        WINDOW_MOVED       = SDL_WINDOWEVENT_MOVED      ,
-        WINDOW_RESIZED     = SDL_WINDOWEVENT_RESIZED     ,
-        WINDOW_SIZE_CAHNGE  = SDL_WINDOWEVENT_SIZE_CHANGED ,
-        WINDOW_MINIMIZED   = SDL_WINDOWEVENT_MINIMIZED  ,
-        WINDOW_MAXIMIZED   = SDL_WINDOWEVENT_MAXIMIZED  ,
-        WINDOW_RESTORED    = SDL_WINDOWEVENT_RESTORED   ,
-        WINDOW_ENTER       = SDL_WINDOWEVENT_ENTER      ,
-        WINDOW_LEAVE       = SDL_WINDOWEVENT_LEAVE      ,
-        WINDOW_FOCUS_GAINED = SDL_WINDOWEVENT_FOCUS_GAINED,
-        WINDOW_FOCUS_LOST   = SDL_WINDOWEVENT_FOCUS_LOST  ,
-        WINDOW_CLOSE       = SDL_WINDOWEVENT_CLOSE       ,
-        WINDOW_TAKE_FOCUS   = SDL_WINDOWEVENT_TAKE_FOCUS  ,
-        WINDOW_HIT_TEST     = SDL_WINDOWEVENT_HIT_TEST    ,
-    };
+        enum WindowEvent {
+            WINDOW_SHOWN       = SDL_WINDOWEVENT_SHOWN      , 
+            WINDOW_HIDDEN      = SDL_WINDOWEVENT_HIDDEN     ,
+            WINDOW_EXPOSED     = SDL_WINDOWEVENT_EXPOSED    ,
+            WINDOW_MOVED       = SDL_WINDOWEVENT_MOVED      ,
+            WINDOW_RESIZED     = SDL_WINDOWEVENT_RESIZED     ,
+            WINDOW_SIZE_CAHNGE  = SDL_WINDOWEVENT_SIZE_CHANGED ,
+            WINDOW_MINIMIZED   = SDL_WINDOWEVENT_MINIMIZED  ,
+            WINDOW_MAXIMIZED   = SDL_WINDOWEVENT_MAXIMIZED  ,
+            WINDOW_RESTORED    = SDL_WINDOWEVENT_RESTORED   ,
+            WINDOW_ENTER       = SDL_WINDOWEVENT_ENTER      ,
+            WINDOW_LEAVE       = SDL_WINDOWEVENT_LEAVE      ,
+            WINDOW_FOCUS_GAINED = SDL_WINDOWEVENT_FOCUS_GAINED,
+            WINDOW_FOCUS_LOST   = SDL_WINDOWEVENT_FOCUS_LOST  ,
+            WINDOW_CLOSE       = SDL_WINDOWEVENT_CLOSE       ,
+            WINDOW_TAKE_FOCUS   = SDL_WINDOWEVENT_TAKE_FOCUS  ,
+            WINDOW_HIT_TEST     = SDL_WINDOWEVENT_HIT_TEST    ,
+        };
 
-    inline int pollEvent(Event* e)
-    {
-        return SDL_PollEvent(e);
-    }
+        inline int pollEvent(Event* e)
+        {
+            return SDL_PollEvent(e);
+        }
 
-    inline const char* getKeyName(Key key)
-    {
-        return SDL_GetKeyName(key);
-    }
+        inline const char* getKeyName(Key key)
+        {
+            return SDL_GetKeyName(key);
+        }
 
-    inline const char* getButtonName(int button)
-    {
-        switch (button) 
+        inline const char* getButtonName(int button)
         {
-            case 1: return "Left";
-            case 2: return "Middle";
-            case 3: return "Right";
-            case 4: return "WheelUp";
-            case 5: return "WheelDown";
-            default: return "?";
+            switch (button) 
+            {
+                case 1: return "Left";
+                case 2: return "Middle";
+                case 3: return "Right";
+                case 4: return "WheelUp";
+                case 5: return "WheelDown";
+                default: return "?";
+            }
         }
-    }
 
-/*
-    inline const char* getWheelName(Wheel wheel)
-    {
-        if (wheel.x == -1)
-            return "left";
-        else if (wheel.x == 1)
-            return "right";
-        else if (wheel.y == -1)
-            return "near";
-        else if (wheel.y == 1)
-            return "far";
-        else
-            return "none";
-    }
-*/
+    /*
+        inline const char* getWheelName(Wheel wheel)
+        {
+            if (wheel.x == -1)
+                return "left";
+            else if (wheel.x == 1)
+                return "right";
+            else if (wheel.y == -1)
+                return "near";
+            else if (wheel.y == 1)
+                return "far";
+            else
+                return "none";
+        }
+    */
 
-#endif // LIBJIN_INPUT_SDL
-} // input
-} // jin
+    #endif // LIBJIN_INPUT_SDL
+    } // input
+    } // jin
 
-#endif // LIBJIN_MODULES_INPUT
+    #endif // LIBJIN_MODULES_INPUT
 #endif
\ No newline at end of file
diff --git a/src/libjin/input/joypad.h b/src/libjin/input/joypad.h
index b630aa5..50cbe01 100644
--- a/src/libjin/input/joypad.h
+++ b/src/libjin/input/joypad.h
@@ -5,46 +5,46 @@
 
 namespace jin
 {
-namespace input
-{
-
-    inline const char* getJoyButtonName(int button)
+    namespace input
     {
-        switch (button)
+
+        inline const char* getJoyButtonName(int button)
         {
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_A: return "A"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_B : return "B"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_X : return "X"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_Y: return "Y"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK: return "Back"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE: return "Guide"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_START: return "Start"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSTICK: return "LeftStick"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSTICK: return "RightStick"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return "LeftShoulder"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return "RightShoulder"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP: return "DpadUp"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN: return "DpadDown"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT: return "DpadLeft"; break;
-            case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT: return "DpadRight"; break;
-            default: return NULL;
+            switch (button)
+            {
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_A: return "A"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_B : return "B"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_X : return "X"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_Y: return "Y"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK: return "Back"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE: return "Guide"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_START: return "Start"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSTICK: return "LeftStick"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSTICK: return "RightStick"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return "LeftShoulder"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return "RightShoulder"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP: return "DpadUp"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN: return "DpadDown"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT: return "DpadLeft"; break;
+                case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT: return "DpadRight"; break;
+                default: return NULL;
+            }
         }
-    }
 
-    inline const char* getJoyAxisName(int axis)
-    {
-        switch (axis)
+        inline const char* getJoyAxisName(int axis)
         {
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX: return "LeftX"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY: return "LeftY"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX: return "RightX"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY: return "RightY"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERLEFT: return "TriggerLeft"; break;
-            case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERRIGHT: return "TriggerRight"; break;
+            switch (axis)
+            {
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX: return "LeftX"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY: return "LeftY"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX: return "RightX"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY: return "RightY"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERLEFT: return "TriggerLeft"; break;
+                case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERRIGHT: return "TriggerRight"; break;
+            }
         }
-    }
 
-} // input
+    } // input
 } // jin
 
 #endif
\ No newline at end of file
diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp
index 2963fa9..4ef2b56 100644
--- a/src/lua/modules/graphics/graphics.cpp
+++ b/src/lua/modules/graphics/graphics.cpp
@@ -412,7 +412,7 @@ namespace lua
         if (luax_gettop(L) == 4)
             context.curRenderColor.a = luax_checknumber(L, 4);
         else
-            context.curClearColor.a = 255;
+            context.curRenderColor.a = 255;
         glColor4f(context.curRenderColor.r / 255.f,
             context.curRenderColor.g / 255.f,
             context.curRenderColor.b / 255.f,