Browse Source

Added Data:getString to GlyphData

Alex Szpakowski 12 years ago
parent
commit
dd9cca1a55
2 changed files with 4 additions and 2 deletions
  1. 2 0
      src/modules/font/wrap_GlyphData.cpp
  2. 2 2
      src/modules/graphics/opengl/OpenGL.cpp

+ 2 - 0
src/modules/font/wrap_GlyphData.cpp

@@ -32,6 +32,8 @@ GlyphData *luax_checkglyphdata(lua_State *L, int idx)
 
 
 static const luaL_Reg functions[] =
 static const luaL_Reg functions[] =
 {
 {
+	// Data
+	{ "getString", w_Data_getString },
 	{ "getSize", w_Data_getSize },
 	{ "getSize", w_Data_getSize },
 	{ 0, 0 }
 	{ 0, 0 }
 };
 };

+ 2 - 2
src/modules/graphics/opengl/OpenGL.cpp

@@ -66,11 +66,11 @@ void OpenGL::initContext()
 	state.clearColor.a = glcolor[3] * 255;
 	state.clearColor.a = glcolor[3] * 255;
 
 
 	// Get the current viewport.
 	// Get the current viewport.
-	glGetIntegerv(GL_VIEWPORT, (GLint *) &state.viewport);
+	glGetIntegerv(GL_VIEWPORT, (GLint *) &state.viewport.x);
 
 
 	// And the current scissor - but we need to compensate for GL scissors
 	// And the current scissor - but we need to compensate for GL scissors
 	// starting at the bottom left instead of top left.
 	// starting at the bottom left instead of top left.
-	glGetIntegerv(GL_SCISSOR_BOX, (GLint *) &state.scissor);
+	glGetIntegerv(GL_SCISSOR_BOX, (GLint *) &state.scissor.x);
 	state.scissor.y = state.viewport.h - (state.scissor.y + state.scissor.h);
 	state.scissor.y = state.viewport.h - (state.scissor.y + state.scissor.h);
 
 
 	// Initialize multiple texture unit support for shaders, if available.
 	// Initialize multiple texture unit support for shaders, if available.