Changeset View
Changeset View
Standalone View
Standalone View
0ad/source/simulation2/scripting/EngineScriptConversions.cpp
| Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines | |||||
| { | { | ||||
| if (!v.isObject()) | if (!v.isObject()) | ||||
| return false; // TODO: report type error | return false; // TODO: report type error | ||||
| JS::RootedObject obj(rq.cx, &v.toObject()); | JS::RootedObject obj(rq.cx, &v.toObject()); | ||||
| JS::RootedValue p(rq.cx); | JS::RootedValue p(rq.cx); | ||||
| if (!JS_GetProperty(rq.cx, obj, "x", &p)) return false; // TODO: report type errors | if (!JS_GetProperty(rq.cx, obj, "x", &p)) return false; // TODO: report type errors | ||||
| if (!FromJSVal(rq, p, out.X)) return false; | //auto x = out.getX(); | ||||
| if (!FromJSVal(rq, p, out.Xref())) return false; | |||||
| if (!JS_GetProperty(rq.cx, obj, "y", &p)) return false; | if (!JS_GetProperty(rq.cx, obj, "y", &p)) return false; | ||||
| if (!FromJSVal(rq, p, out.Y)) return false; | //auto y = out.getY(); | ||||
| if (!FromJSVal(rq, p, out.Yref())) return false; | |||||
| if (!JS_GetProperty(rq.cx, obj, "z", &p)) return false; | if (!JS_GetProperty(rq.cx, obj, "z", &p)) return false; | ||||
| if (!FromJSVal(rq, p, out.Z)) return false; | //auto z = out.getZ(); | ||||
| if (!FromJSVal(rq, p, out.Zref())) return false; | |||||
| return true; | return true; | ||||
| } | } | ||||
| template<> void ScriptInterface::ToJSVal<CFixedVector3D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CFixedVector3D& val) | template<> void ScriptInterface::ToJSVal<CFixedVector3D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CFixedVector3D& val) | ||||
| { | { | ||||
| JS::RootedObject global(rq.cx, rq.glob); | JS::RootedObject global(rq.cx, rq.glob); | ||||
| JS::RootedValue valueVector3D(rq.cx); | JS::RootedValue valueVector3D(rq.cx); | ||||
| if (!ScriptInterface::GetGlobalProperty(rq, "Vector3D", &valueVector3D)) | if (!ScriptInterface::GetGlobalProperty(rq, "Vector3D", &valueVector3D)) | ||||
| FAIL_VOID("Failed to get Vector3D constructor"); | FAIL_VOID("Failed to get Vector3D constructor"); | ||||
| JS::RootedValueArray<3> args(rq.cx); | JS::RootedValueArray<3> args(rq.cx); | ||||
| args[0].setNumber(val.X.ToDouble()); | args[0].setNumber(val.getX().ToDouble()); | ||||
| args[1].setNumber(val.Y.ToDouble()); | args[1].setNumber(val.getY().ToDouble()); | ||||
| args[2].setNumber(val.Z.ToDouble()); | args[2].setNumber(val.getZ().ToDouble()); | ||||
| JS::RootedObject objVec(rq.cx); | JS::RootedObject objVec(rq.cx); | ||||
| if (!JS::Construct(rq.cx, valueVector3D, args, &objVec)) | if (!JS::Construct(rq.cx, valueVector3D, args, &objVec)) | ||||
| FAIL_VOID("Failed to construct Vector3D object"); | FAIL_VOID("Failed to construct Vector3D object"); | ||||
| ret.setObject(*objVec); | ret.setObject(*objVec); | ||||
| } | } | ||||
| template<> bool ScriptInterface::FromJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::HandleValue v, CFixedVector2D& out) | template<> bool ScriptInterface::FromJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::HandleValue v, CFixedVector2D& out) | ||||
| { | { | ||||
| if (!v.isObject()) | if (!v.isObject()) | ||||
| return false; // TODO: report type error | return false; // TODO: report type error | ||||
| JS::RootedObject obj(rq.cx, &v.toObject()); | JS::RootedObject obj(rq.cx, &v.toObject()); | ||||
| JS::RootedValue p(rq.cx); | JS::RootedValue p(rq.cx); | ||||
| if (!JS_GetProperty(rq.cx, obj, "x", &p)) return false; // TODO: report type errors | if (!JS_GetProperty(rq.cx, obj, "x", &p)) return false; // TODO: report type errors | ||||
| if (!FromJSVal(rq, p, out.X)) return false; | if (!FromJSVal(rq, p, out.Xref())) return false; | ||||
| if (!JS_GetProperty(rq.cx, obj, "y", &p)) return false; | if (!JS_GetProperty(rq.cx, obj, "y", &p)) return false; | ||||
| if (!FromJSVal(rq, p, out.Y)) return false; | if (!FromJSVal(rq, p, out.Yref())) return false; | ||||
| return true; | return true; | ||||
| } | } | ||||
| template<> void ScriptInterface::ToJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CFixedVector2D& val) | template<> void ScriptInterface::ToJSVal<CFixedVector2D>(const ScriptRequest& rq, JS::MutableHandleValue ret, const CFixedVector2D& val) | ||||
| { | { | ||||
| JS::RootedObject global(rq.cx, rq.glob); | JS::RootedObject global(rq.cx, rq.glob); | ||||
| JS::RootedValue valueVector2D(rq.cx); | JS::RootedValue valueVector2D(rq.cx); | ||||
| if (!ScriptInterface::GetGlobalProperty(rq, "Vector2D", &valueVector2D)) | if (!ScriptInterface::GetGlobalProperty(rq, "Vector2D", &valueVector2D)) | ||||
| FAIL_VOID("Failed to get Vector2D constructor"); | FAIL_VOID("Failed to get Vector2D constructor"); | ||||
| JS::RootedValueArray<2> args(rq.cx); | JS::RootedValueArray<2> args(rq.cx); | ||||
| args[0].setNumber(val.X.ToDouble()); | args[0].setNumber(val.getX().ToDouble()); | ||||
| args[1].setNumber(val.Y.ToDouble()); | args[1].setNumber(val.getY().ToDouble()); | ||||
| JS::RootedObject objVec(rq.cx); | JS::RootedObject objVec(rq.cx); | ||||
| if (!JS::Construct(rq.cx, valueVector2D, args, &objVec)) | if (!JS::Construct(rq.cx, valueVector2D, args, &objVec)) | ||||
| FAIL_VOID("Failed to construct Vector2D object"); | FAIL_VOID("Failed to construct Vector2D object"); | ||||
| ret.setObject(*objVec); | ret.setObject(*objVec); | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator