[Scummvm-cvs-logs] SF.net SVN: scummvm:[54755] scummvm/trunk/backends/graphics/opengl
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Fri Dec 3 20:16:24 CET 2010
Revision: 54755
http://scummvm.svn.sourceforge.net/scummvm/?rev=54755&view=rev
Author: jvprat
Date: 2010-12-03 19:16:23 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
OPENGL: Some slight formatting fixes.
Modified Paths:
--------------
scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
scummvm/trunk/backends/graphics/opengl/gltexture.cpp
scummvm/trunk/backends/graphics/opengl/opengl-graphics.h
Modified: scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp 2010-12-03 19:09:27 UTC (rev 54754)
+++ scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp 2010-12-03 19:16:23 UTC (rev 54755)
@@ -49,12 +49,12 @@
static const char *getGlErrStr(GLenum error) {
switch (error) {
- case GL_NO_ERROR: return "GL_NO_ERROR";
- case GL_INVALID_ENUM: return "GL_INVALID_ENUM";
- case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
- case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW";
- case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW";
- case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY";
+ case GL_NO_ERROR: return "GL_NO_ERROR";
+ case GL_INVALID_ENUM: return "GL_INVALID_ENUM";
+ case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION";
+ case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW";
+ case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW";
+ case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY";
}
// FIXME: Convert to use Common::String::format()
Modified: scummvm/trunk/backends/graphics/opengl/gltexture.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/gltexture.cpp 2010-12-03 19:09:27 UTC (rev 54754)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.cpp 2010-12-03 19:16:23 UTC (rev 54755)
@@ -177,10 +177,10 @@
// Calculate the screen rect where the texture will be drawn
const GLshort vertices[] = {
- x, y,
- x + w, y,
- x, y + h,
- x + w, y + h,
+ x, y,
+ x + w, y,
+ x, y + h,
+ x + w, y + h,
};
glVertexPointer(2, GL_SHORT, 0, vertices); CHECK_GL_ERROR();
Modified: scummvm/trunk/backends/graphics/opengl/opengl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/opengl/opengl-graphics.h 2010-12-03 19:09:27 UTC (rev 54754)
+++ scummvm/trunk/backends/graphics/opengl/opengl-graphics.h 2010-12-03 19:16:23 UTC (rev 54755)
@@ -46,7 +46,7 @@
}
/**
- * Open GL graphics manager. This is an abstract class, it does not do the
+ * OpenGL graphics manager. This is an abstract class, it does not do the
* window and OpenGL context initialization.
* Derived classes should at least override internUpdateScreen for doing
* the buffers swap, and implement loadGFXMode for handling the window/context if
@@ -89,7 +89,7 @@
virtual void fillScreen(uint32 col);
virtual void updateScreen();
virtual void setShakePos(int shakeOffset);
- virtual void setFocusRectangle(const Common::Rect& rect);
+ virtual void setFocusRectangle(const Common::Rect &rect);
virtual void clearFocusRectangle();
virtual void showOverlay();
@@ -203,7 +203,7 @@
//
// Game screen
//
- GLTexture* _gameTexture;
+ GLTexture *_gameTexture;
Graphics::Surface _screenData;
int _screenChangeCount;
bool _screenNeedsRedraw;
@@ -222,7 +222,7 @@
//
// Overlay
//
- GLTexture* _overlayTexture;
+ GLTexture *_overlayTexture;
Graphics::Surface _overlayData;
Graphics::PixelFormat _overlayFormat;
bool _overlayVisible;
@@ -256,7 +256,7 @@
vHotX(0), vHotY(0) {}
};
- GLTexture* _cursorTexture;
+ GLTexture *_cursorTexture;
Graphics::Surface _cursorData;
Graphics::PixelFormat _cursorFormat;
byte *_cursorPalette;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list