summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-29 17:24:52 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-29 17:59:57 +0300
commitf315432679f760b71505e74dcb2185b7aef7a906 (patch)
tree07d45620464a2542cb28fbe773f652501e6ee6fb /src/render
parentcccb3e11663eb415b9b6c9a184e1c17762a2d989 (diff)
downloadmanaverse-f315432679f760b71505e74dcb2185b7aef7a906.tar.gz
manaverse-f315432679f760b71505e74dcb2185b7aef7a906.tar.bz2
manaverse-f315432679f760b71505e74dcb2185b7aef7a906.tar.xz
manaverse-f315432679f760b71505e74dcb2185b7aef7a906.zip
change smaller letter literalt into capital letter.
Diffstat (limited to 'src/render')
-rw-r--r--src/render/mobileopenglgraphics.cpp8
-rw-r--r--src/render/normalopenglgraphics.cpp16
-rw-r--r--src/render/nullopenglgraphics.cpp12
-rw-r--r--src/render/safeopenglgraphics.cpp14
4 files changed, 25 insertions, 25 deletions
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 18f036f48..b5e1cb883 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -52,7 +52,7 @@ MobileOpenGLGraphics::MobileOpenGLGraphics():
mTexture(false),
mIsByteColor(false),
mByteColor(),
- mFloatColor(1.0f),
+ mFloatColor(1.0F),
mMaxVertices(500),
mColorAlpha(false),
#ifdef DEBUG_BIND_TEXTURE
@@ -276,7 +276,7 @@ bool MobileOpenGLGraphics::drawRescaledImage(const Image *const image,
if (smooth) // A basic smooth effect...
{
- setColorAlpha(0.2f);
+ setColorAlpha(0.2F);
drawRescaledQuad(image, srcX, srcY, dstX - 1, dstY - 1, width, height,
desiredWidth + 1, desiredHeight + 1);
drawRescaledQuad(image, srcX, srcY, dstX + 1, dstY + 1, width, height,
@@ -873,7 +873,7 @@ void MobileOpenGLGraphics::_beginDraw()
#endif
#endif
-// glScalef(0.5f, 0.5f, 0.5f);
+// glScalef(0.5F, 0.5F, 0.5F);
pushClipArea(gcn::Rectangle(0, 0, mRect.w, mRect.h));
}
@@ -1242,7 +1242,7 @@ void MobileOpenGLGraphics::setColorAlpha(const float alpha)
if (!mIsByteColor && mFloatColor == alpha)
return;
- glColor4f(1.0f, 1.0f, 1.0f, alpha);
+ glColor4f(1.0F, 1.0F, 1.0F, alpha);
mIsByteColor = false;
mFloatColor = alpha;
}
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index fe5d14e12..b5abcf30e 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -54,7 +54,7 @@ NormalOpenGLGraphics::NormalOpenGLGraphics():
mTexture(false),
mIsByteColor(false),
mByteColor(),
- mFloatColor(1.0f),
+ mFloatColor(1.0F),
mMaxVertices(500),
mColorAlpha(false),
#ifdef DEBUG_BIND_TEXTURE
@@ -323,7 +323,7 @@ bool NormalOpenGLGraphics::drawRescaledImage(const Image *const image,
if (smooth) // A basic smooth effect...
{
- setColorAlpha(0.2f);
+ setColorAlpha(0.2F);
drawRescaledQuad(image, srcX, srcY, dstX - 1, dstY - 1, width, height,
desiredWidth + 1, desiredHeight + 1);
drawRescaledQuad(image, srcX, srcY, dstX + 1, dstY + 1, width, height,
@@ -1214,10 +1214,10 @@ void NormalOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
setTexturingAndBlending(false);
restoreColor();
- mFloatTexArray[0] = static_cast<float>(x1) + 0.5f;
- mFloatTexArray[1] = static_cast<float>(y1) + 0.5f;
- mFloatTexArray[2] = static_cast<float>(x2) + 0.5f;
- mFloatTexArray[3] = static_cast<float>(y2) + 0.5f;
+ mFloatTexArray[0] = static_cast<float>(x1) + 0.5F;
+ mFloatTexArray[1] = static_cast<float>(y1) + 0.5F;
+ mFloatTexArray[2] = static_cast<float>(x2) + 0.5F;
+ mFloatTexArray[3] = static_cast<float>(y2) + 0.5F;
drawLineArrayf(4);
}
@@ -1281,7 +1281,7 @@ void NormalOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect,
const bool filled)
{
BLOCK_START("Graphics::drawRectangle")
- const float offset = filled ? 0 : 0.5f;
+ const float offset = filled ? 0 : 0.5F;
const float x = static_cast<float>(rect.x);
const float y = static_cast<float>(rect.y);
const float width = static_cast<float>(rect.width);
@@ -1469,7 +1469,7 @@ void NormalOpenGLGraphics::setColorAlpha(const float alpha)
if (!mIsByteColor && mFloatColor == alpha)
return;
- glColor4f(1.0f, 1.0f, 1.0f, alpha);
+ glColor4f(1.0F, 1.0F, 1.0F, alpha);
mIsByteColor = false;
mFloatColor = alpha;
}
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index f7909b7bf..ed3dcd02f 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -46,7 +46,7 @@ NullOpenGLGraphics::NullOpenGLGraphics():
mTexture(false),
mIsByteColor(false),
mByteColor(),
- mFloatColor(1.0f),
+ mFloatColor(1.0F),
mMaxVertices(500),
mColorAlpha(false),
#ifdef DEBUG_BIND_TEXTURE
@@ -226,7 +226,7 @@ bool NullOpenGLGraphics::drawRescaledImage(const Image *const image,
if (smooth) // A basic smooth effect...
{
- setColorAlpha(0.2f);
+ setColorAlpha(0.2F);
drawRescaledQuad(image, srcX, srcY, dstX - 1, dstY - 1, width, height,
desiredWidth + 1, desiredHeight + 1);
drawRescaledQuad(image, srcX, srcY, dstX + 1, dstY + 1, width, height,
@@ -986,10 +986,10 @@ void NullOpenGLGraphics::drawLine(int x1, int y1,
setTexturingAndBlending(false);
restoreColor();
- mFloatTexArray[0] = static_cast<float>(x1) + 0.5f;
- mFloatTexArray[1] = static_cast<float>(y1) + 0.5f;
- mFloatTexArray[2] = static_cast<float>(x2) + 0.5f;
- mFloatTexArray[3] = static_cast<float>(y2) + 0.5f;
+ mFloatTexArray[0] = static_cast<float>(x1) + 0.5F;
+ mFloatTexArray[1] = static_cast<float>(y1) + 0.5F;
+ mFloatTexArray[2] = static_cast<float>(x2) + 0.5F;
+ mFloatTexArray[3] = static_cast<float>(y2) + 0.5F;
drawLineArrayf(4);
}
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index 7f0e375b6..cd3338188 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -41,7 +41,7 @@ SafeOpenGLGraphics::SafeOpenGLGraphics():
mTexture(false),
mIsByteColor(false),
mByteColor(),
- mFloatColor(1.0f),
+ mFloatColor(1.0F),
mColorAlpha(false),
mFbo()
{
@@ -220,7 +220,7 @@ bool SafeOpenGLGraphics::drawRescaledImage(const Image *const image, int srcX,
if (smooth) // A basic smooth effect...
{
- setColorAlpha(0.2f);
+ setColorAlpha(0.2F);
drawRescaledQuad(image, srcX, srcY, dstX - 1, dstY - 1, width, height,
desiredWidth + 1, desiredHeight + 1);
drawRescaledQuad(image, srcX, srcY, dstX + 1, dstY + 1, width, height,
@@ -531,12 +531,12 @@ void SafeOpenGLGraphics::drawLine(int x1, int y1, int x2, int y2)
restoreColor();
glBegin(GL_LINES);
- glVertex2f(static_cast<float>(x1) + 0.5f, static_cast<float>(y1) + 0.5f);
- glVertex2f(static_cast<float>(x2) + 0.5f, static_cast<float>(y2) + 0.5f);
+ glVertex2f(static_cast<float>(x1) + 0.5F, static_cast<float>(y1) + 0.5F);
+ glVertex2f(static_cast<float>(x2) + 0.5F, static_cast<float>(y2) + 0.5F);
glEnd();
glBegin(GL_POINTS);
- glVertex2f(static_cast<float>(x2) + 0.5f, static_cast<float>(y2) + 0.5f);
+ glVertex2f(static_cast<float>(x2) + 0.5F, static_cast<float>(y2) + 0.5F);
glEnd();
}
@@ -597,7 +597,7 @@ void SafeOpenGLGraphics::drawRectangle(const gcn::Rectangle& rect,
const bool filled)
{
BLOCK_START("Graphics::drawRectangle")
- const float offset = filled ? 0 : 0.5f;
+ const float offset = filled ? 0 : 0.5F;
setTexturingAndBlending(false);
restoreColor();
@@ -629,7 +629,7 @@ void SafeOpenGLGraphics::setColorAlpha(const float alpha)
if (!mIsByteColor && mFloatColor == alpha)
return;
- glColor4f(1.0f, 1.0f, 1.0f, alpha);
+ glColor4f(1.0F, 1.0F, 1.0F, alpha);
mIsByteColor = false;
mFloatColor = alpha;
}