wraitii
25490bfec3
- Check for pending exceptions after function calls and script executions. - Call LOGERROR instead of JS_ReportError when there is a conversion error in FromJSVal, since that can only be called from C++ (where JS errors don't really make sense). Instead, C++ callers of FromJSVal should handle the failure and, themselves, either report an error or simply do something else. - Wrap JS_ReportError since that makes updating it later easier. This isn't a systematical fix since ToJSVal also ought return a boolean for failures, and we probably should trigger errors instead of warnings on 'implicit' conversions, rather a preparation diff. Part of the SM52 migration, stage: SM45 compatible (actually SM52 incompatible, too). Based on a patch by: Itms Comments by: Vladislavbelov, Stan` Refs #742, #4893 Differential Revision: https://code.wildfiregames.com/D3093 This was SVN commit r24187.
75 lines
2.5 KiB
C++
75 lines
2.5 KiB
C++
/* Copyright (C) 2020 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "ICmpFootprint.h"
|
|
|
|
#include "simulation2/system/InterfaceScripted.h"
|
|
|
|
#include "simulation2/system/SimContext.h"
|
|
#include "maths/FixedVector3D.h"
|
|
|
|
JS::Value ICmpFootprint::GetShape_wrapper() const
|
|
{
|
|
EShape shape;
|
|
entity_pos_t size0, size1, height;
|
|
GetShape(shape, size0, size1, height);
|
|
|
|
ScriptRequest rq(GetSimContext().GetScriptInterface());
|
|
|
|
JS::RootedObject obj(rq.cx, JS_NewPlainObject(rq.cx));
|
|
if (!obj)
|
|
return JS::UndefinedValue();
|
|
|
|
if (shape == CIRCLE)
|
|
{
|
|
JS::RootedValue ptype(rq.cx);
|
|
JS::RootedValue pradius(rq.cx);
|
|
JS::RootedValue pheight(rq.cx);
|
|
ScriptInterface::ToJSVal<std::string>(rq, &ptype, "circle");
|
|
ScriptInterface::ToJSVal(rq, &pradius, size0);
|
|
ScriptInterface::ToJSVal(rq, &pheight, height);
|
|
JS_SetProperty(rq.cx, obj, "type", ptype);
|
|
JS_SetProperty(rq.cx, obj, "radius", pradius);
|
|
JS_SetProperty(rq.cx, obj, "height", pheight);
|
|
}
|
|
else
|
|
{
|
|
JS::RootedValue ptype(rq.cx);
|
|
JS::RootedValue pwidth(rq.cx);
|
|
JS::RootedValue pdepth(rq.cx);
|
|
JS::RootedValue pheight(rq.cx);
|
|
ScriptInterface::ToJSVal<std::string>(rq, &ptype, "square");
|
|
ScriptInterface::ToJSVal(rq, &pwidth, size0);
|
|
ScriptInterface::ToJSVal(rq, &pdepth, size1);
|
|
ScriptInterface::ToJSVal(rq, &pheight, height);
|
|
JS_SetProperty(rq.cx, obj, "type", ptype);
|
|
JS_SetProperty(rq.cx, obj, "width", pwidth);
|
|
JS_SetProperty(rq.cx, obj, "depth", pdepth);
|
|
JS_SetProperty(rq.cx, obj, "height", pheight);
|
|
}
|
|
|
|
return JS::ObjectValue(*obj);
|
|
}
|
|
|
|
BEGIN_INTERFACE_WRAPPER(Footprint)
|
|
DEFINE_INTERFACE_METHOD_CONST_1("PickSpawnPoint", CFixedVector3D, ICmpFootprint, PickSpawnPoint, entity_id_t)
|
|
DEFINE_INTERFACE_METHOD_CONST_1("PickSpawnPointBothPass", CFixedVector3D, ICmpFootprint, PickSpawnPointBothPass, entity_id_t)
|
|
DEFINE_INTERFACE_METHOD_CONST_0("GetShape", JS::Value, ICmpFootprint, GetShape_wrapper)
|
|
END_INTERFACE_WRAPPER(Footprint)
|