Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Shape::GetNbPoints to Shape::GetPointsCount (consistent with the other similar functions)

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1408 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-02-17 12:05:02 +00:00
parent aa2199bbb3
commit b60fda48d9
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CSFML/include/SFML/Graphics/Shape.h
View File

@ -394,7 +394,7 @@ CSFML_API float sfShape_GetOutlineWidth(const sfShape* shape);
/// \return Total number of points /// \return Total number of points
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
CSFML_API unsigned int sfShape_GetNbPoints(const sfShape* shape); CSFML_API unsigned int sfShape_GetPointsCount(const sfShape* shape);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get a the position of a shape's point /// Get a the position of a shape's point

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

@ -388,9 +388,9 @@ float sfShape_GetOutlineWidth(const sfShape* shape)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the number of points composing a shape /// Get the number of points composing a shape
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int sfShape_GetNbPoints(const sfShape* shape) unsigned int sfShape_GetPointsCount(const sfShape* shape)
{ {
CSFML_CALL_RETURN(shape, GetNbPoints(), 0) CSFML_CALL_RETURN(shape, GetPointsCount(), 0)
} }

2
CSFML/src/SFML/Graphics/csfml-graphics-d.def
View File

@ -84,7 +84,7 @@ EXPORTS
sfShape_EnableOutline sfShape_EnableOutline
sfShape_SetOutlineWidth sfShape_SetOutlineWidth
sfShape_GetOutlineWidth sfShape_GetOutlineWidth
sfShape_GetNbPoints sfShape_GetPointsCount
sfShape_GetPointPosition sfShape_GetPointPosition
sfShape_GetPointColor sfShape_GetPointColor
sfShape_GetPointOutlineColor sfShape_GetPointOutlineColor

2
CSFML/src/SFML/Graphics/csfml-graphics.def
View File

@ -84,7 +84,7 @@ EXPORTS
sfShape_EnableOutline sfShape_EnableOutline
sfShape_SetOutlineWidth sfShape_SetOutlineWidth
sfShape_GetOutlineWidth sfShape_GetOutlineWidth
sfShape_GetNbPoints sfShape_GetPointsCount
sfShape_GetPointPosition sfShape_GetPointPosition
sfShape_GetPointColor sfShape_GetPointColor
sfShape_GetPointOutlineColor sfShape_GetPointOutlineColor

BIN
dotnet/extlibs/csfml-audio.dll
View File

Binary file not shown.

BIN
dotnet/extlibs/csfml-graphics.dll
View File

Binary file not shown.

BIN
dotnet/extlibs/csfml-window.dll
View File

Binary file not shown.

10
dotnet/src/Graphics/Shape.cs
View File

@ -197,12 +197,12 @@ namespace SFML
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// <summary> /// <summary>
/// Totla number of points of the shape /// Total number of points of the shape
/// </summary> /// </summary>
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
public uint NbPoints public uint PointsCount
{ {
get {return sfShape_GetNbPoints(This);} get {return sfShape_GetPointsCount(This);}
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -388,7 +388,7 @@ namespace SFML
" Color(" + Color + ")" + " Color(" + Color + ")" +
" BlendMode(" + BlendMode + ")" + " BlendMode(" + BlendMode + ")" +
" OutlineWidth(" + OutlineWidth + ")" + " OutlineWidth(" + OutlineWidth + ")" +
" NbPoints(" + NbPoints + ")"; " PointsCount(" + PointsCount + ")";
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -541,7 +541,7 @@ namespace SFML
static extern float sfShape_GetOutlineWidth(IntPtr This); static extern float sfShape_GetOutlineWidth(IntPtr This);
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
static extern uint sfShape_GetNbPoints(IntPtr This); static extern uint sfShape_GetPointsCount(IntPtr This);
[DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity]
static extern void sfShape_SetPointPosition(IntPtr This, uint Index, float X, float Y); static extern void sfShape_SetPointPosition(IntPtr This, uint Index, float X, float Y);

16
include/SFML/Graphics/Shape.hpp
View File

@ -76,7 +76,7 @@ public :
/// \param Total number of points /// \param Total number of points
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int GetNbPoints() const; unsigned int GetPointsCount() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Enable or disable filling the shape. /// Enable or disable filling the shape.
@ -99,7 +99,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Set the position of a point /// Set the position of a point
/// ///
/// \param index : Index of the point, in range [0, GetNbPoints() - 1] /// \param index : Index of the point, in range [0, GetPointsCount() - 1]
/// \param position : New position of the index-th point /// \param position : New position of the index-th point
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -108,7 +108,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Set the position of a point /// Set the position of a point
/// ///
/// \param index : Index of the point, in range [0, GetNbPoints() - 1] /// \param index : Index of the point, in range [0, GetPointsCount() - 1]
/// \param x : New X coordinate of the index-th point /// \param x : New X coordinate of the index-th point
/// \param y : New Y coordinate of the index-th point /// \param y : New Y coordinate of the index-th point
/// ///
@ -118,7 +118,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Set the color of a point /// Set the color of a point
/// ///
/// \param index : Index of the point, in range [0, GetNbPoints() - 1] /// \param index : Index of the point, in range [0, GetPointsCount() - 1]
/// \param color : New color of the index-th point /// \param color : New color of the index-th point
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -127,7 +127,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Set the outline color of a point /// Set the outline color of a point
/// ///
/// \param index : Index of the point, in range [0, GetNbPoints() - 1] /// \param index : Index of the point, in range [0, GetPointsCount() - 1]
/// \param outlineColor : New outline color of the index-th point /// \param outlineColor : New outline color of the index-th point
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -144,7 +144,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the position of a point /// Get the position of a point
/// ///
/// \param index : Index of the point, in range [0, GetNbPoints() - 1] /// \param index : Index of the point, in range [0, GetPointsCount() - 1]
/// ///
/// \return Position of the index-th point /// \return Position of the index-th point
/// ///
@ -154,7 +154,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the color of a point /// Get the color of a point
/// ///
/// \param Index : index of the point, in range [0, GetNbPoints() - 1] /// \param Index : index of the point, in range [0, GetPointsCount() - 1]
/// ///
/// \return Color of the index-th point /// \return Color of the index-th point
/// ///
@ -164,7 +164,7 @@ public :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the outline color of a point /// Get the outline color of a point
/// ///
/// \param index : Index of the point, in range [0, GetNbPoints() - 1] /// \param index : Index of the point, in range [0, GetPointsCount() - 1]
/// ///
/// \return Outline color of the index-th point /// \return Outline color of the index-th point
/// ///

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

@ -68,7 +68,7 @@ void Shape::AddPoint(const Vector2f& position, const Color& color, const Color&
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the number of points composing the shape /// Get the number of points composing the shape
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
unsigned int Shape::GetNbPoints() const unsigned int Shape::GetPointsCount() const
{ {
return static_cast<unsigned int>(myPoints.size() - 1); return static_cast<unsigned int>(myPoints.size() - 1);
} }