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

2
bindings/c/include/SFML/Graphics/RenderWindow.h
View file

@ -141,7 +141,7 @@ CSFML_API sfBool sfRenderWindow_WaitEvent(sfRenderWindow* renderWindow, sfEvent*
/// \param enabled : sfTrue to enable v-sync, sfFalse to deactivate
///
////////////////////////////////////////////////////////////
CSFML_API void sfRenderWindow_UseVerticalSync(sfRenderWindow* renderWindow, sfBool enabled);
CSFML_API void sfRenderWindow_EnableVerticalSync(sfRenderWindow* renderWindow, sfBool enabled);
////////////////////////////////////////////////////////////
/// Show or hide the mouse cursor on a window

18
bindings/c/include/SFML/Graphics/Shape.h
View file

@ -49,7 +49,7 @@ CSFML_API sfShape* sfShape_Create(void);
/// \param p2x, p2y : Position second point
/// \param thickness : Line thickness
/// \param color : Color used to draw the line
/// \param outline : Outline width
/// \param outline : Outline thickness
/// \param outlineColor : Color used to draw the outline
///
////////////////////////////////////////////////////////////
@ -61,7 +61,7 @@ CSFML_API sfShape* sfShape_CreateLine(float p1x, float p1y, float p2x, float p2y
/// \param left, top : Top-left corner of the rectangle
/// \param width, height : Size of the rectangle
/// \param color : Color used to fill the rectangle
/// \param outline : Outline width
/// \param outline : Outline thickness
/// \param outlineColor : Color used to draw the outline
///
////////////////////////////////////////////////////////////
@ -73,7 +73,7 @@ CSFML_API sfShape* sfShape_CreateRectangle(float left, float top, float width, f
/// \param x, y : Position of the center
/// \param radius : Radius
/// \param color : Color used to fill the circle
/// \param outline : Outline width
/// \param outline : Outline thickness
/// \param outlineColor : Color used to draw the outline
///
////////////////////////////////////////////////////////////
@ -368,23 +368,23 @@ CSFML_API void sfShape_EnableFill(sfShape* shape, sfBool enable);
CSFML_API void sfShape_EnableOutline(sfShape* shape, sfBool enable);
////////////////////////////////////////////////////////////
/// Change the width of a shape outline
/// Change the thickness of a shape outline
///
/// \param shape : Shape to modify
/// \param width : New width
/// \param thickness : New thickness
///
////////////////////////////////////////////////////////////
CSFML_API void sfShape_SetOutlineWidth(sfShape* shape, float width);
CSFML_API void sfShape_SetOutlineThickness(sfShape* shape, float thickness);
////////////////////////////////////////////////////////////
/// Get the width of a shape outline
/// Get the thickness of a shape outline
///
/// \param shape : Shape to read
///
/// \param return Current outline width
/// \param return Current outline thickness
///
////////////////////////////////////////////////////////////
CSFML_API float sfShape_GetOutlineWidth(const sfShape* shape);
CSFML_API float sfShape_GetOutlineThickness(const sfShape* shape);
////////////////////////////////////////////////////////////
/// Get the number of points composing a shape

2
bindings/c/include/SFML/Window/Window.h
View file

@ -166,7 +166,7 @@ CSFML_API sfBool sfWindow_WaitEvent(sfWindow* window, sfEvent* event);
/// \param enabled : sfTrue to enable v-sync, sfFalse to deactivate
///
////////////////////////////////////////////////////////////
CSFML_API void sfWindow_UseVerticalSync(sfWindow* window, sfBool enabled);
CSFML_API void sfWindow_EnableVerticalSync(sfWindow* window, sfBool enabled);
////////////////////////////////////////////////////////////
/// Show or hide the mouse cursor on a window

4
bindings/c/src/SFML/Graphics/RenderWindow.cpp
View file

@ -204,9 +204,9 @@ sfBool sfRenderWindow_WaitEvent(sfRenderWindow* renderWindow, sfEvent* event)
////////////////////////////////////////////////////////////
/// Enable / disable vertical synchronization on a window
////////////////////////////////////////////////////////////
void sfRenderWindow_UseVerticalSync(sfRenderWindow* renderWindow, sfBool enabled)
void sfRenderWindow_EnableVerticalSync(sfRenderWindow* renderWindow, sfBool enabled)
{
CSFML_CALL(renderWindow, UseVerticalSync(enabled == sfTrue));
CSFML_CALL(renderWindow, EnableVerticalSync(enabled == sfTrue));
}

12
bindings/c/src/SFML/Graphics/Shape.cpp
View file

@ -368,20 +368,20 @@ void sfShape_EnableOutline(sfShape* shape, sfBool enable)
////////////////////////////////////////////////////////////
/// Change the width of a shape outline
/// Change the thickness of a shape outline
////////////////////////////////////////////////////////////
void sfShape_SetOutlineWidth(sfShape* shape, float width)
void sfShape_SetOutlineThickness(sfShape* shape, float thickness)
{
CSFML_CALL(shape, SetOutlineWidth(width))
CSFML_CALL(shape, SetOutlineThickness(thickness))
}
////////////////////////////////////////////////////////////
/// Get the width of a shape outline
/// Get the thickness of a shape outline
////////////////////////////////////////////////////////////
float sfShape_GetOutlineWidth(const sfShape* shape)
float sfShape_GetOutlineThickness(const sfShape* shape)
{
CSFML_CALL_RETURN(shape, GetOutlineWidth(), 0.f)
CSFML_CALL_RETURN(shape, GetOutlineThickness(), 0.f)
}

4
bindings/c/src/SFML/Window/Window.cpp
View file

@ -196,9 +196,9 @@ sfBool sfWindow_WaitEvent(sfWindow* window, sfEvent* event)
////////////////////////////////////////////////////////////
/// Enable / disable vertical synchronization on a window
////////////////////////////////////////////////////////////
void sfWindow_UseVerticalSync(sfWindow* window, sfBool enabled)
void sfWindow_EnableVerticalSync(sfWindow* window, sfBool enabled)
{
CSFML_CALL(window, UseVerticalSync(enabled == sfTrue))
CSFML_CALL(window, EnableVerticalSync(enabled == sfTrue))
}

BIN
bindings/dotnet/extlibs/csfml-audio-2.dll
View file

Binary file not shown.

BIN
bindings/dotnet/extlibs/csfml-graphics-2.dll
View file

Binary file not shown.

BIN
bindings/dotnet/extlibs/csfml-window-2.dll
View file

Binary file not shown.

6
bindings/dotnet/src/Graphics/RenderWindow.cs
View file

@ -152,9 +152,9 @@ namespace SFML
/// </summary>
/// <param name="enable">True to enable v-sync, false to deactivate</param>
////////////////////////////////////////////////////////////
public override void UseVerticalSync(bool enable)
public override void EnableVerticalSync(bool enable)
{
sfRenderWindow_UseVerticalSync(This, enable);
sfRenderWindow_EnableVerticalSync(This, enable);
}
////////////////////////////////////////////////////////////
@ -555,7 +555,7 @@ namespace SFML
static extern ContextSettings sfRenderWindow_GetSettings(IntPtr This);
[DllImport("csfml-graphics-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfRenderWindow_UseVerticalSync(IntPtr This, bool Enable);
static extern void sfRenderWindow_EnableVerticalSync(IntPtr This, bool Enable);
[DllImport("csfml-graphics-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfRenderWindow_ShowMouseCursor(IntPtr This, bool Show);

14
bindings/dotnet/src/Graphics/Shape.cs
View file

@ -186,13 +186,13 @@ namespace SFML
////////////////////////////////////////////////////////////
/// <summary>
/// Width of the shape outline
/// Thickness of the shape outline
/// </summary>
////////////////////////////////////////////////////////////
public float OutlineWidth
public float OutlineThickness
{
get {return sfShape_GetOutlineWidth(This);}
set {sfShape_SetOutlineWidth(This, value);}
get {return sfShape_GetOutlineThickness(This);}
set {sfShape_SetOutlineThickness(This, value);}
}
////////////////////////////////////////////////////////////
@ -385,7 +385,7 @@ namespace SFML
" Origin(" + Origin + ")" +
" Color(" + Color + ")" +
" BlendMode(" + BlendMode + ")" +
" OutlineWidth(" + OutlineWidth + ")" +
" OutlineThickness(" + OutlineThickness + ")" +
" PointsCount(" + PointsCount + ")";
}
@ -533,10 +533,10 @@ namespace SFML
static extern void sfShape_EnableOutline(IntPtr This, bool Enable);
[DllImport("csfml-graphics-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfShape_SetOutlineWidth(IntPtr This, float Width);
static extern void sfShape_SetOutlineThickness(IntPtr This, float Thickness);
[DllImport("csfml-graphics-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern float sfShape_GetOutlineWidth(IntPtr This);
static extern float sfShape_GetOutlineThickness(IntPtr This);
[DllImport("csfml-graphics-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern uint sfShape_GetPointsCount(IntPtr This);

6
bindings/dotnet/src/Window/Window.cs
View file

@ -187,9 +187,9 @@ namespace SFML
/// </summary>
/// <param name="enable">True to enable v-sync, false to deactivate</param>
////////////////////////////////////////////////////////////
public virtual void UseVerticalSync(bool enable)
public virtual void EnableVerticalSync(bool enable)
{
sfWindow_UseVerticalSync(This, enable);
sfWindow_EnableVerticalSync(This, enable);
}
////////////////////////////////////////////////////////////
@ -618,7 +618,7 @@ namespace SFML
static extern ContextSettings sfWindow_GetSettings(IntPtr This);
[DllImport("csfml-window-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfWindow_UseVerticalSync(IntPtr This, bool Enable);
static extern void sfWindow_EnableVerticalSync(IntPtr This, bool Enable);
[DllImport("csfml-window-2", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
static extern void sfWindow_ShowMouseCursor(IntPtr This, bool Show);