mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-26 13:06:13 +01:00
Added Vector classes
Updated according to the latest modifications in SFML
This commit is contained in:
Laurent Gomila committed
1 parent
0b2a231121
commit
69433eb0a4
10 files changed
+348
-217
No files matched your search
@@ -60,16 +60,16 @@ void sfRenderTexture_Destroy(sfRenderTexture* renderTexture)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfRenderTexture_GetWidth(const sfRenderTexture* renderTexture)
|
||||
sfVector2u sfRenderTexture_GetSize(const sfRenderTexture* renderTexture)
|
||||
{
|
||||
CSFML_CALL_RETURN(renderTexture, GetWidth(), 0);
|
||||
}
|
||||
sfVector2u size = {0, 0};
|
||||
CSFML_CHECK_RETURN(renderTexture, size);
|
||||
|
||||
sf::Vector2u sfmlSize = renderTexture->This.GetSize();
|
||||
size.x = sfmlSize.x;
|
||||
size.y = sfmlSize.y;
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfRenderTexture_GetHeight(const sfRenderTexture* renderTexture)
|
||||
{
|
||||
CSFML_CALL_RETURN(renderTexture, GetHeight(), 0);
|
||||
return size;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -112,20 +112,6 @@ sfBool sfRenderWindow_IsOpen(const sfRenderWindow* renderWindow)
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfRenderWindow_GetWidth(const sfRenderWindow* renderWindow)
|
||||
{
|
||||
CSFML_CALL_RETURN(renderWindow, GetWidth(), 0);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfRenderWindow_GetHeight(const sfRenderWindow* renderWindow)
|
||||
{
|
||||
CSFML_CALL_RETURN(renderWindow, GetHeight(), 0);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfContextSettings sfRenderWindow_GetSettings(const sfRenderWindow* renderWindow)
|
||||
{
|
||||
@@ -184,30 +170,44 @@ sfBool sfRenderWindow_WaitEvent(sfRenderWindow* renderWindow, sfEvent* event)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_EnableVerticalSync(sfRenderWindow* renderWindow, sfBool enabled)
|
||||
sfVector2i sfRenderWindow_GetPosition(const sfRenderWindow* renderWindow)
|
||||
{
|
||||
CSFML_CALL(renderWindow, EnableVerticalSync(enabled == sfTrue));
|
||||
sfVector2i position = {0, 0};
|
||||
CSFML_CHECK_RETURN(renderWindow, position);
|
||||
|
||||
sf::Vector2i sfmlPos = renderWindow->This.GetPosition();
|
||||
position.x = sfmlPos.x;
|
||||
position.y = sfmlPos.y;
|
||||
|
||||
return position;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_ShowMouseCursor(sfRenderWindow* renderWindow, sfBool show)
|
||||
void sfRenderWindow_SetPosition(sfRenderWindow* renderWindow, sfVector2i position)
|
||||
{
|
||||
CSFML_CALL(renderWindow, ShowMouseCursor(show == sfTrue));
|
||||
CSFML_CALL(renderWindow, SetPosition(sf::Vector2i(position.x, position.y)));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetPosition(sfRenderWindow* renderWindow, int left, int top)
|
||||
sfVector2u sfRenderWindow_GetSize(const sfRenderWindow* renderWindow)
|
||||
{
|
||||
CSFML_CALL(renderWindow, SetPosition(left, top));
|
||||
sfVector2u size = {0, 0};
|
||||
CSFML_CHECK_RETURN(renderWindow, size);
|
||||
|
||||
sf::Vector2u sfmlSize = renderWindow->This.GetSize();
|
||||
size.x = sfmlSize.x;
|
||||
size.y = sfmlSize.y;
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetSize(sfRenderWindow* renderWindow, unsigned int width, unsigned int height)
|
||||
void sfRenderWindow_SetSize(sfRenderWindow* renderWindow, sfVector2u size)
|
||||
{
|
||||
CSFML_CALL(renderWindow, SetSize(width, height));
|
||||
CSFML_CALL(renderWindow, SetSize(sf::Vector2u(size.x, size.y)));
|
||||
}
|
||||
|
||||
|
||||
@@ -218,20 +218,6 @@ void sfRenderWindow_SetTitle(sfRenderWindow* renderWindow, const char* title)
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_Show(sfRenderWindow* renderWindow, sfBool show)
|
||||
{
|
||||
CSFML_CALL(renderWindow, Show(show == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_EnableKeyRepeat(sfRenderWindow* renderWindow, sfBool enabled)
|
||||
{
|
||||
CSFML_CALL(renderWindow, EnableKeyRepeat(enabled == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetIcon(sfRenderWindow* renderWindow, unsigned int width, unsigned int height, const sfUint8* pixels)
|
||||
{
|
||||
@@ -239,6 +225,34 @@ void sfRenderWindow_SetIcon(sfRenderWindow* renderWindow, unsigned int width, un
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetVisible(sfRenderWindow* renderWindow, sfBool visible)
|
||||
{
|
||||
CSFML_CALL(renderWindow, SetVisible(visible == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetMouseCursorVisible(sfRenderWindow* renderWindow, sfBool visible)
|
||||
{
|
||||
CSFML_CALL(renderWindow, SetMouseCursorVisible(visible == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetVerticalSyncEnabled(sfRenderWindow* renderWindow, sfBool enabled)
|
||||
{
|
||||
CSFML_CALL(renderWindow, SetVerticalSyncEnabled(enabled == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfRenderWindow_SetKeyRepeatEnabled(sfRenderWindow* renderWindow, sfBool enabled)
|
||||
{
|
||||
CSFML_CALL(renderWindow, SetKeyRepeatEnabled(enabled == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfBool sfRenderWindow_SetActive(sfRenderWindow* renderWindow, sfBool active)
|
||||
{
|
||||
|
||||
@@ -20,6 +20,8 @@ set(SRC
|
||||
${SRCROOT}/Time.cpp
|
||||
${INCROOT}/Time.h
|
||||
${INCROOT}/Types.h
|
||||
${INCROOT}/Vector2.h
|
||||
${INCROOT}/Vector3.h
|
||||
)
|
||||
|
||||
# define the csfml-system target
|
||||
|
||||
+50
-36
@@ -98,20 +98,6 @@ sfBool sfWindow_IsOpen(const sfWindow* window)
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfWindow_GetWidth(const sfWindow* window)
|
||||
{
|
||||
CSFML_CALL_RETURN(window, GetWidth(), 0);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfWindow_GetHeight(const sfWindow* window)
|
||||
{
|
||||
CSFML_CALL_RETURN(window, GetHeight(), 0);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfContextSettings sfWindow_GetSettings(const sfWindow* window)
|
||||
{
|
||||
@@ -172,30 +158,44 @@ sfBool sfWindow_WaitEvent(sfWindow* window, sfEvent* event)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_EnableVerticalSync(sfWindow* window, sfBool enabled)
|
||||
sfVector2i sfWindow_GetPosition(const sfWindow* window)
|
||||
{
|
||||
CSFML_CALL(window, EnableVerticalSync(enabled == sfTrue));
|
||||
sfVector2i position = {0, 0};
|
||||
CSFML_CHECK_RETURN(window, position);
|
||||
|
||||
sf::Vector2i sfmlPos = window->This.GetPosition();
|
||||
position.x = sfmlPos.x;
|
||||
position.y = sfmlPos.y;
|
||||
|
||||
return position;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_ShowMouseCursor(sfWindow* window, sfBool show)
|
||||
void sfWindow_SetPosition(sfWindow* window, sfVector2i position)
|
||||
{
|
||||
CSFML_CALL(window, ShowMouseCursor(show == sfTrue));
|
||||
CSFML_CALL(window, SetPosition(sf::Vector2i(position.x, position.y)));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetPosition(sfWindow* window, int left, int top)
|
||||
sfVector2u sfWindow_GetSize(const sfWindow* window)
|
||||
{
|
||||
CSFML_CALL(window, SetPosition(left, top));
|
||||
sfVector2u size = {0, 0};
|
||||
CSFML_CHECK_RETURN(window, size);
|
||||
|
||||
sf::Vector2u sfmlSize = window->This.GetSize();
|
||||
size.x = sfmlSize.x;
|
||||
size.y = sfmlSize.y;
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetSize(sfWindow* window, unsigned int width, unsigned int height)
|
||||
void sfWindow_SetSize(sfWindow* window, sfVector2u size)
|
||||
{
|
||||
CSFML_CALL(window, SetSize(width, height));
|
||||
CSFML_CALL(window, SetSize(sf::Vector2u(size.x, size.y)));
|
||||
}
|
||||
|
||||
|
||||
@@ -206,20 +206,6 @@ void sfWindow_SetTitle(sfWindow* window, const char* title)
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_Show(sfWindow* window, sfBool show)
|
||||
{
|
||||
CSFML_CALL(window, Show(show == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_EnableKeyRepeat(sfWindow* window, sfBool enabled)
|
||||
{
|
||||
CSFML_CALL(window, EnableKeyRepeat(enabled == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetIcon(sfWindow* window, unsigned int width, unsigned int height, const sfUint8* pixels)
|
||||
{
|
||||
@@ -227,6 +213,34 @@ void sfWindow_SetIcon(sfWindow* window, unsigned int width, unsigned int height,
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetVisible(sfWindow* window, sfBool visible)
|
||||
{
|
||||
CSFML_CALL(window, SetVisible(visible == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetMouseCursorVisible(sfWindow* window, sfBool visible)
|
||||
{
|
||||
CSFML_CALL(window, SetMouseCursorVisible(visible == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetVerticalSyncEnabled(sfWindow* window, sfBool enabled)
|
||||
{
|
||||
CSFML_CALL(window, SetVerticalSyncEnabled(enabled == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfWindow_SetKeyRepeatEnabled(sfWindow* window, sfBool enabled)
|
||||
{
|
||||
CSFML_CALL(window, SetKeyRepeatEnabled(enabled == sfTrue));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfBool sfWindow_SetActive(sfWindow* window, sfBool active)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user