Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update SetPosition for backward compatibility

Browse source
This commit is contained in:
Adngel 2023-11-01 19:11:57 +01:00
parent fad4cb0255
commit a5c7e6d88f
2 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
TombEngine/Scripting/Internal/TEN/Strings/DisplayString/DisplayString.cpp
View file

@ -180,7 +180,7 @@ void DisplayString::Register(sol::table& parent)
// Screen-space coordinates are returned.
// @function DisplayString:GetPosition()
// @treturn Vec2 pos Position in pixel coordinates.
ScriptReserved_GetPosition, &DisplayString::GetPos,
ScriptReserved_GetPosition, &DisplayString::GetPosition,
/// Set the display string's flags
// @function DisplayString:SetFlags()
@ -220,13 +220,35 @@ float DisplayString::GetScale() const
return displayString._scale;
}
void DisplayString::SetPosition(const Vec2& pos)
void DisplayString::SetPosition(const sol::variadic_args& args)
{
UserDisplayString& displayString = GetItemCallbackRoutine(_id).value();
displayString._position = pos;
if (args.size() == 1)
{
// Handle the case when a single argument is provided.
if (args[0].is<Vec2>())
{
displayString._position = args[0].as<Vec2>();
}
}
else if (args.size() == 2)
{
// Handle the case when two arguments are provided, assuming they are integers.
if (args[0].is<int>() && args[1].is<int>())
{
int x = args[0].as<int>();
int y = args[1].as<int>();
displayString._position = Vec2(static_cast<float>(x), static_cast<float>(y));
}
}
else
{
TENLog("Invalid number of arguments for SetPosition.");
}
}
Vec2 DisplayString::GetPos() const
Vec2 DisplayString::GetPosition() const
{
UserDisplayString& displayString = GetItemCallbackRoutine(_id).value();
return displayString._position;

4
TombEngine/Scripting/Internal/TEN/Strings/DisplayString/DisplayString.h
View file

@ -72,13 +72,13 @@ public:
// Getters
DisplayStringID GetID() const;
std::string GetKey() const;
Vec2 GetPos() const;
Vec2 GetPosition() const;
float GetScale() const;
ScriptColor GetColor() const;
// Setters
void SetKey(const std::string& key);
void SetPosition(const Vec2& pos);
void SetPosition(const sol::variadic_args& args);
void SetScale(float scale);
void SetColor(const ScriptColor&);
void SetTranslated(bool isTranslated);