Ticket #5376: remove_workaround_while_leaving_serialization_unfixed.patch

binaries/data/mods/public/globalscripts/vector.js

@@ -429 +429 @@
 {
     return new Vector3D(v.x / f, v.y / f, v.z / f);
 };
-
-
-// make the prototypes easily accessible to C++
-const Vector2Dprototype = Vector2D.prototype;
-const Vector3Dprototype = Vector3D.prototype;

source/scriptinterface/ScriptInterface.cpp

@@ -67 +67 @@
     JSCompartment* m_comp;
     boost::rand48* m_rng;
     JS::PersistentRootedObject m_nativeScope; // native function scope object
-
-    typedef std::map<ScriptInterface::CACHED_VAL, JS::PersistentRootedValue> ScriptValCache;
-    ScriptValCache m_ScriptValCache;
 };
 
 namespace
@@ -450 +447 @@
     return pCxPrivate;
 }
 
-JS::Value ScriptInterface::GetCachedValue(CACHED_VAL valueIdentifier) const
-{
-    std::map<ScriptInterface::CACHED_VAL, JS::PersistentRootedValue>::const_iterator it = m->m_ScriptValCache.find(valueIdentifier);
-    ENSURE(it != m->m_ScriptValCache.end());
-    return it->second.get();
-}
-
-
 bool ScriptInterface::LoadGlobalScripts()
 {
     // Ignore this failure in tests
@@ -473 +462 @@
             LOGERROR("LoadGlobalScripts: Failed to load script %s", path.string8());
             return false;
         }
-
-    JSAutoRequest rq(m->m_cx);
-    JS::RootedValue proto(m->m_cx);
-    JS::RootedObject global(m->m_cx, m->m_glob);
-    if (JS_GetProperty(m->m_cx, global, "Vector2Dprototype", &proto))
-        m->m_ScriptValCache[CACHE_VECTOR2DPROTO].init(GetJSRuntime(), proto);
-    if (JS_GetProperty(m->m_cx, global, "Vector3Dprototype", &proto))
-        m->m_ScriptValCache[CACHE_VECTOR3DPROTO].init(GetJSRuntime(), proto);
     return true;
 }
 

source/scriptinterface/ScriptInterface.h

@@ -115 +115 @@
      */
     bool LoadGlobalScripts();
 
-    enum CACHED_VAL { CACHE_VECTOR2DPROTO, CACHE_VECTOR3DPROTO };
-    JS::Value GetCachedValue(CACHED_VAL valueIdentifier) const;
-
     /**
      * Replace the default JS random number geenrator with a seeded, network-sync'd one.
      */

source/simulation2/scripting/EngineScriptConversions.cpp

@@ -177 +177 @@
 
 template<> void ScriptInterface::ToJSVal<CFixedVector3D>(JSContext* cx, JS::MutableHandleValue ret, const CFixedVector3D& val)
 {
+    debug_printf("ToJSVal<CFixedVector3D>\n");
+
     JSAutoRequest rq(cx);
 
-    // apply the Vector3D prototype to the return value;
     ScriptInterface::CxPrivate* pCxPrivate = ScriptInterface::GetScriptInterfaceAndCBData(cx);
-    JS::RootedObject proto(cx, &pCxPrivate->pScriptInterface->GetCachedValue(ScriptInterface::CACHE_VECTOR3DPROTO).toObject());
+
+    JS::RootedObject global(cx, &pCxPrivate->pScriptInterface->GetGlobalObject().toObject());
+
+    JS::RootedValue valueVector3D(cx);
+    JS_GetProperty(cx, global, "Vector3D", &valueVector3D);
+
+    JS::RootedObject objectVector3D(cx, &valueVector3D.toObject());
+
+    JS::RootedObject proto(cx);
+    JS_GetPrototype(cx, objectVector3D, &proto);
+
     JS::RootedObject obj(cx, JS_NewObjectWithGivenProto(cx, nullptr, proto));
 
     if (!obj)
@@ -224 +235 @@
 
 template<> void ScriptInterface::ToJSVal<CFixedVector2D>(JSContext* cx, JS::MutableHandleValue ret, const CFixedVector2D& val)
 {
+    debug_printf("ToJSVal<CFixedVector2D>\n");
+
     JSAutoRequest rq(cx);
 
-    // apply the Vector2D prototype to the return value
     ScriptInterface::CxPrivate* pCxPrivate = ScriptInterface::GetScriptInterfaceAndCBData(cx);
-    JS::RootedObject proto(cx, &pCxPrivate->pScriptInterface->GetCachedValue(ScriptInterface::CACHE_VECTOR2DPROTO).toObject());
+
+    JS::RootedObject global(cx, &pCxPrivate->pScriptInterface->GetGlobalObject().toObject());
+
+    JS::RootedValue valueVector2D(cx);
+    JS_GetProperty(cx, global, "Vector2D", &valueVector2D);
+
+    JS::RootedObject objectVector2D(cx, &valueVector2D.toObject());
+
+    JS::RootedObject proto(cx);
+    JS_GetPrototype(cx, objectVector2D, &proto);
+
     JS::RootedObject obj(cx, JS_NewObjectWithGivenProto(cx, nullptr, proto));
+
     if (!obj)
     {
         ret.setUndefined();