fix: Model scalation

Author: cyaiox

packages/@dcl/inspector/src/lib/babylon/decentraland/gizmo-manager.ts

@@ -134,25 +134,26 @@ export function createGizmoManager(context: SceneContext) {
   }
 
   function computeWorldTransform(entity: EcsEntity): TransformType {
-    const { positionGizmoEnabled, scaleGizmoEnabled, rotationGizmoEnabled } = gizmoManager
-    // Compute the updated transform based on the current node position
+    const { positionGizmoEnabled, rotationGizmoEnabled } = gizmoManager
     const worldMatrix = entity.computeWorldMatrix(true)
     const position = new Vector3()
-    const scale = new Vector3()
     const rotation = new Quaternion()
-    worldMatrix.decompose(scale, rotation, position)
+
+    // Extract only position and rotation from world matrix
+    const scale = entity.scaling.clone() // Keep original scale
+    worldMatrix.decompose(new Vector3(), rotation, position) // Ignore decomposed scale
 
     return {
       position: positionGizmoEnabled ? snapPosition(position) : position,
-      scale: scaleGizmoEnabled ? snapScale(scale) : scale,
+      scale: scale, // Always use original scale
       rotation: rotationGizmoEnabled ? snapRotation(rotation) : rotation
     }
   }
 
   function getTransform(entity: EcsEntity): TransformType {
     return {
       position: entity.position,
-      scale: entity.scaling,
+      scale: entity.scaling.clone(), // Clone to prevent reference issues
       rotation: entity.rotationQuaternion ?? Quaternion.Zero(),
       parent: getParent(entity)
     }
@@ -183,17 +184,28 @@ export function createGizmoManager(context: SceneContext) {
    */
   function updateTransform() {
     fixRotationGizmoAlignment(getTransform(getFirstEntity()))
+
     for (const entity of selectedEntities) {
       const originalParent = getParent(entity)
       const parent = context.getEntityOrNull(originalParent ?? context.rootNode.entityId)
+      const originalScale = entity.scaling.clone()
 
       entity.setParent(parent)
       const transform = parent === context.rootNode ? computeWorldTransform(entity) : getTransform(entity)
 
-      updateEntityTransform(entity.entityId, { ...transform, parent: originalParent })
+      // Create a new transform that only updates position and rotation
+      const newTransform = {
+        position: transform.position,
+        scale: originalScale, // Always keep original scale
+        rotation: transform.rotation,
+        parent: originalParent
+      }
+
+      updateEntityTransform(entity.entityId, newTransform)
     }
 
     void context.operations.dispatch()
+    restoreParents()
   }
 
   // Check if a transform node for the gizmo already exists, or create one
@@ -204,10 +216,20 @@ export function createGizmoManager(context: SceneContext) {
   }
 
   function restoreParents() {
+    const originalParents = new Map<EcsEntity, Entity>()
+
+    // Store original parent relationships
     for (const entity of selectedEntities) {
-      const originalParent = getParent(entity)
+      const parent = getParent(entity)
+      originalParents.set(entity, parent)
+    }
+
+    // Restore original parent relationships
+    for (const [entity, originalParent] of originalParents) {
       const parent = context.getEntityOrNull(originalParent ?? context.rootNode.entityId)
-      entity.setParent(parent)
+      if (parent) {
+        entity.setParent(parent)
+      }
     }
   }
 
@@ -226,15 +248,36 @@ export function createGizmoManager(context: SceneContext) {
     const centroidRotation = calculateAverageRotation(rotations)
     const dummyNode = getDummyNode()
 
-    // Set the dummy node transform
+    // Set the dummy node transform with uniform scale
     dummyNode.position = centroidPosition
     dummyNode.rotationQuaternion = centroidRotation
     dummyNode.scaling = new Vector3(1, 1, 1)
 
+    // Store original parent-child relationships
+    const originalParents = new Map<EcsEntity, Entity>()
+    const rootEntities = new Set<EcsEntity>()
+
+    // First pass: identify root entities and store parent relationships
     for (const entity of selectedEntities) {
+      const parent = getParent(entity)
+      originalParents.set(entity, parent)
+
+      // If parent is not selected, this is a root entity
+      if (!selectedEntities.some((e) => e.entityId === parent)) {
+        rootEntities.add(entity)
+      }
+    }
+
+    // Second pass: only move root entities under dummy node
+    for (const entity of rootEntities) {
+      // Store original scale before moving under dummy node
+      const originalScale = entity.scaling.clone()
       entity.setParent(dummyNode)
+      // Restore original scale after moving
+      entity.scaling = originalScale
     }
 
+    // Attach gizmo to the dummy node
     gizmoManager.attachToNode(dummyNode)
   }
 
@@ -296,6 +339,7 @@ export function createGizmoManager(context: SceneContext) {
     gizmoManager.positionGizmoEnabled = false
     gizmoManager.rotationGizmoEnabled = false
     gizmoManager.scaleGizmoEnabled = false
+    restoreParents()
     events.emit('change')
   }