diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:40:27 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-26 16:40:27 +0200 |
commit | 6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c (patch) | |
tree | 0743ec727b22c5f91579d9baafa10a5cbb67bd60 /src/graphics/core | |
parent | dad42df4c7878e3da67ab66549fc1a3132893160 (diff) | |
parent | 45fd8aad33029746424031e12777f2824bda245e (diff) | |
download | colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.tar.gz colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.tar.bz2 colobot-6bdc1e8ac1f0183ae635a342b7c2bb3c9ab6f63c.zip |
Merge master & dev
Diffstat (limited to 'src/graphics/core')
-rw-r--r-- | src/graphics/core/vertex.h | 18 |
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(); } }; |