lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed Window::UseVerticalSync to EnableVerticalSync

Browse source 
Renamed Shape::Get/SetOutlineWidth to Get/SetOutlineThickness

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1767 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2011-01-02 22:23:12 +00:00
parent 3cf2281988
commit f4fa8b1fbc
25 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/SFML/Graphics/Drawable.hpp
View file

@ -155,12 +155,12 @@ public :
/// See Scale to add a factor based on the previous scale instead.
/// The default scale of a drawable object is (1, 1).
///
/// \param scale New scale factors
/// \param factors New scale factors
///
/// \see Scale, SetScaleX, SetScaleY, GetScale
///
////////////////////////////////////////////////////////////
void SetScale(const Vector2f& scale);
void SetScale(const Vector2f& factors);
////////////////////////////////////////////////////////////
/// \brief Set the X scale factor of the object

30
include/SFML/Graphics/Shape.hpp
View file

@ -172,12 +172,12 @@ public :
////////////////////////////////////////////////////////////
/// \brief Change the thickness of the shape outline
///
/// \param width New width of the outline
/// \param thickness New thickness of the outline
///
/// \see GetOutlineWidth, EnableOutline
/// \see GetOutlineThickness, EnableOutline
///
////////////////////////////////////////////////////////////
void SetOutlineWidth(float width);
void SetOutlineThickness(float thickness);
////////////////////////////////////////////////////////////
/// \brief Get the position of a point
@ -230,12 +230,12 @@ public :
////////////////////////////////////////////////////////////
/// \brief Get the thickness of the shape outline
///
/// \return Current outline width
/// \return Current outline thickness
///
/// \see SetOutlineWidth
/// \see SetOutlineThickness
///
////////////////////////////////////////////////////////////
float GetOutlineWidth() const;
float GetOutlineThickness() const;
////////////////////////////////////////////////////////////
/// \brief Create a new line
@ -257,7 +257,7 @@ public :
/// \param p2y Y coordinate of the end point
/// \param thickness Thickness of the line
/// \param color Color of the shape's points
/// \param outline Outline width
/// \param outline Outline thickness
/// \param outlineColor Outline color of the shape's points
///
/// \see Rectangle, Circle
@ -285,7 +285,7 @@ public :
/// \param end End point
/// \param thickness Thickness of the line
/// \param color Color of the shape's points
/// \param outline Outline width
/// \param outline Outline thickness
/// \param outlineColor Outline color of the shape's points
///
/// \see Rectangle, Circle
@ -312,7 +312,7 @@ public :
/// \param width Width of the rectangle
/// \param height Height of the rectangle
/// \param color Color of the shape's points
/// \param outline Outline width
/// \param outline Outline thickness
/// \param outlineColor Outline color of the shape's points
///
/// \see Line, Circle
@ -337,7 +337,7 @@ public :
///
/// \param rectangle Rectangle defining the shape
/// \param color Color of the shape's points
/// \param outline Outline width
/// \param outline Outline thickness
/// \param outlineColor Outline color of the shape's points
///
/// \see Line, Circle
@ -363,7 +363,7 @@ public :
/// \param y Y coordinate of the center
/// \param radius Radius of the circle
/// \param color Color of the shape's points
/// \param outline Outline width
/// \param outline Outline thickness
/// \param outlineColor Outline color of the shape's points
///
/// \see Line, Rectangle
@ -389,7 +389,7 @@ public :
/// \param center Center of the circle
/// \param radius Radius of the circle
/// \param color Color of the shape's points
/// \param outline Outline width
/// \param outline Outline thickness
/// \param outlineColor Outline color of the shape's points
///
/// \see Line, Rectangle
@ -449,7 +449,7 @@ private :
// Member data
////////////////////////////////////////////////////////////
std::vector<Point> myPoints; ///< Points composing the shape
float myOutline; ///< Outline width
float myOutline; ///< Outline thickness
bool myIsFillEnabled; ///< Should we draw the inside if the shape ?
bool myIsOutlineEnabled; ///< Should we draw the outline if the shape ?
bool myIsCompiled; ///< Compiled state of the shape
@ -480,7 +480,7 @@ private :
/// \li outline color
///
/// Shapes have an outline that can be enabled or not. You can
/// control the thickness of the outline with the SetOutlineWidth
/// control the thickness of the outline with the SetOutlineThickness
/// function.
///
/// They also inherits all the functions from sf::Drawable:
@ -523,7 +523,7 @@ private :
/// // Enable outline only
/// shape.EnableFill(false);
/// shape.EnableOutline(true);
/// shape.SetOutlineWidth(10);
/// shape.SetOutlineThickness(10);
///
/// // Display it
/// window.Draw(shape); // window is a sf::RenderWindow

2
include/SFML/Window/Window.hpp
View file

@ -265,7 +265,7 @@ public :
/// \param enabled True to enable v-sync, false to deactivate
///
////////////////////////////////////////////////////////////
void UseVerticalSync(bool enabled);
void EnableVerticalSync(bool enabled);
////////////////////////////////////////////////////////////
/// \brief Show or hide the mouse cursor