mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-29 10:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix [19027] by using generic code for conversions and fixing a few other issues. Refs #3403. Reviewed by leper.

Browse Source 
Also fix some of the warnings that jenkins showed.

Differential Revision: https://code.wildfiregames.com/D24
This was SVN commit r19115.
This commit is contained in:
wraitii
2017-01-06 11:14:03 +00:00
parent 1a038b1735
commit 2bae30c454
7 changed files with 178 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/scripting/JSInterface_IGUIObject.cpp
+13 -115
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2016 Wildfire Games.
/* Copyright (C) 2017 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -284,17 +284,7 @@ bool JSI_IGUIObject::getProperty(JSContext* cx, JS::HandleObject obj, JS::Handle
{
CGUIList value;
GUI<CGUIList>::GetSetting(e, propName, value);
JS::RootedObject obj(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
vp.setObject(*obj);
for (u32 i = 0; i < value.m_Items.size(); ++i)
{
JS::RootedValue val(cx);
ScriptInterface::ToJSVal(cx, &val, value.m_Items[i].GetOriginalString());
JS_SetElement(cx, obj, i, val);
}
ScriptInterface::ToJSVal(cx, vp, value.m_Items);
break;
}
@@ -302,28 +292,7 @@ bool JSI_IGUIObject::getProperty(JSContext* cx, JS::HandleObject obj, JS::Handle
{
CGUISeries value;
GUI<CGUISeries>::GetSetting(e, propName, value);
JS::RootedObject obj(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
vp.setObject(*obj);
for (u32 i = 0; i < value.m_Series.size(); ++i)
{
JS::RootedObject inner_obj(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
for (u32 j = 0; j < value.m_Series[i].size(); ++j)
{
JS::RootedObject val(cx, JS_NewArrayObject(cx, JS::HandleValueArray::empty()));
JS::RootedValue val_x(cx), val_y(cx);
ScriptInterface::ToJSVal(cx, &val_x, value.m_Series[i][j].X);
ScriptInterface::ToJSVal(cx, &val_y, value.m_Series[i][j].Y);
JS_SetElement(cx, val, 0, val_x);
JS_SetElement(cx, val, 1, val_y);
JS_SetElement(cx, inner_obj, j, val);
}
JS_SetElement(cx, obj, i, inner_obj);
}
ScriptInterface::ToJSVal(cx, vp, value.m_Series);
break;
}
@@ -585,98 +554,27 @@ bool JSI_IGUIObject::setProperty(JSContext* cx, JS::HandleObject obj, JS::Handle
case GUIST_CGUIList:
{
u32 length;
if (!vp.isObject() || !JS_GetArrayLength(cx, vpObj, &length))
CGUIList list;
if (ScriptInterface::FromJSVal(cx, vp, list.m_Items))
GUI<CGUIList>::SetSetting(e, propName, list);
else
{
JS_ReportError(cx, "List only accepts a GUIList object");
JS_ReportError(cx, "Failed to get list '%s'", propName.c_str());
return false;
}
CGUIList list;
for (u32 i = 0; i < length; ++i)
{
JS::RootedValue element(cx);
if (!JS_GetElement(cx, vpObj, i, &element))
{
JS_ReportError(cx, "Failed to get list element");
return false;
}
std::wstring value;
if (!ScriptInterface::FromJSVal(cx, element, value))
return false;
CGUIString str;
str.SetValue(value);
list.m_Items.push_back(str);
}
GUI<CGUIList>::SetSetting(e, propName, list);
break;
}
case GUIST_CGUISeries:
{
u32 length;
if (!vp.isObject() || !JS_GetArrayLength(cx, vpObj, &length))
CGUISeries series;
if (ScriptInterface::FromJSVal(cx, vp, series.m_Series))
GUI<CGUISeries>::SetSetting(e, propName, series);
else
{
JS_ReportError(cx, "Table only accepts a GUISeries object");
JS_ReportError(cx, "Invalid value for chart series '%s'", propName.c_str());
return false;
}
CGUISeries series;
series.m_Series.resize(length);
for (u32 i = 0; i < length; ++i)
{
JS::RootedValue data_value(cx);
if (!JS_GetElement(cx, vpObj, i, &data_value))
{
JS_ReportError(cx, "Failed to get a data of series");
return false;
}
JS::RootedObject data(cx, data_value.toObjectOrNull());
u32 data_length;
if (!JS_GetArrayLength(cx, data, &data_length))
{
JS_ReportError(cx, "Series only accepts a chart data");
return false;
}
series.m_Series[i].resize(data_length);
for (u32 j = 0; j < data_length; ++j)
{
JS::RootedValue element_value(cx);
if (!JS_GetElement(cx, data, j, &element_value))
{
JS_ReportError(cx, "Failed to get a chart data element");
return false;
}
JS::RootedObject element(cx, element_value.toObjectOrNull());
u32 element_length;
if (!JS_GetArrayLength(cx, element, &element_length) || element_length < 2)
{
JS_ReportError(cx, "Chart data only accepts a point");
return false;
}
JS::RootedValue element_x(cx), element_y(cx);
if (!JS_GetElement(cx, element, 0, &element_x) || !JS_GetElement(cx, element, 1, &element_y))
{
JS_ReportError(cx, "Failed to get a chart point");
return false;
}
if (!ScriptInterface::FromJSVal(cx, element_x, series.m_Series[i][j].X) ||
!ScriptInterface::FromJSVal(cx, element_y, series.m_Series[i][j].Y))
return false;
}
}
GUI<CGUISeries>::SetSetting(e, propName, series);
break;
}