diff options
author | adiblol <adiblol@hydrogen> | 2012-09-29 22:49:31 +0200 |
---|---|---|
committer | adiblol <adiblol@hydrogen> | 2012-09-29 22:49:31 +0200 |
commit | 4f097c10b3750e570fa0f709069d9f2e96752c00 (patch) | |
tree | 22fcd2cd806db97484ce07b0a88ea341803fce85 /src/graphics/core | |
parent | c8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff) | |
parent | 4193f8a3a9f10b563c8fada163c3a6d3860f3457 (diff) | |
download | colobot-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/core')
-rw-r--r-- | src/graphics/core/device.h | 5 | ||||
-rw-r--r-- | src/graphics/core/texture.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h index 0d76644..0777396 100644 --- a/src/graphics/core/device.h +++ b/src/graphics/core/device.h @@ -307,11 +307,6 @@ public: //! Sets only the texture wrap modes (for faster than thru stage params) virtual void SetTextureStageWrap(int index, TexWrapMode wrapS, TexWrapMode wrapT) = 0; - //! Sets the texture factor to the given color value - virtual void SetTextureFactor(const Color &color) = 0; - //! Returns the current texture factor - virtual Color GetTextureFactor() = 0; - //! Renders primitive composed of vertices with single texture virtual void DrawPrimitive(PrimitiveType type, const Vertex *vertices , int vertexCount) = 0; //! Renders primitive composed of vertices with color information and single texture diff --git a/src/graphics/core/texture.h b/src/graphics/core/texture.h index 3ebbee5..49b29f8 100644 --- a/src/graphics/core/texture.h +++ b/src/graphics/core/texture.h @@ -22,6 +22,8 @@ #pragma once +#include "graphics/core/color.h" + #include "math/intpoint.h" @@ -175,6 +177,8 @@ struct TextureStageParams TexWrapMode wrapS; //! Wrap mode for 2nd tex coord TexWrapMode wrapT; + //! Constant color factor (for TEX_MIX_ARG_FACTOR) + Color factor; //! Constructor; calls LoadDefault() TextureStageParams() |