Ver código fonte

Merge pull request #5915 from TrevorDev/inspectorNodeCopies

remove now redundant gizmo parenting logic
David Catuhe 6 anos atrás
pai
commit
003e5ed7ea

+ 1 - 0
dist/preview release/what's new.md

@@ -187,6 +187,7 @@
 - Do not crash the application if webVR submitFrame fails ([TrevorDev](https://github.com/TrevorDev))
 - Fix pinch action on FollowCameraPointersInput ([mrdunk](https://github.com))
 - Tools.CreateScreenshot stopped working ([TrevorDev](https://github.com/TrevorDev))
+- Inspector showing duplicate nodes when attached to gizmo ([TrevorDev](https://github.com/TrevorDev)))
 
 ### Core Engine
 - Fixed a bug with `mesh.alwaysSelectAsActiveMesh` preventing layerMask to be taken in account ([Deltakosh](https://github.com/deltakosh))

+ 0 - 22
inspector/src/components/sceneExplorer/entities/meshTreeItemComponent.tsx

@@ -34,19 +34,6 @@ export class MeshTreeItemComponent extends React.Component<IMeshTreeItemComponen
             if (!mesh.reservedDataStore) {
                 mesh.reservedDataStore = {};
             }
-            mesh.reservedDataStore.previousParent = mesh.parent;
-
-            if (mesh.reservedDataStore.previousParent) {
-                if (!mesh.reservedDataStore.previousParent.reservedDataStore) {
-                    mesh.reservedDataStore.previousParent.reservedDataStore = {};
-                }
-
-                if (!mesh.reservedDataStore.previousParent.reservedDataStore.detachedChildren) {
-                    mesh.reservedDataStore.previousParent.reservedDataStore.detachedChildren = [];
-                }
-
-                mesh.reservedDataStore.previousParent.reservedDataStore.detachedChildren.push(mesh);
-            }
 
             const gizmo = new BoundingBoxGizmo(Color3.FromHexString("#0984e3"));
             gizmo.attachedMesh = mesh;
@@ -60,17 +47,8 @@ export class MeshTreeItemComponent extends React.Component<IMeshTreeItemComponen
             return;
         }
 
-        const previousParent = mesh.reservedDataStore.previousParent;
         mesh.reservedDataStore.gizmo.dispose();
         mesh.reservedDataStore.gizmo = null;
-        mesh.setParent(previousParent);
-
-        if (previousParent && previousParent.reservedDataStore) {
-            previousParent.reservedDataStore.detachedChildren = null;
-        }
-
-        mesh.reservedDataStore.previousParent = null;
-        mesh.reservedDataStore.pointerDragBehavior = null;
 
         this.setState({ isGizmoEnabled: false });
     }