piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Kill off some usages of c_str.

Browse Source 
Also changes some function params, but this is ok.
Some simplifications were also able to be made (ie. killing off strcmps with ==, etc).
This commit is contained in:
Lioncash
2014-03-12 15:33:41 -04:00
parent dccc6d8b47
commit a82675b7d5
170 changed files with 812 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Core/VideoBackends/OGL/RasterFont.cpp
View File

@ -141,9 +141,12 @@ RasterFont::RasterFont()
glActiveTexture(GL_TEXTURE0+8);
glBindTexture(GL_TEXTURE_2D, texture);
u32* texture_data = new u32[char_width*char_count*char_height];
for (u32 y=0; y<char_height; y++) {
for (u32 c=0; c<char_count; c++) {
for (u32 x=0; x<char_width; x++) {
for (u32 y = 0; y < char_height; y++)
{
for (u32 c = 0; c < char_count; c++)
{
for (u32 x = 0; x < char_width; x++)
{
bool pixel = (0 != (rasters[c][y] & (1<<(char_width-x-1))));
texture_data[char_width*char_count*y+char_width*c+x] = pixel ? -1 : 0;
}
@ -181,10 +184,9 @@ RasterFont::~RasterFont()
s_shader.Destroy();
}
void RasterFont::printMultilineText(const char *text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color)
void RasterFont::printMultilineText(const std::string& text, double start_x, double start_y, double z, int bbWidth, int bbHeight, u32 color)
{
size_t length = strlen(text);
GLfloat *vertices = new GLfloat[length*6*4];
GLfloat* vertices = new GLfloat[text.length() * 6 * 4];
int usage = 0;
GLfloat delta_x = GLfloat(2*char_width)/GLfloat(bbWidth);
@ -195,22 +197,24 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
GLfloat x = GLfloat(start_x);
GLfloat y = GLfloat(start_y);
for (size_t i=0; i<length; i++) {
u8 c = text[i];
if (c == '\n') {
for (const char& c : text)
{
if (c == '\n')
{
x = GLfloat(start_x);
y -= delta_y + border_y;
continue;
}
// do not print spaces, they can be skipped easily
if (c == ' ') {
if (c == ' ')
{
x += delta_x + border_x;
continue;
}
if (c < char_offset || c >= char_count+char_offset) continue;
if (c < char_offset || c >= char_count+char_offset)
continue;
vertices[usage++] = x;
vertices[usage++] = y;
@ -245,7 +249,8 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
x += delta_x + border_x;
}
if (!usage) {
if (!usage)
{
delete [] vertices;
return;
}
@ -258,7 +263,8 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
s_shader.Bind();
if (color != cached_color) {
if (color != cached_color)
{
glUniform4f(uniform_color_id, GLfloat((color>>16)&0xff)/255.f,GLfloat((color>>8)&0xff)/255.f,GLfloat((color>>0)&0xff)/255.f,GLfloat((color>>24)&0xff)/255.f);
cached_color = color;
}