diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-11 17:17:04 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-08-11 17:17:04 +0200 |
commit | 7f80ca297154809523cd533edf1842ab1ae391aa (patch) | |
tree | 08eb658d2dad62ac683e55dc89cc97bc898fd95c /src/graphics/core | |
parent | 63257034c946d40fb3ecc73a9ee3dc9d1e0a1e34 (diff) | |
download | colobot-7f80ca297154809523cd533edf1842ab1ae391aa.tar.gz colobot-7f80ca297154809523cd533edf1842ab1ae391aa.tar.bz2 colobot-7f80ca297154809523cd533edf1842ab1ae391aa.zip |
Render mode setting, refactoring
- finished SetState in CEngine
- refactored Size and IntSize back to Point and IntPoint
- other minor changes in CEngine
Diffstat (limited to 'src/graphics/core')
-rw-r--r-- | src/graphics/core/device.h | 6 | ||||
-rw-r--r-- | src/graphics/core/texture.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h index 3ab86dd..d4fcd26 100644 --- a/src/graphics/core/device.h +++ b/src/graphics/core/device.h @@ -25,7 +25,7 @@ #include "graphics/core/material.h" #include "graphics/core/texture.h" #include "graphics/core/vertex.h" -#include "math/intsize.h" +#include "math/intpoint.h" #include "math/matrix.h" #include <string> @@ -46,7 +46,7 @@ namespace Gfx { struct DeviceConfig { //! Screen size - Math::IntSize size; + Math::IntPoint size; //! Bits per pixel int bpp; //! Full screen @@ -64,7 +64,7 @@ struct DeviceConfig //! Loads the default values inline void LoadDefault() { - size = Math::IntSize(800, 600); + size = Math::IntPoint(800, 600); bpp = 32; fullScreen = false; resizeable = false; diff --git a/src/graphics/core/texture.h b/src/graphics/core/texture.h index 8d6b082..bb5b52f 100644 --- a/src/graphics/core/texture.h +++ b/src/graphics/core/texture.h @@ -18,7 +18,7 @@ #pragma once -#include "math/intsize.h" +#include "math/intpoint.h" namespace Gfx { @@ -194,7 +194,7 @@ struct Texture //! ID of the texture in graphics engine unsigned int id; //! Size of texture - Math::IntSize size; + Math::IntPoint size; //! Whether the texture has alpha channel bool alpha; |