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

Fixed love.graphics.print[f] truncating strings with embedded zeros

Browse Source
This commit is contained in:
Alex Szpakowski
2013-06-13 17:37:14 -03:00
parent 66b9b46846
commit 8718e064e0
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+4 -8
View File
@@ -794,16 +794,13 @@ int Graphics::getMaxPointSize() const
return (int)max; return (int)max;
} }
void Graphics::print(const char *str, float x, float y , float angle, float sx, float sy, float ox, float oy, float kx, float ky) void Graphics::print(const std::string &str, float x, float y , float angle, float sx, float sy, float ox, float oy, float kx, float ky)
{ {
if (currentFont != 0) if (currentFont != 0)
{ currentFont->print(str, x, y, 0.0, angle, sx, sy, ox, oy, kx, ky);
std::string text(str);
currentFont->print(text, x, y, 0.0, angle, sx, sy, ox, oy, kx, ky);
}
} }
void Graphics::printf(const char *str, float x, float y, float wrap, AlignMode align, float angle, float sx, float sy, float ox, float oy, float kx, float ky) void Graphics::printf(const std::string &str, float x, float y, float wrap, AlignMode align, float angle, float sx, float sy, float ox, float oy, float kx, float ky)
{ {
if (currentFont == 0) if (currentFont == 0)
return; return;
@@ -811,8 +808,7 @@ void Graphics::printf(const char *str, float x, float y, float wrap, AlignMode a
using std::string; using std::string;
using std::vector; using std::vector;
string text(str); vector<string> lines_to_draw = currentFont->getWrap(str, wrap);
vector<string> lines_to_draw = currentFont->getWrap(text, wrap);
glPushMatrix(); glPushMatrix();
src/modules/graphics/opengl/Graphics.h
+2 -2
View File
@@ -386,7 +386,7 @@ public:
* @param kx Shear along the x-axis. * @param kx Shear along the x-axis.
* @param ky Shear along the y-axis. * @param ky Shear along the y-axis.
**/ **/
void print(const char *str, float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky); void print(const std::string &str, float x, float y, float angle, float sx, float sy, float ox, float oy, float kx, float ky);
/** /**
* Draw formatted text on screen at the specified coordinates. * Draw formatted text on screen at the specified coordinates.
@@ -404,7 +404,7 @@ public:
* @param kx Shear along the x-axis. * @param kx Shear along the x-axis.
* @param ky Shear along the y-axis. * @param ky Shear along the y-axis.
**/ **/
void printf(const char *str, float x, float y, float wrap, AlignMode align, float angle, float sx, float sy, float ox, float oy, float kx, float ky); void printf(const std::string &str, float x, float y, float wrap, AlignMode align, float angle, float sx, float sy, float ox, float oy, float kx, float ky);
/** /**
* Draws a point at (x,y). * Draws a point at (x,y).
src/modules/graphics/opengl/wrap_Graphics.cpp
+2 -2
View File
@@ -1161,7 +1161,7 @@ int w_drawg(lua_State *L)
int w_print(lua_State *L) int w_print(lua_State *L)
{ {
const char *str = luaL_checkstring(L, 1); std::string str = luax_checkstring(L, 1);
float x = (float)luaL_checknumber(L, 2); float x = (float)luaL_checknumber(L, 2);
float y = (float)luaL_checknumber(L, 3); float y = (float)luaL_checknumber(L, 3);
float angle = (float)luaL_optnumber(L, 4, 0.0f); float angle = (float)luaL_optnumber(L, 4, 0.0f);
@@ -1184,7 +1184,7 @@ int w_print(lua_State *L)
int w_printf(lua_State *L) int w_printf(lua_State *L)
{ {
const char *str = luaL_checkstring(L, 1); std::string str = luax_checkstring(L, 1);
float x = (float)luaL_checknumber(L, 2); float x = (float)luaL_checknumber(L, 2);
float y = (float)luaL_checknumber(L, 3); float y = (float)luaL_checknumber(L, 3);
float wrap = (float)luaL_checknumber(L, 4); float wrap = (float)luaL_checknumber(L, 4);