From 31cfc73a09a8685cbab20502b4bc132e98e2feb5 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Tue, 11 Mar 2014 00:30:55 +1300 Subject: Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining. --- Source/Core/VideoBackends/OGL/RasterFont.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/RasterFont.cpp') diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index 1b7845887b..55b6f280b3 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -141,9 +141,9 @@ 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_count+char_offset) continue; + if (c < char_offset || c >= char_count+char_offset) continue; vertices[usage++] = x; vertices[usage++] = y; @@ -245,7 +245,7 @@ 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 +258,7 @@ 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; } -- cgit v1.2.3