Fix notification after regeneration (#5733)

* Fix grass * Fix USE-DEF * Finalize
cyberbotics · Jan 13, 2023 · 84689d5 · 84689d5
1 parent 5eb8a32
commit 84689d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/resources/web/wwi/X3dScene.js b/resources/web/wwi/X3dScene.js
@@ -178,20 +178,17 @@ export default class X3dScene {
     let parentNode;
     if (typeof parentId !== 'undefined') {
       parentNode = WbWorld.instance.nodes.get('n' + parentId);
-      parentNode.isPreFinalizedCalled = false;
-      parentNode.isPostFinalizedCalled = false;
+      parentNode.unfinalize();
     }
 
     const parser = new Parser(webots.currentView.prefix);
     parser.prefix = webots.currentView.prefix;
     await parser.parse(x3dObject, this.renderer, false, parentNode, callback);
 
     const node = WbWorld.instance.nodes.get(parser.rootNodeId);
-    if (typeof parentId !== 'undefined') {
-      node.finalize();
-      if (parentNode instanceof WbShape) // TODO: this might be improved with a onchange trigger
-        parentNode.updateAppearance();
-    } else
+    if (typeof parentId !== 'undefined')
+      parentNode.finalize();
+    else
       node.finalize();
   }
 

diff --git a/resources/web/wwi/nodes/WbBaseNode.js b/resources/web/wwi/nodes/WbBaseNode.js
@@ -24,6 +24,16 @@ export default class WbBaseNode {
     WbWorld.instance.nodes.delete(this.id);
   }
 
+  unfinalize() {
+    this.isPreFinalizedCalled = false;
+    this.wrenObjectsCreatedCalled = false;
+    this.isPostFinalizedCalled = false;
+    for (const useId of this.useList) { // notify USE nodes to do the same
+      const useNode = WbWorld.instance.nodes.get(useId);
+      useNode?.unfinalize();
+    }
+  }
+
   finalize() {
     if (!this.isPreFinalizedCalled)
       this.preFinalize();