Browse Source

More float quad work (issue #285)

Bart van Strien 14 years ago
parent
commit
5c43ba2779

+ 1 - 1
src/modules/graphics/opengl/Graphics.cpp

@@ -492,7 +492,7 @@ namespace opengl
 		return image;
 		return image;
 	}
 	}
 
 
-	Quad * Graphics::newQuad(int x, int y, int w, int h, int sw, int sh)
+	Quad * Graphics::newQuad(float x, float y, float w, float h, float sw, float sh)
 	{
 	{
 		Quad::Viewport v;
 		Quad::Viewport v;
 		v.x = x;
 		v.x = x;

+ 1 - 1
src/modules/graphics/opengl/Graphics.h

@@ -276,7 +276,7 @@ namespace opengl
 		/**
 		/**
 		* Creates a Quad object.
 		* Creates a Quad object.
 		**/
 		**/
-		Quad * newQuad(int x, int y, int w, int h, int sw, int sh);
+		Quad * newQuad(float x, float y, float w, float h, float sw, float sh);
 
 
 		/**
 		/**
 		* Creates a Font object.
 		* Creates a Font object.

+ 6 - 6
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -226,12 +226,12 @@ namespace opengl
 
 
 	int w_newQuad(lua_State * L)
 	int w_newQuad(lua_State * L)
 	{
 	{
-		int x = luaL_checknumber(L, 1);
-		int y = luaL_checknumber(L, 2);
-		int w = luaL_checknumber(L, 3);
-		int h = luaL_checknumber(L, 4);
-		int sw = luaL_checknumber(L, 5);
-		int sh = luaL_checknumber(L, 6);
+		float x = (float) luaL_checknumber(L, 1);
+		float y = (float) luaL_checknumber(L, 2);
+		float w = (float) luaL_checknumber(L, 3);
+		float h = (float) luaL_checknumber(L, 4);
+		float sw = (float) luaL_checknumber(L, 5);
+		float sh = (float) luaL_checknumber(L, 6);
 
 
 		Quad * frame = instance->newQuad(x, y, w, h, sw, sh);
 		Quad * frame = instance->newQuad(x, y, w, h, sw, sh);