LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added Data:getString to GlyphData

Browse Source
This commit is contained in:
Alex Szpakowski
2013-06-16 04:10:09 -03:00
parent f25efcc8af
commit dd9cca1a55
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/wrap_GlyphData.cpp
+2
View File
@@ -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 }
}; };
src/modules/graphics/opengl/OpenGL.cpp
+2 -2
View File
@@ -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.