mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed primitive types to be grammatically correct.

Browse Source
This commit is contained in:
verrazano 2015-08-08 20:18:19 -05:00 committed by Lukas Dürrenberger
parent fb40e7e43f
commit afb8254b6d
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/SFML/Graphics/PrimitiveType.hpp
View File

@ -38,13 +38,18 @@ namespace sf
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
enum PrimitiveType enum PrimitiveType
{ {
Points, ///< List of individual points Points, ///< List of individual points
Lines, ///< List of individual lines Lines, ///< List of individual lines
LinesStrip, ///< List of connected lines, a point uses the previous point to form a line LineStrip, ///< List of connected lines, a point uses the previous point to form a line
Triangles, ///< List of individual triangles Triangles, ///< List of individual triangles
TrianglesStrip, ///< List of connected triangles, a point uses the two previous points to form a triangle TriangleStrip, ///< List of connected triangles, a point uses the two previous points to form a triangle
TrianglesFan, ///< List of connected triangles, a point uses the common center and the previous point to form a triangle TriangleFan, ///< List of connected triangles, a point uses the common center and the previous point to form a triangle
Quads ///< List of individual quads (deprecated, don't work with OpenGL ES) Quads, ///< List of individual quads (deprecated, don't work with OpenGL ES)
// Deprecated names
LinesStrip = LineStrip, /// \deprecated Use LineStrip instead
TrianglesStrip = TriangleStrip, /// \deprecated Use TriangleStrip instead
TrianglesFan = TriangleFan /// \deprecated Use TriangleFan instead
}; };
} // namespace sf } // namespace sf

2
include/SFML/Graphics/VertexArray.hpp
View File

@ -209,7 +209,7 @@ private:
/// ///
/// Example: /// Example:
/// \code /// \code
/// sf::VertexArray lines(sf::LinesStrip, 4); /// sf::VertexArray lines(sf::LineStrip, 4);
/// lines[0].position = sf::Vector2f(10, 0); /// lines[0].position = sf::Vector2f(10, 0);
/// lines[1].position = sf::Vector2f(20, 0); /// lines[1].position = sf::Vector2f(20, 0);
/// lines[2].position = sf::Vector2f(30, 5); /// lines[2].position = sf::Vector2f(30, 5);

4
src/SFML/Graphics/Shape.cpp
View File

@ -163,8 +163,8 @@ m_textureRect (),
m_fillColor (255, 255, 255), m_fillColor (255, 255, 255),
m_outlineColor (255, 255, 255), m_outlineColor (255, 255, 255),
m_outlineThickness(0), m_outlineThickness(0),
m_vertices (TrianglesFan), m_vertices (TriangleFan),
m_outlineVertices (TrianglesStrip), m_outlineVertices (TriangleStrip),
m_insideBounds (), m_insideBounds (),
m_bounds () m_bounds ()
{ {

2
src/SFML/Graphics/Sprite.cpp
View File

@ -140,7 +140,7 @@ void Sprite::draw(RenderTarget& target, RenderStates states) const
{ {
states.transform *= getTransform(); states.transform *= getTransform();
states.texture = m_texture; states.texture = m_texture;
target.draw(m_vertices, 4, TrianglesStrip, states); target.draw(m_vertices, 4, TriangleStrip, states);
} }
} }