[Scummvm-git-logs] scummvm master -> 7f3b6e33622532d1455f67b71c908c554a78f1d2
aquadran
noreply at scummvm.org
Thu Dec 30 12:49:39 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7f3b6e3362 WME3D: Janitorial - formatting
Commit: 7f3b6e33622532d1455f67b71c908c554a78f1d2
https://github.com/scummvm/scummvm/commit/7f3b6e33622532d1455f67b71c908c554a78f1d2
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-30T13:49:35+01:00
Commit Message:
WME3D: Janitorial - formatting
Changed paths:
engines/wintermute/base/gfx/3ds/camera3d.cpp
engines/wintermute/base/gfx/3ds/camera3d.h
engines/wintermute/base/gfx/3ds/light3d.cpp
engines/wintermute/base/gfx/3ds/light3d.h
engines/wintermute/base/gfx/3ds/loader3ds.cpp
engines/wintermute/base/gfx/3ds/loader3ds.h
engines/wintermute/base/gfx/3ds/mesh3ds.cpp
engines/wintermute/base/gfx/base_image.cpp
engines/wintermute/base/gfx/base_image.h
engines/wintermute/base/gfx/base_renderer.cpp
engines/wintermute/base/gfx/base_renderer.h
engines/wintermute/base/gfx/base_renderer3d.cpp
engines/wintermute/base/gfx/base_renderer3d.h
engines/wintermute/base/gfx/base_surface.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex
engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment
engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
engines/wintermute/base/gfx/osystem/base_render_osystem.h
engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
engines/wintermute/base/gfx/osystem/base_surface_osystem.h
engines/wintermute/base/gfx/osystem/render_ticket.cpp
engines/wintermute/base/gfx/osystem/render_ticket.h
engines/wintermute/base/gfx/x/animation.h
engines/wintermute/base/gfx/x/loader_x.cpp
engines/wintermute/base/gfx/x/meshx.cpp
engines/wintermute/base/gfx/x/meshx.h
engines/wintermute/base/gfx/x/modelx.cpp
engines/wintermute/base/gfx/x/modelx.h
diff --git a/engines/wintermute/base/gfx/3ds/camera3d.cpp b/engines/wintermute/base/gfx/3ds/camera3d.cpp
index 235e754eb31..27c9aa66f4f 100644
--- a/engines/wintermute/base/gfx/3ds/camera3d.cpp
+++ b/engines/wintermute/base/gfx/3ds/camera3d.cpp
@@ -28,6 +28,7 @@
#include "engines/wintermute/base/gfx/3ds/camera3d.h"
#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
#include "engines/wintermute/math/math_util.h"
+
#include "math/angle.h"
#include "math/glmath.h"
#include "math/quat.h"
@@ -40,9 +41,9 @@ namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
Camera3D::Camera3D(BaseGame *inGame) : BaseNamedObject(inGame),
- _position(0.0f, 0.0f, 0.0f), _target(0.0f, 0.0f, 0.0f), _bank(0.0f),
- _fov(Math::Angle(45.0f).getRadians()), _originalFOV(Math::Angle(45.0f).getRadians()),
- _nearClipPlane(-1.0f), _farClipPlane(-1.0f) {
+ _position(0.0f, 0.0f, 0.0f), _target(0.0f, 0.0f, 0.0f), _bank(0.0f),
+ _fov(Math::Angle(45.0f).getRadians()), _originalFOV(Math::Angle(45.0f).getRadians()),
+ _nearClipPlane(-1.0f), _farClipPlane(-1.0f) {
}
//////////////////////////////////////////////////////////////////////////
@@ -94,7 +95,6 @@ bool Camera3D::getViewMatrix(Math::Matrix4 *viewMatrix) {
rotZ.transform(&up, false);
}
-
*viewMatrix = Math::makeLookAtMatrix(_position, _target, up);
return true;
}
diff --git a/engines/wintermute/base/gfx/3ds/camera3d.h b/engines/wintermute/base/gfx/3ds/camera3d.h
index 4ab1573f804..5e071a62fa7 100644
--- a/engines/wintermute/base/gfx/3ds/camera3d.h
+++ b/engines/wintermute/base/gfx/3ds/camera3d.h
@@ -29,7 +29,9 @@
#define WINTERMUTE_CAMERA3D_H
#include "common/memstream.h"
+
#include "engines/wintermute/base/base_named_object.h"
+
#include "math/matrix4.h"
#include "math/vector3d.h"
diff --git a/engines/wintermute/base/gfx/3ds/light3d.cpp b/engines/wintermute/base/gfx/3ds/light3d.cpp
index 8f3e786548f..933b60d3004 100644
--- a/engines/wintermute/base/gfx/3ds/light3d.cpp
+++ b/engines/wintermute/base/gfx/3ds/light3d.cpp
@@ -38,9 +38,9 @@ namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
Light3D::Light3D(BaseGame *inGame) : BaseScriptable(inGame, false, false),
- _diffuseColor(BYTETORGBA(255, 255, 255, 255)),
- _position(0, 0, 0), _target(0, 0, 0), _isSpotlight(false),
- _active(true), _falloff(0), _distance(0.0f), _isAvailable(false) {
+ _diffuseColor(BYTETORGBA(255, 255, 255, 255)),
+ _position(0, 0, 0), _target(0, 0, 0), _isSpotlight(false),
+ _active(true), _falloff(0), _distance(0.0f), _isAvailable(false) {
}
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/wintermute/base/gfx/3ds/light3d.h b/engines/wintermute/base/gfx/3ds/light3d.h
index 6f5ee195468..caf4c8d9478 100644
--- a/engines/wintermute/base/gfx/3ds/light3d.h
+++ b/engines/wintermute/base/gfx/3ds/light3d.h
@@ -29,8 +29,10 @@
#define WINTERMUTE_LIGHT3D_H
#include "common/memstream.h"
+
#include "engines/wintermute/base/base_persistence_manager.h"
#include "engines/wintermute/base/base_scriptable.h"
+
#include "math/matrix4.h"
#include "math/vector3d.h"
diff --git a/engines/wintermute/base/gfx/3ds/loader3ds.cpp b/engines/wintermute/base/gfx/3ds/loader3ds.cpp
index 6705016068c..35e3df67527 100644
--- a/engines/wintermute/base/gfx/3ds/loader3ds.cpp
+++ b/engines/wintermute/base/gfx/3ds/loader3ds.cpp
@@ -20,6 +20,7 @@
*/
#include "common/memstream.h"
+
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/base_renderer3d.h"
@@ -31,7 +32,7 @@
namespace Wintermute {
bool load3DSObject(Common::MemoryReadStream &fileStream, BaseArray<Wintermute::Mesh3DS *> &meshes, BaseArray<Common::String> &meshNames,
- BaseArray<Wintermute::Light3D *> &lights, BaseArray<Wintermute::Camera3D *> &cameras, BaseGame *gameRef) {
+ BaseArray<Wintermute::Light3D *> &lights, BaseArray<Wintermute::Camera3D *> &cameras, BaseGame *gameRef) {
uint32 wholeChunkSize = fileStream.readUint32LE();
int32 end = fileStream.pos() + wholeChunkSize - 6;
@@ -87,7 +88,7 @@ bool load3DSObject(Common::MemoryReadStream &fileStream, BaseArray<Wintermute::M
}
bool load3DSFile(const char *filename, BaseArray<Wintermute::Mesh3DS *> &meshes, BaseArray<Common::String> &meshNames,
- BaseArray<Wintermute::Light3D *> &lights, BaseArray<Wintermute::Camera3D *> &cameras, BaseGame *gameRef) {
+ BaseArray<Wintermute::Light3D *> &lights, BaseArray<Wintermute::Camera3D *> &cameras, BaseGame *gameRef) {
uint32 fileSize = 0;
byte *buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename, &fileSize);
diff --git a/engines/wintermute/base/gfx/3ds/loader3ds.h b/engines/wintermute/base/gfx/3ds/loader3ds.h
index 55a839d14ab..fa7b4c27d50 100644
--- a/engines/wintermute/base/gfx/3ds/loader3ds.h
+++ b/engines/wintermute/base/gfx/3ds/loader3ds.h
@@ -32,7 +32,7 @@ class Camera3D;
class Mesh3DS;
bool load3DSFile(const char *filename, BaseArray<Mesh3DS *> &meshes, BaseArray<Common::String> &meshNames,
- BaseArray<Light3D *> &lights, BaseArray<Camera3D *> &cameras, BaseGame *gameRef);
+ BaseArray<Light3D *> &lights, BaseArray<Camera3D *> &cameras, BaseGame *gameRef);
enum Chunks3DS {
RGB_FLOAT = 0x0010,
diff --git a/engines/wintermute/base/gfx/3ds/mesh3ds.cpp b/engines/wintermute/base/gfx/3ds/mesh3ds.cpp
index 8bf3f898de0..ad06b057d80 100644
--- a/engines/wintermute/base/gfx/3ds/mesh3ds.cpp
+++ b/engines/wintermute/base/gfx/3ds/mesh3ds.cpp
@@ -20,13 +20,13 @@
*/
#include "common/file.h"
+
#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
namespace Wintermute {
Mesh3DS::Mesh3DS() : _vertexData(nullptr), _vertexCount(0), _indexData(nullptr), _indexCount(0) {
-
}
Mesh3DS::~Mesh3DS() {
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp
index 2aa3bca5b45..eeb4985f419 100644
--- a/engines/wintermute/base/gfx/base_image.cpp
+++ b/engines/wintermute/base/gfx/base_image.cpp
@@ -27,11 +27,14 @@
#include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/base/base_file_manager.h"
+
#include "graphics/surface.h"
+
#include "image/png.h"
#include "image/jpeg.h"
#include "image/bmp.h"
#include "image/tga.h"
+
#include "common/textconsole.h"
#include "common/stream.h"
#include "common/system.h"
diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h
index 66c7e3553a4..48095daf864 100644
--- a/engines/wintermute/base/gfx/base_image.h
+++ b/engines/wintermute/base/gfx/base_image.h
@@ -30,6 +30,7 @@
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
+
#include "common/endian.h"
#include "common/str.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 9482928a7fc..7eddbc6bebd 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -75,7 +75,6 @@ BaseRenderer::BaseRenderer(BaseGame *inGame) : BaseClass(inGame) {
_drawOffsetX = _drawOffsetY = 0;
}
-
//////////////////////////////////////////////////////////////////////
BaseRenderer::~BaseRenderer() {
deleteRectList();
@@ -83,7 +82,6 @@ BaseRenderer::~BaseRenderer() {
delete _saveLoadImage;
}
-
//////////////////////////////////////////////////////////////////////
void BaseRenderer::initLoop() {
deleteRectList();
@@ -236,7 +234,6 @@ BaseObject *BaseRenderer::getObjectAt(int x, int y) {
return (BaseObject *)nullptr;
}
-
//////////////////////////////////////////////////////////////////////////
void BaseRenderer::deleteRectList() {
for (uint32 i = 0; i < _rectList.size(); i++) {
@@ -250,18 +247,15 @@ bool BaseRenderer::initRenderer(int width, int height, bool windowed) {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////
void BaseRenderer::onWindowChange() {
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::windowedBlt() {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::setup2D(bool Force) {
return STATUS_FAILED;
@@ -274,7 +268,6 @@ bool BaseRenderer::setup3D(Camera3D* camera, bool force) {
}
#endif
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::setupLines() {
return STATUS_FAILED;
@@ -285,7 +278,6 @@ bool BaseRenderer::drawLine(int x1, int y1, int x2, int y2, uint32 color) {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::drawRect(int x1, int y1, int x2, int y2, uint32 color, int width) {
for (int i = 0; i < width; i++) {
@@ -298,7 +290,6 @@ bool BaseRenderer::drawRect(int x1, int y1, int x2, int y2, uint32 color, int wi
return STATUS_OK;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::setViewport(int left, int top, int right, int bottom) {
return STATUS_FAILED;
@@ -310,7 +301,6 @@ bool BaseRenderer::setScreenViewport() {
return setViewport(_drawOffsetX, _drawOffsetY, _width + _drawOffsetX, _height + _drawOffsetY);
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::setViewport(Rect32 *rect) {
return setViewport(rect->left + _drawOffsetX,
@@ -319,7 +309,6 @@ bool BaseRenderer::setViewport(Rect32 *rect) {
rect->bottom + _drawOffsetY);
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseRenderer::clipCursor() {
// TODO: Reimplement this. (Currently aspect-indpendence isn't quite finished)
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 8685c673488..cacbf27fb23 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -30,6 +30,7 @@
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/base/base.h"
+
#include "common/rect.h"
#include "common/array.h"
@@ -88,8 +89,8 @@ public:
*/
virtual void fadeToColor(byte r, byte g, byte b, byte a) = 0;
- virtual bool drawLine(int x1, int y1, int x2, int y2, uint32 color); // Unused outside indicator-display
- virtual bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1); // Unused outside indicator-display
+ virtual bool drawLine(int x1, int y1, int x2, int y2, uint32 color); // Unused outside indicator-display
+ virtual bool drawRect(int x1, int y1, int x2, int y2, uint32 color, int width = 1); // Unused outside indicator-display
BaseRenderer(BaseGame *inGame = nullptr);
~BaseRenderer() override;
virtual bool setProjection() {
diff --git a/engines/wintermute/base/gfx/base_renderer3d.cpp b/engines/wintermute/base/gfx/base_renderer3d.cpp
index 9a274b86046..b6ce3f2d267 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.cpp
+++ b/engines/wintermute/base/gfx/base_renderer3d.cpp
@@ -20,6 +20,7 @@
*/
#include "engines/wintermute/base/gfx/base_renderer3d.h"
+
#include "math/glmath.h"
namespace Wintermute {
@@ -75,8 +76,8 @@ void BaseRenderer3D::initLoop() {
Math::Ray BaseRenderer3D::rayIntoScene(int x, int y) {
Math::Vector3d direction((((2.0f * x) / _viewport3dRect.width()) - 1) / _projectionMatrix3d(0, 0),
- -(((2.0f * y) / _viewport3dRect.height()) - 1) / _projectionMatrix3d(1, 1),
- -1.0f);
+ -(((2.0f * y) / _viewport3dRect.height()) - 1) / _projectionMatrix3d(1, 1),
+ -1.0f);
Math::Matrix4 m = _lastViewMatrix;
m.inverse();
@@ -88,9 +89,9 @@ Math::Ray BaseRenderer3D::rayIntoScene(int x, int y) {
}
bool BaseRenderer3D::drawSprite(BaseSurfaceOpenGL3D &tex, const Wintermute::Rect32 &rect,
- float zoomX, float zoomY, const Wintermute::Vector2 &pos,
- uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode,
- bool mirrorX, bool mirrorY) {
+ float zoomX, float zoomY, const Wintermute::Vector2 &pos,
+ uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode,
+ bool mirrorX, bool mirrorY) {
Vector2 scale(zoomX / 100.0f, zoomY / 100.0f);
return drawSpriteEx(tex, rect, pos, Vector2(0.0f, 0.0f), scale, 0.0f, color, alphaDisable, blendMode, mirrorX, mirrorY);
}
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index ae61904b690..df1b9988fe2 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -28,6 +28,7 @@
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/math/vector2.h"
#include "graphics/transform_struct.h"
+
#include "math/matrix4.h"
#include "math/ray.h"
@@ -64,7 +65,8 @@ public:
virtual int maximumLightsCount() = 0;
virtual void enableLight(int index) = 0;
virtual void disableLight(int index) = 0;
- virtual void setLightParameters(int index, const Math::Vector3d &position, const Math::Vector3d &direction, const Math::Vector4d &diffuse, bool spotlight) = 0;
+ virtual void setLightParameters(int index, const Math::Vector3d &position, const Math::Vector3d &direction,
+ const Math::Vector4d &diffuse, bool spotlight) = 0;
virtual void setSpriteBlendMode(Graphics::TSpriteBlendMode blendMode) = 0;
@@ -98,7 +100,7 @@ public:
virtual ShadowVolume *createShadowVolume() = 0;
bool drawSprite(BaseSurfaceOpenGL3D &tex, const Rect32 &rect, float zoomX, float zoomY, const Vector2 &pos,
- uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY);
+ uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY);
virtual bool drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Rect32 &rect, const Vector2 &pos, const Vector2 &rot, const Vector2 &scale,
float angle, uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) = 0;
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp
index 5a3bd6149e5..633faeaca8e 100644
--- a/engines/wintermute/base/gfx/base_surface.cpp
+++ b/engines/wintermute/base/gfx/base_surface.cpp
@@ -50,7 +50,6 @@ BaseSurface::BaseSurface(BaseGame *inGame) : BaseClass(inGame) {
_valid = false;
}
-
//////////////////////////////////////////////////////////////////////
BaseSurface::~BaseSurface() {
if (_pixelOpReady) {
@@ -78,7 +77,6 @@ bool BaseSurface::create(int width, int height) {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurface::startPixelOp() {
return STATUS_FAILED;
@@ -89,38 +87,31 @@ bool BaseSurface::endPixelOp() {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurface::getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a) {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurface::putPixel(int x, int y, byte r, byte g, byte b, int a) {
return STATUS_FAILED;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurface::comparePixel(int x, int y, byte r, byte g, byte b, int a) {
return false;
}
-
//////////////////////////////////////////////////////////////////////
bool BaseSurface::isTransparentAtLite(int x, int y) {
return false;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurface::invalidate() {
return STATUS_FAILED;
}
-
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurface::prepareToDraw() {
_lastUsedTime = _gameRef->getLiveTimer()->getTime();
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 1d82c0b432f..bd76eec176e 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -25,7 +25,9 @@
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/3ds/camera3d.h"
#include "engines/wintermute/base/gfx/3ds/light3d.h"
+
#include "graphics/opengl/system_headers.h"
+
#include "math/glmath.h"
#if defined(USE_OPENGL_GAME)
@@ -41,8 +43,8 @@ BaseRenderer3D *makeOpenGL3DRenderer(BaseGame *inGame) {
return new BaseRenderOpenGL3D(inGame);
}
-BaseRenderOpenGL3D::BaseRenderOpenGL3D(BaseGame *inGame)
- : BaseRenderer3D(inGame), _spriteBatchMode(false) {
+BaseRenderOpenGL3D::BaseRenderOpenGL3D(BaseGame *inGame) : BaseRenderer3D(inGame),
+ _spriteBatchMode(false) {
setDefaultAmbientLightColor();
_lightPositions.resize(maximumLightsCount());
@@ -519,7 +521,10 @@ bool BaseRenderOpenGL3D::setup3D(Camera3D *camera, bool force) {
glFogf(GL_FOG_END, fogParameters._end);
uint32 fogColor = fogParameters._color;
- GLfloat color[4] = { RGBCOLGetR(fogColor) / 255.0f, RGBCOLGetG(fogColor) / 255.0f, RGBCOLGetB(fogColor) / 255.0f, RGBCOLGetA(fogColor) / 255.0f };
+ GLfloat color[4] = { RGBCOLGetR(fogColor) / 255.0f,
+ RGBCOLGetG(fogColor) / 255.0f,
+ RGBCOLGetB(fogColor) / 255.0f,
+ RGBCOLGetA(fogColor) / 255.0f };
glFogfv(GL_FOG_COLOR, color);
} else {
glDisable(GL_FOG);
@@ -565,9 +570,9 @@ struct SpriteVertex {
};
bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute::Rect32 &rect,
- const Wintermute::Vector2 &pos, const Wintermute::Vector2 &rot, const Wintermute::Vector2 &scale,
- float angle, uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode,
- bool mirrorX, bool mirrorY) {
+ const Wintermute::Vector2 &pos, const Wintermute::Vector2 &rot, const Wintermute::Vector2 &scale,
+ float angle, uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode,
+ bool mirrorX, bool mirrorY) {
// original wme has a batch mode for sprites, we ignore this for the moment
if (_forceAlphaColor != 0) {
@@ -692,7 +697,7 @@ bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute
}
void BaseRenderOpenGL3D::renderSceneGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks,
- const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) {
+ const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
_gameRef->_renderer3D->setup3D(camera, true);
@@ -759,7 +764,9 @@ void BaseRenderOpenGL3D::renderSceneGeometry(const BaseArray<AdWalkplane *> &pla
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
-void BaseRenderOpenGL3D::renderShadowGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks, const BaseArray<AdGeneric *> &generics, Camera3D *camera) {
+void BaseRenderOpenGL3D::renderShadowGeometry(const BaseArray<AdWalkplane *> &planes,
+ const BaseArray<AdBlock *> &blocks,
+ const BaseArray<AdGeneric *> &generics, Camera3D *camera) {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
setup3D(camera, true);
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index b60b55f97e0..e4b95770bf6 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -26,7 +26,9 @@
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/math/vector2.h"
#include "engines/wintermute/dctypes.h"
+
#include "graphics/transform_struct.h"
+
#include "math/matrix4.h"
#include "math/ray.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index da430aab639..707156da0a2 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -24,7 +24,9 @@
#include "engines/wintermute/ad/ad_walkplane.h"
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/3ds/camera3d.h"
+
#include "graphics/opengl/system_headers.h"
+
#include "math/glmath.h"
#if defined(USE_OPENGL_SHADERS)
@@ -36,8 +38,10 @@
#include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h"
namespace Wintermute {
+
BaseRenderer3D *makeOpenGL3DShaderRenderer(BaseGame *inGame) {
return new BaseRenderOpenGL3DShader(inGame);
+
}
struct SpriteVertexShader {
@@ -124,7 +128,9 @@ void BaseRenderOpenGL3DShader::disableLight(int index) {
_modelXShader->setUniform1f(uniform.c_str(), -1.0f);
}
-void BaseRenderOpenGL3DShader::setLightParameters(int index, const Math::Vector3d &position, const Math::Vector3d &direction, const Math::Vector4d &diffuse, bool spotlight) {
+void BaseRenderOpenGL3DShader::setLightParameters(int index, const Math::Vector3d &position,
+ const Math::Vector3d &direction,
+ const Math::Vector4d &diffuse, bool spotlight) {
Math::Vector4d position4d;
position4d.x() = position.x();
position4d.y() = position.y();
@@ -682,9 +688,10 @@ BaseSurface *Wintermute::BaseRenderOpenGL3DShader::createSurface() {
}
bool BaseRenderOpenGL3DShader::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute::Rect32 &rect,
- const Wintermute::Vector2 &pos, const Wintermute::Vector2 &rot, const Wintermute::Vector2 &scale,
- float angle, uint32 color, bool alphaDisable, Graphics::TSpriteBlendMode blendMode,
- bool mirrorX, bool mirrorY) {
+ const Wintermute::Vector2 &pos, const Wintermute::Vector2 &rot,
+ const Wintermute::Vector2 &scale, float angle, uint32 color,
+ bool alphaDisable, Graphics::TSpriteBlendMode blendMode,
+ bool mirrorX, bool mirrorY) {
// original wme has a batch mode for sprites, we ignore this for the moment
if (_forceAlphaColor != 0) {
@@ -786,11 +793,12 @@ bool BaseRenderOpenGL3DShader::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wint
}
void BaseRenderOpenGL3DShader::renderSceneGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks,
- const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) {
+ const BaseArray<AdGeneric *> &generics, const BaseArray<Light3D *> &lights, Camera3D *camera) {
// don't render scene geometry, as OpenGL ES 2 has no wireframe rendering and we don't have a shader alternative yet
}
-void BaseRenderOpenGL3DShader::renderShadowGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks, const BaseArray<AdGeneric *> &generics, Camera3D *camera) {
+void BaseRenderOpenGL3DShader::renderShadowGeometry(const BaseArray<AdWalkplane *> &planes, const BaseArray<AdBlock *> &blocks,
+ const BaseArray<AdGeneric *> &generics, Camera3D *camera) {
setup3D(camera, true);
// disable color write
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
index fad95961b6b..ed9995597f9 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -26,9 +26,11 @@
#include "engines/wintermute/dctypes.h"
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/math/vector2.h"
+
#include "graphics/opengl/system_headers.h"
#include "graphics/opengl/texture.h"
#include "graphics/transform_struct.h"
+
#include "math/matrix4.h"
#include "math/ray.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
index aedafb2aef0..9312aae0bb6 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
@@ -20,7 +20,9 @@
*/
#include "common/algorithm.h"
+
#include "graphics/transform_tools.h"
+
#include "engines/wintermute/base/base_engine.h"
#include "engines/wintermute/base/gfx/base_image.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
index 0cf98ffe7da..1cd6029fc4e 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
@@ -23,6 +23,7 @@
#define WINTERMUTE_BASE_SURFACE_OPENGL3D_H
#include "engines/wintermute/base/gfx/base_surface.h"
+
#include "graphics/opengl/texture.h"
#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
index d8806be2f35..09204904814 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
@@ -20,6 +20,7 @@
*/
#include "engines/wintermute/wintypes.h"
+
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_GAME)
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
index 6eb61f690ce..f1efdc3bbd2 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
@@ -26,6 +26,7 @@
*/
#include "engines/wintermute/base/gfx/x/material.h"
+
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_GAME)
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
index 8e29c3ce72f..74f37d7406f 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
@@ -26,6 +26,7 @@
*/
#include "engines/wintermute/base/gfx/x/material.h"
+
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS)
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment
index ea57b6835be..150bb686a21 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment
@@ -2,7 +2,6 @@ in vec4 Color;
OUTPUT
-void main()
-{
+void main() {
outColor = Color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex
index c6886e7a79c..a2096ae4d8b 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_fade.vertex
@@ -5,8 +5,7 @@ uniform vec4 color;
out vec4 Color;
-void main()
-{
+void main() {
gl_Position = projMatrix * vec4(position, 0.0, 1.0);
Color = color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment
index dbced7035e9..a55e79ecfec 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.fragment
@@ -5,8 +5,7 @@ uniform vec4 shadowColor;
OUTPUT
-void main()
-{
+void main() {
vec2 projectedTexcoord = Texcoord.xy / Texcoord.z;
vec4 texColor = texture(tex, projectedTexcoord);
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex
index 83d94f92f45..e1cc2f8705c 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_mask.vertex
@@ -9,8 +9,7 @@ uniform highp mat4 lightViewMatrix;
out vec3 Texcoord;
-void main()
-{
+void main() {
vec4 worldCoords = worldMatrix * vec4(position, 1.0);
vec4 textureCoords = lightProjMatrix * lightViewMatrix * worldCoords;
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment
index 980969d66a5..f480933ea8f 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.fragment
@@ -2,7 +2,6 @@ uniform vec4 shadowColor;
OUTPUT
-void main()
-{
+void main() {
outColor = vec4(shadowColor.rgb, 1.0);
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex
index f76d974b44b..977847e9a94 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_flat_shadow_modelx.vertex
@@ -4,8 +4,7 @@ uniform highp mat4 modelMatrix;
uniform highp mat4 viewMatrix;
uniform highp mat4 projMatrix;
-void main()
-{
+void main() {
vec4 viewCoords = viewMatrix * modelMatrix * vec4(position, 1.0);
gl_Position = projMatrix * viewCoords;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment
index ea57b6835be..150bb686a21 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.fragment
@@ -2,7 +2,6 @@ in vec4 Color;
OUTPUT
-void main()
-{
+void main() {
outColor = Color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex
index 860d3034151..a3c25bd53a6 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_geometry.vertex
@@ -7,8 +7,7 @@ uniform vec4 color;
out vec4 Color;
-void main()
-{
+void main() {
gl_Position = projMatrix * viewMatrix * vec4(position, 1.0);
Color = color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment
index ea57b6835be..150bb686a21 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_line.fragment
@@ -2,7 +2,6 @@ in vec4 Color;
OUTPUT
-void main()
-{
+void main() {
outColor = Color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex
index 75b27c03b2b..615ed164278 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_line.vertex
@@ -5,8 +5,7 @@ uniform vec4 color;
out vec4 Color;
-void main()
-{
+void main() {
gl_Position = projMatrix * vec4(position, 0.0f, 1.0);
Color = color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment
index 51c299cca40..a0de4c3ed4e 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.fragment
@@ -6,8 +6,7 @@ uniform float alphaRef;
OUTPUT
-void main()
-{
+void main() {
vec4 texColor = texture(tex, Texcoord);
outColor.rgba = texColor.rgba * Color.rgba;
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
index aa2e6cb07c3..0e9a37ab539 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
@@ -26,8 +26,7 @@ out vec2 Texcoord;
out vec4 Color;
out vec3 Normal;
-void main()
-{
+void main() {
vec4 viewCoords = viewMatrix * modelMatrix * vec4(position, 1.0);
gl_Position = projMatrix * viewCoords;
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment
index ea57b6835be..150bb686a21 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.fragment
@@ -2,7 +2,6 @@ in vec4 Color;
OUTPUT
-void main()
-{
+void main() {
outColor = Color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex
index c6886e7a79c..a2096ae4d8b 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_mask.vertex
@@ -5,8 +5,7 @@ uniform vec4 color;
out vec4 Color;
-void main()
-{
+void main() {
gl_Position = projMatrix * vec4(position, 0.0, 1.0);
Color = color;
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment
index 919810306a4..34f46e2429c 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.fragment
@@ -1,3 +1,2 @@
-void main()
-{
+void main() {
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex
index f0d2d8d9794..96172c58f79 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_shadow_volume.vertex
@@ -4,7 +4,6 @@ uniform highp mat4 modelMatrix;
uniform highp mat4 viewMatrix;
uniform highp mat4 projMatrix;
-void main()
-{
+void main() {
gl_Position = projMatrix * viewMatrix * modelMatrix * vec4(position, 1.0);
}
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment b/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment
index d17aef4d677..90a67cc5e13 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.fragment
@@ -7,8 +7,7 @@ uniform bool alphaTest;
OUTPUT
-void main()
-{
+void main() {
vec4 texColor = texture(tex, Texcoord);
outColor = Color * texColor;
diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex
index 885f949fccd..29d0f257e87 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_sprite.vertex
@@ -9,8 +9,7 @@ uniform highp mat3 transform;
out vec2 Texcoord;
out vec4 Color;
-void main()
-{
+void main() {
vec3 transformed_position = transform * vec3(position, 1.0);
gl_Position = projMatrix * vec4(transformed_position.x, transformed_position.y, 0.9, 1.0);
Texcoord = texcoord;
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
index b85a528d8d4..373279bb72a 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
@@ -27,6 +27,7 @@
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/dcgf.h"
+
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS)
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
index b18fbbc8fa7..c56435fcbfd 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
@@ -29,6 +29,7 @@
#define WINTERMUTE_SHADOW_VOLUME_OPENGL_SHADER_H
#include "engines/wintermute/base/gfx/shadow_volume.h"
+
#include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS)
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 9c5ddef74a2..7dee1cc72e4 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -34,6 +34,7 @@
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/base_sprite.h"
#include "engines/util.h"
+
#include "common/system.h"
#include "common/queue.h"
#include "common/config-manager.h"
@@ -115,8 +116,6 @@ bool BaseRenderOSystem::initRenderer(int width, int height, bool windowed) {
_borderTop = (int)((_realHeight - (_height * ratio)) / 2);
_borderBottom = (int)(_realHeight - (_height * ratio) - _borderTop);
-
-
_ratioX = (float)(_realWidth - _borderLeft - _borderRight) / (float)_width;
_ratioY = (float)(_realHeight - _borderTop - _borderBottom) / (float)_height;
@@ -286,8 +285,8 @@ Graphics::PixelFormat BaseRenderOSystem::getPixelFormat() const {
return _renderSurface->format;
}
-void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, Graphics::TransformStruct &transform) {
-
+void BaseRenderOSystem::drawSurface(BaseSurfaceOSystem *owner, const Graphics::Surface *surf,
+ Common::Rect *srcRect, Common::Rect *dstRect, Graphics::TransformStruct &transform) {
if (_disableDirtyRects) {
RenderTicket *ticket = new RenderTicket(owner, surf, srcRect, dstRect, transform);
ticket->_wantsDraw = true;
@@ -513,7 +512,7 @@ bool BaseRenderOSystem::drawLine(int x1, int y1, int x2, int y2, uint32 color) {
//////////////////////////////////////////////////////////////////////////
BaseImage *BaseRenderOSystem::takeScreenshot() {
-// TODO: Clip by viewport.
+ // TODO: Clip by viewport.
BaseImage *screenshot = new BaseImage();
screenshot->copyFrom(_renderSurface);
return screenshot;
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 6458d282fbd..2b30361ce6f 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -29,9 +29,11 @@
#define WINTERMUTE_BASE_RENDERER_SDL_H
#include "engines/wintermute/base/gfx/base_renderer.h"
+
#include "common/rect.h"
-#include "graphics/surface.h"
#include "common/list.h"
+
+#include "graphics/surface.h"
#include "graphics/transform_struct.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index ddbb4ff7fb8..87dadcd1950 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -32,10 +32,12 @@
#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
#include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/platform_osystem.h"
+
#include "graphics/transparent_surface.h"
#include "graphics/transform_tools.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
+
#include "common/stream.h"
#include "common/system.h"
@@ -352,14 +354,12 @@ bool BaseSurfaceOSystem::endPixelOp() {
return STATUS_OK;
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurfaceOSystem::display(int x, int y, Rect32 rect, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
_rotation = 0;
return drawSprite(x, y, &rect, nullptr, Graphics::TransformStruct(Graphics::kDefaultZoomX, Graphics::kDefaultZoomY, mirrorX, mirrorY));
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurfaceOSystem::displayTrans(int x, int y, Rect32 rect, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY, int offsetX, int offsetY) {
_rotation = 0;
@@ -372,7 +372,6 @@ bool BaseSurfaceOSystem::displayTransZoom(int x, int y, Rect32 rect, float zoomX
return drawSprite(x, y, &rect, nullptr, Graphics::TransformStruct((int32)zoomX, (int32)zoomY, blendMode, TS_COLOR(alpha), mirrorX, mirrorY));
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurfaceOSystem::displayTransRotate(int x, int y, uint32 angle, int32 hotspotX, int32 hotspotY, Rect32 rect, float zoomX, float zoomY, uint32 alpha, Graphics::TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
Common::Point newHotspot;
@@ -399,7 +398,6 @@ bool BaseSurfaceOSystem::displayTiled(int x, int y, Rect32 rect, int numTimesX,
return drawSprite(x, y, &rect, nullptr, transform);
}
-
//////////////////////////////////////////////////////////////////////////
bool BaseSurfaceOSystem::drawSprite(int x, int y, Rect32 *rect, Rect32 *newRect, Graphics::TransformStruct transform) {
BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer);
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
index ada2c9540e0..94149b1a1fd 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
@@ -30,7 +30,9 @@
#include "graphics/surface.h"
#include "graphics/transparent_surface.h" // for Graphics::AlphaType
+
#include "engines/wintermute/base/gfx/base_surface.h"
+
#include "common/list.h"
namespace Wintermute {
@@ -49,7 +51,6 @@ public:
bool startPixelOp() override;
bool endPixelOp() override;
-
bool displayTransRotate(int x, int y, uint32 angle, int32 hotspotX, int32 hotspotY, Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
bool displayTransZoom(int x, int y, Rect32 rect, float zoomX, float zoomY, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) override;
bool displayTrans(int x, int y, Rect32 rect, uint32 alpha = Graphics::kDefaultRgbaMod, Graphics::TSpriteBlendMode blendMode = Graphics::BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false, int offsetX = 0, int offsetY = 0) override;
diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.cpp b/engines/wintermute/base/gfx/osystem/render_ticket.cpp
index c869b2032a8..e3318c61157 100644
--- a/engines/wintermute/base/gfx/osystem/render_ticket.cpp
+++ b/engines/wintermute/base/gfx/osystem/render_ticket.cpp
@@ -29,19 +29,22 @@
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/osystem/render_ticket.h"
#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
+
#include "graphics/transform_tools.h"
#include "graphics/transparent_surface.h"
+
#include "common/textconsole.h"
namespace Wintermute {
-RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, Graphics::TransformStruct transform) :
- _owner(owner),
- _srcRect(*srcRect),
- _dstRect(*dstRect),
- _isValid(true),
- _wantsDraw(true),
- _transform(transform) {
+RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *surf,
+ Common::Rect *srcRect, Common::Rect *dstRect, Graphics::TransformStruct transform) :
+ _owner(owner),
+ _srcRect(*srcRect),
+ _dstRect(*dstRect),
+ _isValid(true),
+ _wantsDraw(true),
+ _transform(transform) {
if (surf) {
_surface = new Graphics::Surface();
_surface->create((uint16)srcRect->width(), (uint16)srcRect->height(), surf->format);
diff --git a/engines/wintermute/base/gfx/osystem/render_ticket.h b/engines/wintermute/base/gfx/osystem/render_ticket.h
index 90885787d5f..0674f09ed61 100644
--- a/engines/wintermute/base/gfx/osystem/render_ticket.h
+++ b/engines/wintermute/base/gfx/osystem/render_ticket.h
@@ -29,6 +29,7 @@
#define WINTERMUTE_RENDER_TICKET_H
#include "graphics/surface.h"
+
#include "common/rect.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/animation.h b/engines/wintermute/base/gfx/x/animation.h
index 89aa86bae1d..659d9f5eee4 100644
--- a/engines/wintermute/base/gfx/x/animation.h
+++ b/engines/wintermute/base/gfx/x/animation.h
@@ -30,6 +30,7 @@
#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
+
#include "math/quat.h"
#include "math/vector3d.h"
diff --git a/engines/wintermute/base/gfx/x/loader_x.cpp b/engines/wintermute/base/gfx/x/loader_x.cpp
index d6a58ab1c08..0db0aecc2ea 100644
--- a/engines/wintermute/base/gfx/x/loader_x.cpp
+++ b/engines/wintermute/base/gfx/x/loader_x.cpp
@@ -24,6 +24,7 @@
#include "common/str.h"
#include "common/textconsole.h"
#include "common/util.h"
+
#include "engines/wintermute/base/gfx/x/loader_x.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/meshx.cpp b/engines/wintermute/base/gfx/x/meshx.cpp
index 1dcc36346fb..bf7a5961b81 100644
--- a/engines/wintermute/base/gfx/x/meshx.cpp
+++ b/engines/wintermute/base/gfx/x/meshx.cpp
@@ -279,7 +279,7 @@ bool MeshX::update(FrameNode *parentFrame) {
}
}
-// updateNormals();
+ //updateNormals();
} else { // update static
for (uint32 i = 0; i < _vertexCount; ++i) {
Math::Vector3d pos(_vertexPositionData + 3 * i);
diff --git a/engines/wintermute/base/gfx/x/meshx.h b/engines/wintermute/base/gfx/x/meshx.h
index cab99d917a8..111b803adc2 100644
--- a/engines/wintermute/base/gfx/x/meshx.h
+++ b/engines/wintermute/base/gfx/x/meshx.h
@@ -31,6 +31,7 @@
#include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/base/gfx/x/modelx.h"
#include "engines/wintermute/coll_templ.h"
+
#include "math/matrix4.h"
#include "math/vector3d.h"
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/x/modelx.cpp
index 4573b1a0d24..6744ed954a4 100644
--- a/engines/wintermute/base/gfx/x/modelx.cpp
+++ b/engines/wintermute/base/gfx/x/modelx.cpp
@@ -26,6 +26,7 @@
*/
#include "common/zlib.h"
+
#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/base_parser.h"
@@ -149,9 +150,9 @@ IMPLEMENT_PERSISTENT(ModelX, false)
//////////////////////////////////////////////////////////////////////////
ModelX::ModelX(BaseGame *inGame, BaseObject *owner) : BaseObject(inGame),
- _owner(owner), _lastOffsetX(0), _lastOffsetY(0),
- _BBoxStart(0.0f, 0.0f, 0.0f), _BBoxEnd(0.0f, 0.0f, 0.0f),
- _rootFrame(nullptr) {
+ _owner(owner), _lastOffsetX(0), _lastOffsetY(0),
+ _BBoxStart(0.0f, 0.0f, 0.0f), _BBoxEnd(0.0f, 0.0f, 0.0f),
+ _rootFrame(nullptr) {
_drawingViewport.setEmpty();
_lastWorldMat.setToIdentity();
_lastViewMat.setToIdentity();
diff --git a/engines/wintermute/base/gfx/x/modelx.h b/engines/wintermute/base/gfx/x/modelx.h
index e66adf3c19b..0f03aed4c27 100644
--- a/engines/wintermute/base/gfx/x/modelx.h
+++ b/engines/wintermute/base/gfx/x/modelx.h
@@ -33,6 +33,7 @@
#include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/video/video_theora_player.h"
+
#include "math/matrix4.h"
#include "math/vector3d.h"
#include "math/vector4d.h"
More information about the Scummvm-git-logs
mailing list