格式化代码

9 files changed, 166 insertions, 166 deletions

diff --git a/src/3rdparty/tekcos/tekcos.c b/src/3rdparty/tekcos/tekcos.c
index 50b22c0..9e72c86 100644
--- a/src/3rdparty/tekcos/tekcos.c
+++ b/src/3rdparty/tekcos/tekcos.c
@@ -151,9 +151,9 @@ int tk_tcp_close(tk_TCPsocket* sk)
 #ifdef _WIN32
         closesocket(sk->id); 
 #else
-	close(sk->id);
+    close(sk->id);
 #endif        
-	free(sk);
+    free(sk);
         return 1;
     }
 error:
@@ -256,7 +256,7 @@ int tk_tcp_nonblocking(tk_TCPsocket* sk)
         ioctl(sk->id, FIONBIO, &dontblock);
     }
 #endif
-	return 1;
+    return 1;
 }
 
 int tk_tcp_blocking(tk_TCPsocket* sk)
@@ -277,7 +277,7 @@ int tk_tcp_blocking(tk_TCPsocket* sk)
         ioctl(sk->id, FIONBIO, &dontblock);
     }
 #endif
-	return 1; 
+    return 1; 
 }
 
 /***************************************************
@@ -370,17 +370,17 @@ int tk_udp_close(tk_UDPsocket* sk)
 #ifdef _WIN32
             closesocket(sk->id);
 #else
-	    close(sk->id);
+        close(sk->id);
 #endif
         }
         free(sk);
     }
-	return 1; 
+    return 1; 
 }
 
 int tk_freepack(tk_UDPpack* pack)
 {
     free(pack->data);
     free(pack);
-	return 1; 
+    return 1; 
 }
diff --git a/src/libjin/audio/source.h b/src/libjin/audio/source.h
index ad9a8ba..a8e40fe 100644
--- a/src/libjin/audio/source.h
+++ b/src/libjin/audio/source.h
@@ -8,8 +8,8 @@ namespace jin
 namespace audio
 {
 
-	class Source
-	{
+    class Source
+    {
     public:
         void play(); 
         void stop(); 
@@ -22,7 +22,7 @@ namespace audio
         void setPitch(float pitch); 
         void setVolume(float volume); 
 
-	};
+    };
 
 }
 }
diff --git a/src/libjin/render/color.h b/src/libjin/render/color.h
index 6f34b4a..856cd48 100644
--- a/src/libjin/render/color.h
+++ b/src/libjin/render/color.h
@@ -10,16 +10,16 @@ namespace jin
 namespace render
 {
 
-	union color {
-		struct {
+    union color {
+        struct {
 #if JIN_BYTEORDER == JIN_BIG_ENDIAN
-			unsigned char r, g, b, a;
+            unsigned char r, g, b, a;
 #else 
-			unsigned char a, b, g, r;
+            unsigned char a, b, g, r;
 #endif
-		}rgba;
-		int word;
-	};
+        }rgba;
+        int word;
+    };
 
 }
 } 
diff --git a/src/libjin/render/font.cpp b/src/libjin/render/font.cpp
index 287e0c0..8a96f25 100644
--- a/src/libjin/render/font.cpp
+++ b/src/libjin/render/font.cpp
@@ -165,7 +165,7 @@ namespace render
         int maxX = 0; 
 
         float factor = fheight / (float)PIXEL_HEIGHT;
-		
+        
          for (int i = 0; i < len; ++i)
         {
             char c = str[i]; 
diff --git a/src/libjin/render/image.cpp b/src/libjin/render/image.cpp
index 5de997a..583bd8d 100644
--- a/src/libjin/render/image.cpp
+++ b/src/libjin/render/image.cpp
@@ -26,10 +26,10 @@ namespace render
 
     color Image::getPixel(int x, int y)
     {
-		if (without(x, 0, width) || without(y, 0, height))
-		{
-			return { 0 };
-		}
+        if (without(x, 0, width) || without(y, 0, height))
+        {
+            return { 0 };
+        }
         return pixels[x + y * width];
     }
     
diff --git a/src/libjin/render/jsl.h b/src/libjin/render/jsl.h
index aff7fea..35479d3 100644
--- a/src/libjin/render/jsl.h
+++ b/src/libjin/render/jsl.h
@@ -36,11 +36,11 @@ namespace render
 
         void sendFloat(const char* name, float number);
         void sendImage(const char*  name, const Image* image);
-		void sendVec2(const char* name, float x, float y);
-		void sendVec3(const char* name, float x, float y, float z);
-		void sendVec4(const char* name, float x, float y, float z, float w);
-		void sendCanvas(const char* name, const Canvas* canvas);
-		void sendColor(const char* name, const color* col);
+        void sendVec2(const char* name, float x, float y);
+        void sendVec3(const char* name, float x, float y, float z);
+        void sendVec4(const char* name, float x, float y, float z, float w);
+        void sendCanvas(const char* name, const Canvas* canvas);
+        void sendColor(const char* name, const color* col);
 
         static inline JSLProgram* getCurrentJSL()
         {
@@ -53,11 +53,11 @@ namespace render
 
         std::map<std::string, GLint> texturePool;
 
-		static JSLProgram* currentJSLProgram;
+        static JSLProgram* currentJSLProgram;
         static GLint currentTextureUnit;
-		static GLint maxTextureUnits;
+        static GLint maxTextureUnits;
 
-		GLint getTextureUnit(const std::string& name);
+        GLint getTextureUnit(const std::string& name);
 
         inline void initialize(const char* program);
         inline void destroy();
diff --git a/src/script/embed/boot.lua b/src/script/embed/boot.lua
index 6f846ae..2f6fa93 100644
--- a/src/script/embed/boot.lua
+++ b/src/script/embed/boot.lua
@@ -26,7 +26,7 @@ jin.filesystem.mount(jin._argv[2])
 -- config
 local conf = {} 
 if jin.filesystem.exist("config.lua") then 
-	conf = require "config"	
+    conf = require "config"    
 end 
 conf.width = conf.width or 600 
 conf.height = conf.height or 500 
@@ -38,7 +38,7 @@ jin.graphics.init(conf.width,conf.height,conf.title)
 
 -- open debug mode, must after jin.graphics.init
 if jin._argv[3] == '-d' then 
-	jin.debug.init()
+    jin.debug.init()
 end
 
 function jin.core.run()
@@ -74,21 +74,21 @@ function jin.core.run()
             jin.core.onUpdate(dt)
         end
         
-		-- bind to default render buffer 
-		jin.graphics.bind() 
-		jin.graphics.clear() 
-		jin.graphics.color()
-		jin.graphics.study()
+        -- bind to default render buffer 
+        jin.graphics.bind() 
+        jin.graphics.clear() 
+        jin.graphics.color()
+        jin.graphics.study()
 
-		-- custom drawing
-		if jin.core.onDraw then 
+        -- custom drawing
+        if jin.core.onDraw then 
             jin.core.onDraw() 
         end
-		
-		-- render debug window
-		if jin.debug.status() then 
-			jin.debug.render()
-		end 		
+        
+        -- render debug window
+        if jin.debug.status() then 
+            jin.debug.render()
+        end         
 
         -- swap window buffer 
         jin.graphics.present()
@@ -97,36 +97,36 @@ function jin.core.run()
 end
 
 local function onError(msg) 
-	local tab = '    '
-	print("Error:\n" .. msg)
-	function jin.core.onEvent(e) 
-		if e.type == 'quit' then 
-			jin.core.quit()
-		end
-	end
-	local ww, wh = jin.graphics.size() 
-	function jin.core.onDraw() 
-		jin.graphics.write("Error: ", 10, 10, 30, 3, 30)
-		jin.graphics.write(msg, 10, 50) 
-	end
+    local tab = '    '
+    print("Error:\n" .. msg)
+    function jin.core.onEvent(e) 
+        if e.type == 'quit' then 
+            jin.core.quit()
+        end
+    end
+    local ww, wh = jin.graphics.size() 
+    function jin.core.onDraw() 
+        jin.graphics.write("Error: ", 10, 10, 30, 3, 30)
+        jin.graphics.write(msg, 10, 50) 
+    end
 end
 
 if jin.filesystem.exist("main.lua") then 
-	-- require main game script
-	xpcall(function() require"main" end, onError)
-	jin.core.run()
+    -- require main game script
+    xpcall(function() require"main" end, onError)
+    jin.core.run()
 else 
-	-- no game 
-	function jin.core.onEvent(e) 
-		if e.type == 'quit' then 
-			jin.core.quit()
-		end
-	end
-	function jin.core.onDraw() 
-		jin.graphics.clear(111, 134, 125, 255) 
-		local ww, wh = jin.graphics.size() 
-		local fw, fh = jin.graphics.box("no game", 20, 1, 20)
-		jin.graphics.write("no game", ww /2 - fw / 2, wh * 2/3, 16, 1, 18)
-	end
-	jin.core.run()
+    -- no game 
+    function jin.core.onEvent(e) 
+        if e.type == 'quit' then 
+            jin.core.quit()
+        end
+    end
+    function jin.core.onDraw() 
+        jin.graphics.clear(111, 134, 125, 255) 
+        local ww, wh = jin.graphics.size() 
+        local fw, fh = jin.graphics.box("no game", 20, 1, 20)
+        jin.graphics.write("no game", ww /2 - fw / 2, wh * 2/3, 16, 1, 18)
+    end
+    jin.core.run()
 end
diff --git a/src/script/embed/boot.lua.h b/src/script/embed/boot.lua.h
index afe352a..223f354 100644
--- a/src/script/embed/boot.lua.h
+++ b/src/script/embed/boot.lua.h
@@ -25,7 +25,7 @@ jin.filesystem.mount(jin._argv[2])
 -- config
 local conf = {} 
 if jin.filesystem.exist("config.lua") then 
-	conf = require "config"	
+    conf = require "config"    
 end
 conf.width  = conf.width  or 600 
 conf.height = conf.height or 500 
@@ -39,22 +39,22 @@ jin.graphics.init(conf)
 
 -- open debug mode, must after jin.graphics.init
 if jin._argv[3] == '-d' then 
-	jin.debug.init()
+    jin.debug.init()
 end
 
 function jin.core.run()
-	local load     = jin.core.load
-	local running  = jin.core.running
-	local second   = jin.time.second
-	local sleep    = jin.time.sleep
-	local poll     = jin.event.poll
-	local unbind   = jin.graphics.unbind 
-	local clear    = jin.graphics.clear 
-	local color    = jin.graphics.color 
-	local study    = jin.graphics.study
-	local onDraw   = jin.core.onDraw
-	local onUpdate = jin.core.onUpdate
-	local present  = jin.graphics.present
+    local load     = jin.core.load
+    local running  = jin.core.running
+    local second   = jin.time.second
+    local sleep    = jin.time.sleep
+    local poll     = jin.event.poll
+    local unbind   = jin.graphics.unbind 
+    local clear    = jin.graphics.clear 
+    local color    = jin.graphics.color 
+    local study    = jin.graphics.study
+    local onDraw   = jin.core.onDraw
+    local onUpdate = jin.core.onUpdate
+    local present  = jin.graphics.present
 
     local dstatus  = jin.debug.status   
     local drender  = jin.debug.render
@@ -92,21 +92,21 @@ function jin.core.run()
             onUpdate(dt)
         end
         
-		-- bind to default render buffer 
-		unbind() 
-		clear() 
-		color()
-		study()
-
-		-- custom drawing
-		if onDraw then 
+        -- bind to default render buffer 
+        unbind() 
+        clear() 
+        color()
+        study()
+
+        -- custom drawing
+        if onDraw then 
             onDraw()
         end
-		
-		-- render debug window
-		if dstatus() then 
-			drender()
-		end
+        
+        -- render debug window
+        if dstatus() then 
+            drender()
+        end
 
         -- swap window buffer 
         present()
@@ -114,40 +114,40 @@ function jin.core.run()
 end
 
 local function onError(msg) 
-	local tab = '    '
-	print("Error:\n" .. msg)
-	function jin.core.onEvent(e) 
-		if e.type == 'quit' then 
-			jin.core.quit()
-		end
-	end
-	local ww, wh = jin.graphics.size() 
-	function jin.core.onDraw() 
-		jin.graphics.write("Error: ", 10, 10, 30, 3, 30)
-		jin.graphics.write(msg, 10, 50) 
-	end
+    local tab = '    '
+    print("Error:\n" .. msg)
+    function jin.core.onEvent(e) 
+        if e.type == 'quit' then 
+            jin.core.quit()
+        end
+    end
+    local ww, wh = jin.graphics.size() 
+    function jin.core.onDraw() 
+        jin.graphics.write("Error: ", 10, 10, 30, 3, 30)
+        jin.graphics.write(msg, 10, 50) 
+    end
 end
 
 local function main() 
-	if jin.filesystem.exist("main.lua") then 
-		-- require main game script
-		xpcall(function() require"main" end, onError)
-		jin.core.run()
-	else 
-		-- no game 
-		function jin.core.onEvent(e) 
-			if e.type == 'quit' then 
-				jin.core.quit()
-			end
-		end
-		function jin.core.onDraw() 
-			jin.graphics.clear(111, 134, 125, 255) 
-			local ww, wh = jin.graphics.size() 
-			local fw, fh = jin.graphics.box("no game", 20, 1, 20)
-			jin.graphics.write("no game", ww /2 - fw / 2, wh * 2/3, 16, 1, 18)
-		end
-		jin.core.run()
-	end
+    if jin.filesystem.exist("main.lua") then 
+        -- require main game script
+        xpcall(function() require"main" end, onError)
+        jin.core.run()
+    else 
+        -- no game 
+        function jin.core.onEvent(e) 
+            if e.type == 'quit' then 
+                jin.core.quit()
+            end
+        end
+        function jin.core.onDraw() 
+            jin.graphics.clear(111, 134, 125, 255) 
+            local ww, wh = jin.graphics.size() 
+            local fw, fh = jin.graphics.box("no game", 20, 1, 20)
+            jin.graphics.write("no game", ww /2 - fw / 2, wh * 2/3, 16, 1, 18)
+        end
+        jin.core.run()
+    end
 end 
 
 main()
diff --git a/src/script/embed/debug.lua b/src/script/embed/debug.lua
index fbf0967..76f59ed 100644
--- a/src/script/embed/debug.lua
+++ b/src/script/embed/debug.lua
@@ -31,27 +31,27 @@ local refresh = true
 
 function jin.debug.init()
     debug = true
-	panel = jin.graphics.Canvas(jin.graphics.size()) 
+    panel = jin.graphics.Canvas(jin.graphics.size()) 
 end
 
 -- set buffer size 
 function jin.debug.size(c)
-	bsize = c
+    bsize = c
 end 
 
 function jin.debug.print(msg)
-	if not debug then return end 
-
-	msg = tostring(msg)
-	local tp = type(msg)
-	if tp ~= "string" and tp ~= "number" then 
-		msg = string.format("print failed, expect string or number but get a %s", tp)
-	end
-	
+    if not debug then return end 
+
+    msg = tostring(msg)
+    local tp = type(msg)
+    if tp ~= "string" and tp ~= "number" then 
+        msg = string.format("print failed, expect string or number but get a %s", tp)
+    end
+    
     -- remove the first one (old msg)
-	if #buffer >= bsize then 
-		table.remove(buffer, 1)
-	end 
+    if #buffer >= bsize then 
+        table.remove(buffer, 1)
+    end 
     
     buffer[#buffer + 1] = msg
     refresh = true
@@ -59,33 +59,33 @@ end
 
 -- clear debug buffer 
 function jin.debug.clear()
-	buffer = {} 
+    buffer = {} 
 end
 
 local function getStrHeight(str, lheight) 
-	local h = lheight
-	if #str == 0 then 
-		h = 0
-	end 
-	for i = 1, #str do 
-		local c = string.sub(str, i, i)
-		if c == '\n' then 
-			h = h + lheight
-		end 
-	end 
-	return h 
+    local h = lheight
+    if #str == 0 then 
+        h = 0
+    end 
+    for i = 1, #str do 
+        local c = string.sub(str, i, i)
+        if c == '\n' then 
+            h = h + lheight
+        end 
+    end 
+    return h 
 end
 
 local  function getBgQuad() 
-	local width, height = 0, 0 	
-	for i = 1, #buffer do
-		local w, h = jin.graphics.box( buffer[i], fsize, 1, lheight)
-		height = height + h 
-		if width < w then
-			width = w 
-		end 
-	end	
-	return width, height
+    local width, height = 0, 0     
+    for i = 1, #buffer do
+        local w, h = jin.graphics.box( buffer[i], fsize, 1, lheight)
+        height = height + h 
+        if width < w then
+            width = w 
+        end 
+    end    
+    return width, height
 end 
 
 -- render to screen
@@ -113,7 +113,7 @@ function jin.debug.render()
                 y = y - h 
                 jin.graphics.write(msg, margin / 2, y - margin/ 2, fsize, 1, lheight) 
             end
-	
+    
         jin.graphics.bind()
     
         refresh = false
@@ -124,5 +124,5 @@ function jin.debug.render()
 end
 
 function jin.debug.status() 
-	return debug 
+    return debug 
 end