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

6
src/SFML/Graphics/Drawable.cpp
View file

@ -99,10 +99,10 @@ void Drawable::SetScale(float factorX, float factorY)
////////////////////////////////////////////////////////////
void Drawable::SetScale(const Vector2f& scale)
void Drawable::SetScale(const Vector2f& factors)
{
SetScaleX(scale.x);
SetScaleY(scale.y);
SetScaleX(factors.x);
SetScaleY(factors.y);
}

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

@ -112,9 +112,9 @@ void Shape::SetPointOutlineColor(unsigned int index, const Color& color)
////////////////////////////////////////////////////////////
void Shape::SetOutlineWidth(float width)
void Shape::SetOutlineThickness(float thickness)
{
myOutline = width;
myOutline = thickness;
}
@ -140,7 +140,7 @@ const Color& Shape::GetPointOutlineColor(unsigned int index) const
////////////////////////////////////////////////////////////
float Shape::GetOutlineWidth() const
float Shape::GetOutlineThickness() const
{
return myOutline;
}
@ -170,7 +170,7 @@ Shape Shape::Line(const Vector2f& p1, const Vector2f& p2, float thickness, const
shape.AddPoint(p2 - normal, color, outlineColor);
shape.AddPoint(p2 + normal, color, outlineColor);
shape.AddPoint(p1 + normal, color, outlineColor);
shape.SetOutlineWidth(outline);
shape.SetOutlineThickness(outline);
// Compile it
shape.Compile();
@ -188,7 +188,7 @@ Shape Shape::Rectangle(float left, float top, float width, float height, const C
shape.AddPoint(Vector2f(left + width, top), color, outlineColor);
shape.AddPoint(Vector2f(left + width, top + height), color, outlineColor);
shape.AddPoint(Vector2f(left, top + height), color, outlineColor);
shape.SetOutlineWidth(outline);
shape.SetOutlineThickness(outline);
// Compile it
shape.Compile();
@ -227,7 +227,7 @@ Shape Shape::Circle(const Vector2f& center, float radius, const Color& color, fl
}
// Compile it
shape.SetOutlineWidth(outline);
shape.SetOutlineThickness(outline);
shape.Compile();
return shape;

2
src/SFML/Window/GlContext.hpp
View file

@ -127,7 +127,7 @@ public :
/// \param enabled True to enable v-sync, false to deactivate
///
////////////////////////////////////////////////////////////
virtual void UseVerticalSync(bool enabled) = 0;
virtual void EnableVerticalSync(bool enabled) = 0;
////////////////////////////////////////////////////////////
/// \brief Make the current thread's reference context active

2
src/SFML/Window/Linux/GlxContext.cpp
View file

@ -139,7 +139,7 @@ void GlxContext::Display()
////////////////////////////////////////////////////////////
void GlxContext::UseVerticalSync(bool enabled)
void GlxContext::EnableVerticalSync(bool enabled)
{
const GLubyte* name = reinterpret_cast<const GLubyte*>("glXSwapIntervalSGI");
PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = reinterpret_cast<PFNGLXSWAPINTERVALSGIPROC>(glXGetProcAddress(name));

2
src/SFML/Window/Linux/GlxContext.hpp
View file

@ -96,7 +96,7 @@ public :
/// \param enabled : True to enable v-sync, false to deactivate
///
////////////////////////////////////////////////////////////
virtual void UseVerticalSync(bool enabled);
virtual void EnableVerticalSync(bool enabled);
private :

4
src/SFML/Window/OSX/SFContext.hpp
View file

@ -104,7 +104,7 @@ public:
/// \param enabled : True to enable v-sync, false to deactivate
///
////////////////////////////////////////////////////////////
virtual void UseVerticalSync(bool enabled);
virtual void EnableVerticalSync(bool enabled);
protected:
////////////////////////////////////////////////////////////
@ -141,4 +141,4 @@ private:
} // namespace sf
#endif // SFML_AGLCONTEXT_HPP
#endif // SFML_SFCONTEXT_HPP

2
src/SFML/Window/OSX/SFContext.mm
View file

@ -99,7 +99,7 @@ void SFContext::Display()
////////////////////////////////////////////////////////////
void SFContext::UseVerticalSync(bool enabled)
void SFContext::EnableVerticalSync(bool enabled)
{
// Make compiler happy
#ifdef USE_OS_X_VERSION_10_4

2
src/SFML/Window/Win32/WglContext.cpp
View file

@ -130,7 +130,7 @@ void WglContext::Display()
////////////////////////////////////////////////////////////
void WglContext::UseVerticalSync(bool enabled)
void WglContext::EnableVerticalSync(bool enabled)
{
PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = reinterpret_cast<PFNWGLSWAPINTERVALEXTPROC>(wglGetProcAddress("wglSwapIntervalEXT"));
if (wglSwapIntervalEXT)

2
src/SFML/Window/Win32/WglContext.hpp
View file

@ -95,7 +95,7 @@ public :
/// \param enabled : True to enable v-sync, false to deactivate
///
////////////////////////////////////////////////////////////
virtual void UseVerticalSync(bool enabled);
virtual void EnableVerticalSync(bool enabled);
private :

6
src/SFML/Window/Window.cpp
View file

@ -232,10 +232,10 @@ bool Window::WaitEvent(Event& event)
////////////////////////////////////////////////////////////
void Window::UseVerticalSync(bool enabled)
void Window::EnableVerticalSync(bool enabled)
{
if (SetActive())
myContext->UseVerticalSync(enabled);
myContext->EnableVerticalSync(enabled);
}
@ -431,8 +431,8 @@ void Window::Initialize()
{
// Setup default behaviours (to get a consistent behaviour across different implementations)
Show(true);
UseVerticalSync(false);
ShowMouseCursor(true);
EnableVerticalSync(false);
EnableKeyRepeat(true);
// Reset frame time