summaryrefslogtreecommitdiffstats
path: root/src/graphics/core
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-26 16:31:04 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-26 16:31:04 +0200
commit45fd8aad33029746424031e12777f2824bda245e (patch)
tree7c984ec6bfda42c807ba48440f6d61fcef9056ef /src/graphics/core
parentb06544871ae48871fc302706ecc49b78c6bcb3d2 (diff)
downloadcolobot-45fd8aad33029746424031e12777f2824bda245e.tar.gz
colobot-45fd8aad33029746424031e12777f2824bda245e.tar.bz2
colobot-45fd8aad33029746424031e12777f2824bda245e.zip
Fog color fix; refactoring
- fixed fog color setting - removed unused glSecondaryColor and altered struct VertexCol - minor refactoring in CText
Diffstat (limited to 'src/graphics/core')
-rw-r--r--src/graphics/core/vertex.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/graphics/core/vertex.h b/src/graphics/core/vertex.h
index 9ab4dbb..e2c35c3 100644
--- a/src/graphics/core/vertex.h
+++ b/src/graphics/core/vertex.h
@@ -69,36 +69,28 @@ struct Vertex
/**
* \struct VertexCol
- * \brief Vertex with color information
- *
- * This structure was created as analog to DirectX's D3DLVERTEX.
+ * \brief Colored vertex
*
* It contains:
* - vertex coordinates (x,y,z) as Math::Vector,
- * - RGBA color as Color,
- * - RGBA specular color as Color,
- * - texture coordinates (u,v) as Math::Point.
+ * - RGBA color as Color
*/
struct VertexCol
{
Math::Vector coord;
Color color;
- Color specular;
- Math::Point texCoord;
explicit VertexCol(Math::Vector aCoord = Math::Vector(),
Color aColor = Color(),
- Color aSpecular = Color(),
Math::Point aTexCoord = Math::Point())
- : coord(aCoord), color(aColor), specular(aSpecular), texCoord(aTexCoord) {}
+ : coord(aCoord), color(aColor) {}
- //! Returns a string "(c: [...], col: [...], sp: [...], tc: [...])"
+ //! Returns a string "(c: [...], col: [...])"
inline std::string ToString() const
{
std::stringstream s;
s.precision(3);
- s << "(c: " << coord.ToString() << ", col: " << color.ToString() << ", sp: "
- << specular.ToString() << ", tc: " << texCoord.ToString() << ")";
+ s << "(c: " << coord.ToString() << ", col: " << color.ToString() << ")";
return s.str();
}
};