summaryrefslogtreecommitdiffstats
path: root/src/graphics/opengl/gldevice.h
diff options
context:
space:
mode:
authoradiblol <adiblol@hydrogen>2012-09-29 22:49:31 +0200
committeradiblol <adiblol@hydrogen>2012-09-29 22:49:31 +0200
commit4f097c10b3750e570fa0f709069d9f2e96752c00 (patch)
tree22fcd2cd806db97484ce07b0a88ea341803fce85 /src/graphics/opengl/gldevice.h
parentc8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff)
parent4193f8a3a9f10b563c8fada163c3a6d3860f3457 (diff)
downloadcolobot-4f097c10b3750e570fa0f709069d9f2e96752c00.tar.gz
colobot-4f097c10b3750e570fa0f709069d9f2e96752c00.tar.bz2
colobot-4f097c10b3750e570fa0f709069d9f2e96752c00.zip
Merge branch 'dev-graphics' of github.com:colobot/colobot into dev-graphics
Diffstat (limited to 'src/graphics/opengl/gldevice.h')
-rw-r--r--src/graphics/opengl/gldevice.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h
index 78c7433..8af864e 100644
--- a/src/graphics/opengl/gldevice.h
+++ b/src/graphics/opengl/gldevice.h
@@ -119,9 +119,6 @@ public:
virtual void SetTextureStageWrap(int index, Gfx::TexWrapMode wrapS, Gfx::TexWrapMode wrapT);
- virtual void SetTextureFactor(const Color &color);
- virtual Color GetTextureFactor();
-
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);