summaryrefslogtreecommitdiffstats
path: root/src/graphics/core/texture.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/core/texture.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/core/texture.h')
-rw-r--r--src/graphics/core/texture.h4
1 files changed, 4 insertions, 0 deletions
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()