diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-30 10:56:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-30 10:56:35 +0200 |
commit | 8ea4736a46f1a468ee214528ba539e1f505b8273 (patch) | |
tree | db47648ae56b1cc5314afe8ee96fb81e0e276351 /src/graphics/opengl/gldevice.h | |
parent | af4ff31b4ebcd9d42eed9ae344d29f8d95c3b7c9 (diff) | |
download | colobot-8ea4736a46f1a468ee214528ba539e1f505b8273.tar.gz colobot-8ea4736a46f1a468ee214528ba539e1f505b8273.tar.bz2 colobot-8ea4736a46f1a468ee214528ba539e1f505b8273.zip |
Font coloring; fix for resize hack
- added font coloring and changed default color to black
- fixed resize hack incorrectly changing video config,
but font resizing will not work for now
Diffstat (limited to 'src/graphics/opengl/gldevice.h')
-rw-r--r-- | src/graphics/opengl/gldevice.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h index 2f9b9d8..cda7b02 100644 --- a/src/graphics/opengl/gldevice.h +++ b/src/graphics/opengl/gldevice.h @@ -86,7 +86,6 @@ public: virtual void BeginScene(); virtual void EndScene(); - virtual void ResizeViewport(const unsigned int width, const unsigned int height); virtual void Clear(); @@ -120,9 +119,13 @@ public: virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT); - virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices, int vertexCount); - virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices, int vertexCount); - virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount); + //! Renders primitive composed of vertices with single texture + virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount, + Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)); + //! Renders primitive composed of vertices with multitexturing (2 textures) + virtual void DrawPrimitive(PrimitiveType type, const VertexTex2 *vertices, int vertexCount, + Color color = Color(1.0f, 1.0f, 1.0f, 1.0f)); + virtual void DrawPrimitive(PrimitiveType type, const VertexCol *vertices , int vertexCount); virtual int ComputeSphereVisibility(const Math::Vector ¢er, float radius); |