summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-31 20:25:43 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-31 20:25:43 +0300
commit7e5386bc62f1f61d3409219292e1ec0d71cbd28e (patch)
tree3e4233abac1d52ff1103bdd8b4747a4e91b5f575 /src/render
parent62879acf891f1939e16fa32d2426b56f08f1609b (diff)
downloadmv-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.tar.gz
mv-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.tar.bz2
mv-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.tar.xz
mv-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.zip
fix code style.
Diffstat (limited to 'src/render')
-rw-r--r--src/render/graphics.cpp1
-rw-r--r--src/render/graphics_calcImageRect.hpp13
-rw-r--r--src/render/graphics_drawImageRect.hpp6
-rw-r--r--src/render/safeopenglgraphics.cpp12
4 files changed, 19 insertions, 13 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index 7903b6431..1e8cef36e 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -28,7 +28,6 @@
#include "graphicsmanager.h"
#include "logger.h"
-#include "resources/image.h"
#include "resources/imagehelper.h"
#include "resources/openglimagehelper.h"
diff --git a/src/render/graphics_calcImageRect.hpp b/src/render/graphics_calcImageRect.hpp
index bf8da2a37..2d97f82c5 100644
--- a/src/render/graphics_calcImageRect.hpp
+++ b/src/render/graphics_calcImageRect.hpp
@@ -21,10 +21,10 @@
*/
-//bool Graphics::calcImageRect(ImageVertexes *const vert,
-// const int x, const int y,
-// const int w, const int h,
-// const ImageRect &imgRect)
+// bool GraphicsX::calcImageRect(ImageVertexes *const vert,
+// const int x, const int y,
+// const int w, const int h,
+// const ImageRect &imgRect)
if (!vert)
return;
@@ -76,7 +76,10 @@ if (topRight)
calcTileVertexesInline(vert, topRight, x + w - trw, y);
}
if (bottomLeft)
- calcTileVertexesInline(vert, bottomLeft, x, y + h - bottomLeft->getHeight());
+{
+ calcTileVertexesInline(vert, bottomLeft,
+ x, y + h - bottomLeft->getHeight());
+}
if (bottomRight)
{
const int brw = bottomRight->getWidth();
diff --git a/src/render/graphics_drawImageRect.hpp b/src/render/graphics_drawImageRect.hpp
index 28157fafd..9ce134ab9 100644
--- a/src/render/graphics_drawImageRect.hpp
+++ b/src/render/graphics_drawImageRect.hpp
@@ -21,9 +21,9 @@
*/
-//void GraphicsX::drawImageRect(const int x, const int y,
-// const int w, const int h,
-// const ImageRect &imgRect)
+// void GraphicsX::drawImageRect(const int x, const int y,
+// const int w, const int h,
+// const ImageRect &imgRect)
BLOCK_START("Graphics::drawImageRect")
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index c988e6825..08638bbe0 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -576,14 +576,18 @@ bool SafeOpenGLGraphics::drawNet(const int x1, const int y1,
glBegin(GL_LINES);
for (int y = y1; y < y2; y += height)
{
- glVertex2f(static_cast<float>(x1) + 0.5F, static_cast<float>(y) + 0.5F);
- glVertex2f(static_cast<float>(x2) + 0.5F, static_cast<float>(y) + 0.5F);
+ glVertex2f(static_cast<float>(x1) + 0.5F,
+ static_cast<float>(y) + 0.5F);
+ glVertex2f(static_cast<float>(x2) + 0.5F,
+ static_cast<float>(y) + 0.5F);
}
for (int x = x1; x < x2; x += width)
{
- glVertex2f(static_cast<float>(x) + 0.5F, static_cast<float>(y1) + 0.5F);
- glVertex2f(static_cast<float>(x) + 0.5F, static_cast<float>(y2) + 0.5F);
+ glVertex2f(static_cast<float>(x) + 0.5F,
+ static_cast<float>(y1) + 0.5F);
+ glVertex2f(static_cast<float>(x) + 0.5F,
+ static_cast<float>(y2) + 0.5F);
}
glEnd();