Patch toJSON methods on objects that are requested, but not yet discovered via an overview

Author: jsantell

src/content/EntityCache.js

@@ -110,8 +110,6 @@ return class EntityCache extends EventTarget {
           if (valid && !entitiesAdded.has(entity.uuid)) {
             addEntity(entity);
           }
-
-          return true;
         }, {
           recursive: true,
         });
@@ -175,6 +173,12 @@ return class EntityCache extends EventTarget {
       },
     }
 
+    // Register all dependencies, as they may not have
+    // been patched with a custom toJSON yet.
+    utils.forEachDependency(entity, dep => {
+      this._registerEntity(dep);
+    });
+
     let entitiesAdded = new Set();
     let serializedEntity = this._serializeEntity(entity, meta);
 

src/content/utils.js

@@ -39,11 +39,9 @@ const utils = {
    * @param {Object} options 
    * @param {Function} options.recursive [false] whether or not an object should recursively iterate over
    *                                     Object3D children and their dependencies.
-   * @param {Function} options.filter a function that receives an entity, and returns
-   *                                  a boolean indicating whether or not this object should continue descent.
    */
   forEachDependency(entity, fn, options={}) {
-    const shouldDescend = fn(entity);
+    fn(entity);
 
     if (entity.isObject3D) {
       if (entity.material && entity.material.isMaterial) {
@@ -56,7 +54,7 @@ const utils = {
         utils.forEachDependency(entity.background, fn, options);
       }
 
-      if (shouldDescend && entity.children && entity.children.length > 0) {
+      if (options.recursive && entity.children && entity.children.length > 0) {
         for (let child of entity.children) {
           utils.forEachDependency(child, fn, options);
         }