refactor gizmo manager

decentraland · Nov 22, 2024 · ed02515 · ed02515
1 parent da65ecc
commit ed02515
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 165 deletions.
diff --git a/packages/@dcl/inspector/src/lib/babylon/decentraland/editorComponents/selection.ts b/packages/@dcl/inspector/src/lib/babylon/decentraland/editorComponents/selection.ts
@@ -53,28 +53,14 @@ export const setGizmoManager = (entity: EcsEntity, value: { gizmo: number }) =>
 
   toggleSelection(entity, true)
 
-  const selectedEntities = Array.from(context.engine.getEntitiesWith(context.editorComponents.Selection))
   const types = context.gizmos.getGizmoTypes()
   const type = types[value?.gizmo || 0]
   context.gizmos.setGizmoType(type)
-
-  if (selectedEntities.length === 1) {
-    context.gizmos.setEntity(entity)
-  } else if (selectedEntities.length > 1) {
-    context.gizmos.repositionGizmoOnCentroid()
-  }
+  context.gizmos.addEntity(entity)
 }
 
 export const unsetGizmoManager = (entity: EcsEntity) => {
   const context = entity.context.deref()!
-  const selectedEntities = Array.from(context.engine.getEntitiesWith(context.editorComponents.Selection))
-  const currentEntity = context.gizmos.getEntity()
-
   toggleSelection(entity, false)
-
-  if (currentEntity?.entityId === entity.entityId || selectedEntities.length === 0) {
-    context.gizmos.unsetEntity()
-  } else {
-    context.gizmos.repositionGizmoOnCentroid()
-  }
+  context.gizmos.removeEntity(entity)
 }
diff --git a/packages/@dcl/inspector/src/lib/babylon/decentraland/gizmo-manager.spec.ts b/packages/@dcl/inspector/src/lib/babylon/decentraland/gizmo-manager.spec.ts
@@ -65,14 +65,14 @@ describe('GizmoManager', () => {
         babylonEntity.rotationQuaternion = new Quaternion(0, 0, 0, 1)
         handler = jest.fn()
         gizmos.onChange(handler)
-        gizmos.setEntity(babylonEntity)
+        gizmos.addEntity(babylonEntity)
         entities = [dclEntity]
         nodes.push({ entity: dclEntity, children: [] })
       })
       afterEach(() => {
         babylonEntity.dispose()
         context.engine.removeEntity(dclEntity)
-        gizmos.unsetEntity()
+        gizmos.removeEntity(context.getOrCreateEntity(dclEntity))
         entities = []
         nodes = nodes.filter(($) => $.entity !== dclEntity)
       })
@@ -86,16 +86,11 @@ describe('GizmoManager', () => {
         it('should skip setting the entity', () => {
           const handler = jest.fn()
           gizmos.onChange(handler)
-          gizmos.setEntity(babylonEntity)
+          gizmos.addEntity(babylonEntity)
           expect(handler).not.toHaveBeenCalled()
         })
       })
       describe('and dragging a gizmo', () => {
-        it('should not execute SDK operations if transform was not changed', () => {
-          gizmos.gizmoManager.gizmos.positionGizmo?.onDragEndObservable.notifyObservers({} as any)
-          expect(context.operations.updateValue).toBeCalledTimes(0)
-          expect(context.operations.dispatch).toBeCalledTimes(0)
-        })
         it('should execute SDK operations if transform was changed', () => {
           babylonEntity.position = new Vector3(10, 10, 10)
           gizmos.gizmoManager.gizmos.positionGizmo?.onDragEndObservable.notifyObservers({} as any)