summaryrefslogtreecommitdiffstats
path: root/src/graphics/core
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-29 22:44:05 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-29 22:44:05 +0200
commit4193f8a3a9f10b563c8fada163c3a6d3860f3457 (patch)
tree65615c8f5b4b7e3efee3b0b2c9f77b3ffef23175 /src/graphics/core
parent5a751d9c0da79b38d4104bbe0cc1b5feec3d6ecc (diff)
downloadcolobot-4193f8a3a9f10b563c8fada163c3a6d3860f3457.tar.gz
colobot-4193f8a3a9f10b563c8fada163c3a6d3860f3457.tar.bz2
colobot-4193f8a3a9f10b563c8fada163c3a6d3860f3457.zip
Fix for transparent objects and fadeouts
Diffstat (limited to 'src/graphics/core')
-rw-r--r--src/graphics/core/device.h5
-rw-r--r--src/graphics/core/texture.h4
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()