mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-26 05:06:12 +01:00
Updated to the new naming convention
This commit is contained in:
Laurent Gomila committed
1 parent
9d0d0588b2
commit
36904a45d9
99 files changed
+2409
-2369
No files matched your search
@@ -32,7 +32,7 @@
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfCircleShape* sfCircleShape_Create(void)
|
||||
sfCircleShape* sfCircleShape_create(void)
|
||||
{
|
||||
sfCircleShape* shape = new sfCircleShape;
|
||||
shape->Texture = NULL;
|
||||
@@ -42,7 +42,7 @@ sfCircleShape* sfCircleShape_Create(void)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfCircleShape* sfCircleShape_Copy(sfCircleShape* shape)
|
||||
sfCircleShape* sfCircleShape_copy(sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CHECK_RETURN(shape, NULL);
|
||||
|
||||
@@ -51,47 +51,47 @@ sfCircleShape* sfCircleShape_Copy(sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_Destroy(sfCircleShape* shape)
|
||||
void sfCircleShape_destroy(sfCircleShape* shape)
|
||||
{
|
||||
delete shape;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetPosition(sfCircleShape* shape, sfVector2f position)
|
||||
void sfCircleShape_setPosition(sfCircleShape* shape, sfVector2f position)
|
||||
{
|
||||
CSFML_CALL(shape, SetPosition(position.x, position.y));
|
||||
CSFML_CALL(shape, setPosition(position.x, position.y));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetRotation(sfCircleShape* shape, float angle)
|
||||
void sfCircleShape_setRotation(sfCircleShape* shape, float angle)
|
||||
{
|
||||
CSFML_CALL(shape, SetRotation(angle));
|
||||
CSFML_CALL(shape, setRotation(angle));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetScale(sfCircleShape* shape, sfVector2f scale)
|
||||
void sfCircleShape_setScale(sfCircleShape* shape, sfVector2f scale)
|
||||
{
|
||||
CSFML_CALL(shape, SetScale(scale.x, scale.y));
|
||||
CSFML_CALL(shape, setScale(scale.x, scale.y));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetOrigin(sfCircleShape* shape, sfVector2f origin)
|
||||
void sfCircleShape_setOrigin(sfCircleShape* shape, sfVector2f origin)
|
||||
{
|
||||
CSFML_CALL(shape, SetOrigin(origin.x, origin.y));
|
||||
CSFML_CALL(shape, setOrigin(origin.x, origin.y));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfVector2f sfCircleShape_GetPosition(const sfCircleShape* shape)
|
||||
sfVector2f sfCircleShape_getPosition(const sfCircleShape* shape)
|
||||
{
|
||||
sfVector2f position = {0, 0};
|
||||
CSFML_CHECK_RETURN(shape, position);
|
||||
|
||||
sf::Vector2f sfmlPos = shape->This.GetPosition();
|
||||
sf::Vector2f sfmlPos = shape->This.getPosition();
|
||||
position.x = sfmlPos.x;
|
||||
position.y = sfmlPos.y;
|
||||
|
||||
@@ -100,19 +100,19 @@ sfVector2f sfCircleShape_GetPosition(const sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
float sfCircleShape_GetRotation(const sfCircleShape* shape)
|
||||
float sfCircleShape_getRotation(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CALL_RETURN(shape, GetRotation(), 0.f);
|
||||
CSFML_CALL_RETURN(shape, getRotation(), 0.f);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfVector2f sfCircleShape_GetScale(const sfCircleShape* shape)
|
||||
sfVector2f sfCircleShape_getScale(const sfCircleShape* shape)
|
||||
{
|
||||
sfVector2f scale = {0, 0};
|
||||
CSFML_CHECK_RETURN(shape, scale);
|
||||
|
||||
sf::Vector2f sfmlScale = shape->This.GetScale();
|
||||
sf::Vector2f sfmlScale = shape->This.getScale();
|
||||
scale.x = sfmlScale.x;
|
||||
scale.y = sfmlScale.y;
|
||||
|
||||
@@ -121,12 +121,12 @@ sfVector2f sfCircleShape_GetScale(const sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfVector2f sfCircleShape_GetOrigin(const sfCircleShape* shape)
|
||||
sfVector2f sfCircleShape_getOrigin(const sfCircleShape* shape)
|
||||
{
|
||||
sfVector2f origin = {0, 0};
|
||||
CSFML_CHECK_RETURN(shape, origin);
|
||||
|
||||
sf::Vector2f sfmlOrigin = shape->This.GetOrigin();
|
||||
sf::Vector2f sfmlOrigin = shape->This.getOrigin();
|
||||
origin.x = sfmlOrigin.x;
|
||||
origin.y = sfmlOrigin.y;
|
||||
|
||||
@@ -135,84 +135,84 @@ sfVector2f sfCircleShape_GetOrigin(const sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_Move(sfCircleShape* shape, sfVector2f offset)
|
||||
void sfCircleShape_move(sfCircleShape* shape, sfVector2f offset)
|
||||
{
|
||||
CSFML_CALL(shape, Move(offset.x, offset.y));
|
||||
CSFML_CALL(shape, move(offset.x, offset.y));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_Rotate(sfCircleShape* shape, float angle)
|
||||
void sfCircleShape_rotate(sfCircleShape* shape, float angle)
|
||||
{
|
||||
CSFML_CALL(shape, Rotate(angle));
|
||||
CSFML_CALL(shape, rotate(angle));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_Scale(sfCircleShape* shape, sfVector2f factors)
|
||||
void sfCircleShape_scale(sfCircleShape* shape, sfVector2f factors)
|
||||
{
|
||||
CSFML_CALL(shape, Scale(factors.x, factors.y));
|
||||
CSFML_CALL(shape, scale(factors.x, factors.y));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
const sfTransform* sfCircleShape_GetTransform(const sfCircleShape* shape)
|
||||
const sfTransform* sfCircleShape_getTransform(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CHECK_RETURN(shape, NULL);
|
||||
|
||||
shape->Transform.This = shape->This.GetTransform();
|
||||
shape->Transform.This = shape->This.getTransform();
|
||||
return &shape->Transform;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
const sfTransform* sfCircleShape_GetInverseTransform(const sfCircleShape* shape)
|
||||
const sfTransform* sfCircleShape_getInverseTransform(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CHECK_RETURN(shape, NULL);
|
||||
|
||||
shape->InverseTransform.This = shape->This.GetInverseTransform();
|
||||
shape->InverseTransform.This = shape->This.getInverseTransform();
|
||||
return &shape->InverseTransform;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetTexture(sfCircleShape* shape, const sfTexture* texture, sfBool resetRect)
|
||||
void sfCircleShape_setTexture(sfCircleShape* shape, const sfTexture* texture, sfBool resetRect)
|
||||
{
|
||||
CSFML_CALL(shape, SetTexture(texture ? texture->This : NULL, resetRect == sfTrue));
|
||||
CSFML_CALL(shape, setTexture(texture ? texture->This : NULL, resetRect == sfTrue));
|
||||
shape->Texture = texture;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetTextureRect(sfCircleShape* shape, sfIntRect rect)
|
||||
void sfCircleShape_setTextureRect(sfCircleShape* shape, sfIntRect rect)
|
||||
{
|
||||
CSFML_CALL(shape, SetTextureRect(sf::IntRect(rect.Left, rect.Top, rect.Width, rect.Height)));
|
||||
CSFML_CALL(shape, setTextureRect(sf::IntRect(rect.left, rect.top, rect.width, rect.height)));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetFillColor(sfCircleShape* shape, sfColor color)
|
||||
void sfCircleShape_setFillColor(sfCircleShape* shape, sfColor color)
|
||||
{
|
||||
CSFML_CALL(shape, SetFillColor(sf::Color(color.r, color.g, color.b, color.a)));
|
||||
CSFML_CALL(shape, setFillColor(sf::Color(color.r, color.g, color.b, color.a)));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetOutlineColor(sfCircleShape* shape, sfColor color)
|
||||
void sfCircleShape_setOutlineColor(sfCircleShape* shape, sfColor color)
|
||||
{
|
||||
CSFML_CALL(shape, SetOutlineColor(sf::Color(color.r, color.g, color.b, color.a)));
|
||||
CSFML_CALL(shape, setOutlineColor(sf::Color(color.r, color.g, color.b, color.a)));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetOutlineThickness(sfCircleShape* shape, float thickness)
|
||||
void sfCircleShape_setOutlineThickness(sfCircleShape* shape, float thickness)
|
||||
{
|
||||
CSFML_CALL(shape, SetOutlineThickness(thickness));
|
||||
CSFML_CALL(shape, setOutlineThickness(thickness));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
const sfTexture* sfCircleShape_GetTexture(const sfCircleShape* shape)
|
||||
const sfTexture* sfCircleShape_getTexture(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CHECK_RETURN(shape, NULL);
|
||||
|
||||
@@ -221,28 +221,28 @@ const sfTexture* sfCircleShape_GetTexture(const sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfIntRect sfCircleShape_GetTextureRect(const sfCircleShape* shape)
|
||||
sfIntRect sfCircleShape_getTextureRect(const sfCircleShape* shape)
|
||||
{
|
||||
sfIntRect rect = {0, 0, 0, 0};
|
||||
CSFML_CHECK_RETURN(shape, rect);
|
||||
|
||||
sf::IntRect sfmlRect = shape->This.GetTextureRect();
|
||||
rect.Left = sfmlRect.Left;
|
||||
rect.Top = sfmlRect.Top;
|
||||
rect.Width = sfmlRect.Width;
|
||||
rect.Height = sfmlRect.Height;
|
||||
sf::IntRect sfmlRect = shape->This.getTextureRect();
|
||||
rect.left = sfmlRect.left;
|
||||
rect.top = sfmlRect.top;
|
||||
rect.width = sfmlRect.width;
|
||||
rect.height = sfmlRect.height;
|
||||
|
||||
return rect;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfColor sfCircleShape_GetFillColor(const sfCircleShape* shape)
|
||||
sfColor sfCircleShape_getFillColor(const sfCircleShape* shape)
|
||||
{
|
||||
sfColor color = {0, 0, 0, 0};
|
||||
CSFML_CHECK_RETURN(shape, color);
|
||||
|
||||
sf::Color sfmlColor = shape->This.GetFillColor();
|
||||
sf::Color sfmlColor = shape->This.getFillColor();
|
||||
color.r = sfmlColor.r;
|
||||
color.g = sfmlColor.g;
|
||||
color.b = sfmlColor.b;
|
||||
@@ -253,12 +253,12 @@ sfColor sfCircleShape_GetFillColor(const sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfColor sfCircleShape_GetOutlineColor(const sfCircleShape* shape)
|
||||
sfColor sfCircleShape_getOutlineColor(const sfCircleShape* shape)
|
||||
{
|
||||
sfColor color = {0, 0, 0, 0};
|
||||
CSFML_CHECK_RETURN(shape, color);
|
||||
|
||||
sf::Color sfmlColor = shape->This.GetOutlineColor();
|
||||
sf::Color sfmlColor = shape->This.getOutlineColor();
|
||||
color.r = sfmlColor.r;
|
||||
color.g = sfmlColor.g;
|
||||
color.b = sfmlColor.b;
|
||||
@@ -269,26 +269,26 @@ sfColor sfCircleShape_GetOutlineColor(const sfCircleShape* shape)
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
float sfCircleShape_GetOutlineThickness(const sfCircleShape* shape)
|
||||
float sfCircleShape_getOutlineThickness(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CALL_RETURN(shape, GetOutlineThickness(), 0.f);
|
||||
CSFML_CALL_RETURN(shape, getOutlineThickness(), 0.f);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
unsigned int sfCircleShape_GetPointCount(const sfCircleShape* shape)
|
||||
unsigned int sfCircleShape_getPointCount(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CALL_RETURN(shape, GetPointCount(), 0);
|
||||
CSFML_CALL_RETURN(shape, getPointCount(), 0);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfVector2f sfCircleShape_GetPoint(const sfCircleShape* shape, unsigned int index)
|
||||
sfVector2f sfCircleShape_getPoint(const sfCircleShape* shape, unsigned int index)
|
||||
{
|
||||
sfVector2f point = {0, 0};
|
||||
CSFML_CHECK_RETURN(shape, point);
|
||||
|
||||
sf::Vector2f sfmlPoint = shape->This.GetPoint(index);
|
||||
sf::Vector2f sfmlPoint = shape->This.getPoint(index);
|
||||
point.x = sfmlPoint.x;
|
||||
point.y = sfmlPoint.y;
|
||||
|
||||
@@ -297,53 +297,53 @@ sfVector2f sfCircleShape_GetPoint(const sfCircleShape* shape, unsigned int index
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetRadius(sfCircleShape* shape, float radius)
|
||||
void sfCircleShape_setRadius(sfCircleShape* shape, float radius)
|
||||
{
|
||||
CSFML_CALL(shape, SetRadius(radius));
|
||||
CSFML_CALL(shape, setRadius(radius));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
float sfCircleShape_GetRadius(const sfCircleShape* shape)
|
||||
float sfCircleShape_getRadius(const sfCircleShape* shape)
|
||||
{
|
||||
CSFML_CALL_RETURN(shape, GetRadius(), 0.f);
|
||||
CSFML_CALL_RETURN(shape, getRadius(), 0.f);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
void sfCircleShape_SetPointCount(sfCircleShape* shape, unsigned int count)
|
||||
void sfCircleShape_setPointCount(sfCircleShape* shape, unsigned int count)
|
||||
{
|
||||
CSFML_CALL(shape, SetPointCount(count));
|
||||
CSFML_CALL(shape, setPointCount(count));
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfFloatRect sfCircleShape_GetLocalBounds(const sfCircleShape* shape)
|
||||
sfFloatRect sfCircleShape_getLocalBounds(const sfCircleShape* shape)
|
||||
{
|
||||
sfFloatRect rect = {0, 0, 0, 0};
|
||||
CSFML_CHECK_RETURN(shape, rect);
|
||||
|
||||
sf::FloatRect sfmlRect = shape->This.GetLocalBounds();
|
||||
rect.Left = sfmlRect.Left;
|
||||
rect.Top = sfmlRect.Top;
|
||||
rect.Width = sfmlRect.Width;
|
||||
rect.Height = sfmlRect.Height;
|
||||
sf::FloatRect sfmlRect = shape->This.getLocalBounds();
|
||||
rect.left = sfmlRect.left;
|
||||
rect.top = sfmlRect.top;
|
||||
rect.width = sfmlRect.width;
|
||||
rect.height = sfmlRect.height;
|
||||
|
||||
return rect;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
sfFloatRect sfCircleShape_GetGlobalBounds(const sfCircleShape* shape)
|
||||
sfFloatRect sfCircleShape_getGlobalBounds(const sfCircleShape* shape)
|
||||
{
|
||||
sfFloatRect rect = {0, 0, 0, 0};
|
||||
CSFML_CHECK_RETURN(shape, rect);
|
||||
|
||||
sf::FloatRect sfmlRect = shape->This.GetGlobalBounds();
|
||||
rect.Left = sfmlRect.Left;
|
||||
rect.Top = sfmlRect.Top;
|
||||
rect.Width = sfmlRect.Width;
|
||||
rect.Height = sfmlRect.Height;
|
||||
sf::FloatRect sfmlRect = shape->This.getGlobalBounds();
|
||||
rect.left = sfmlRect.left;
|
||||
rect.top = sfmlRect.top;
|
||||
rect.width = sfmlRect.width;
|
||||
rect.height = sfmlRect.height;
|
||||
|
||||
return rect;
|
||||
}
|
||||
Reference in new issue
Block a user