mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-14 03:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaces CPos by more a consistent CVector2D, reduces geometry code duplication.

Browse Source 
Tested By: Freagarach, Langbart
Differential Revision: https://code.wildfiregames.com/D3759
This was SVN commit r25152.
This commit is contained in:
vladislavbelov
2021-03-28 21:55:13 +00:00
parent 0e7fafebe1
commit 969112b9c8
39 changed files with 340 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/Scripting/GuiScriptConversions.cpp
+56 -56
View File
@@ -158,62 +158,6 @@ template<> void ScriptInterface::ToJSVal<CGUIColor>(const ScriptRequest& rq, JS:
*/
template<> bool ScriptInterface::FromJSVal<CGUIColor>(const ScriptRequest& rq, JS::HandleValue v, CGUIColor& out) = delete;
template<> void ScriptInterface::ToJSVal<CSize2D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CSize2D& val)
{
CreateObject(rq, ret, "width", val.Width, "height", val.Height);
}
template<> bool ScriptInterface::FromJSVal<CSize2D>(const ScriptRequest& rq, JS::HandleValue v, CSize2D& out)
{
if (!v.isObject())
{
LOGERROR("CSize2D value must be an object!");
return false;
}
if (!FromJSProperty(rq, v, "width", out.Width))
{
LOGERROR("Failed to get CSize2D.Width property");
return false;
}
if (!FromJSProperty(rq, v, "height", out.Height))
{
LOGERROR("Failed to get CSize2D.Height property");
return false;
}
return true;
}
template<> void ScriptInterface::ToJSVal<CPos>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CPos& val)
{
CreateObject(rq, ret, "x", val.x, "y", val.y);
}
template<> bool ScriptInterface::FromJSVal<CPos>(const ScriptRequest& rq, JS::HandleValue v, CPos& out)
{
if (!v.isObject())
{
LOGERROR("CPos value must be an object!");
return false;
}
if (!FromJSProperty(rq, v, "x", out.x))
{
LOGERROR("Failed to get CPos.x property");
return false;
}
if (!FromJSProperty(rq, v, "y", out.y))
{
LOGERROR("Failed to get CPos.y property");
return false;
}
return true;
}
template<> void ScriptInterface::ToJSVal<CRect>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CRect& val)
{
CreateObject(
@@ -357,4 +301,60 @@ template<> bool ScriptInterface::FromJSVal<CGUISpriteInstance>(const ScriptReque
return true;
}
template<> void ScriptInterface::ToJSVal<CSize2D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CSize2D& val)
{
CreateObject(rq, ret, "width", val.Width, "height", val.Height);
}
template<> bool ScriptInterface::FromJSVal<CSize2D>(const ScriptRequest& rq, JS::HandleValue v, CSize2D& out)
{
if (!v.isObject())
{
LOGERROR("CSize2D value must be an object!");
return false;
}
if (!FromJSProperty(rq, v, "width", out.Width))
{
LOGERROR("Failed to get CSize2D.Width property");
return false;
}
if (!FromJSProperty(rq, v, "height", out.Height))
{
LOGERROR("Failed to get CSize2D.Height property");
return false;
}
return true;
}
template<> void ScriptInterface::ToJSVal<CVector2D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CVector2D& val)
{
CreateObject(rq, ret, "x", val.X, "y", val.Y);
}
template<> bool ScriptInterface::FromJSVal<CVector2D>(const ScriptRequest& rq, JS::HandleValue v, CVector2D& out)
{
if (!v.isObject())
{
LOGERROR("CVector2D value must be an object!");
return false;
}
if (!FromJSProperty(rq, v, "x", out.X))
{
LOGERROR("Failed to get CVector2D.X property");
return false;
}
if (!FromJSProperty(rq, v, "y", out.Y))
{
LOGERROR("Failed to get CVector2D.Y property");
return false;
}
return true;
}
#undef SET