Create snapshot upon releasing transform gizmo (#9126)

* explicitly snapshot after mouse button release on translate/rotate/scale gizmos so that snapshot state is accurate * commitTransformSave is now more consistent with the rest of the EditorControlFunctions and takes an array of nodes rather than one * touched up comments --------- Co-authored-by: HexaField <joshfield999@gmail.com>
EtherealEngine · Oct 24, 2023 · c638c3f · c638c3f
1 parent 545134f
commit c638c3f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/packages/editor/src/components/properties/ScenePreviewCameraNodeEditor.tsx b/packages/editor/src/components/properties/ScenePreviewCameraNodeEditor.tsx
@@ -61,7 +61,7 @@ export const ScenePreviewCameraNodeEditor: EditorComponentType = (props) => {
     transform.rotation.copy(rotation)
     computeTransformMatrix(props.entity)
 
-    EditorControlFunctions.commitTransformSave(props.entity)
+    EditorControlFunctions.commitTransformSave([props.entity])
   }
 
   const updateScenePreview = async () => {

diff --git a/packages/editor/src/components/properties/TransformPropertyGroup.tsx b/packages/editor/src/components/properties/TransformPropertyGroup.tsx
@@ -68,7 +68,7 @@ export const TransformPropertyGroup: EditorComponentType = (props) => {
   const useGlobalTransformComponent = useHookstate(false)
 
   const onRelease = () => {
-    EditorControlFunctions.commitTransformSave(props.entity)
+    EditorControlFunctions.commitTransformSave([props.entity])
   }
 
   const onChangeDynamicLoad = (value) => {

diff --git a/packages/editor/src/functions/EditorControlFunctions.ts b/packages/editor/src/functions/EditorControlFunctions.ts
@@ -777,14 +777,16 @@ const addToSelection = (nodes: EntityOrObjectUUID[]) => {
   // dispatchAction(EditorHistoryAction.createSnapshot(newSnapshot))
 }
 
-const commitTransformSave = (entity: Entity) => {
+const commitTransformSave = (nodes: EntityOrObjectUUID[]) => {
   const newSnapshot = EditorHistoryState.cloneCurrentSnapshot()
-  LocalTransformComponent.stateMap[entity]!.set(LocalTransformComponent.valueMap[entity])
-
-  const entityData = newSnapshot.data.scene.entities[getComponent(entity, UUIDComponent)]
-  const component = entityData.components.find((c) => c.name === LocalTransformComponent.jsonID)!
-  component.props = serializeComponent(entity, LocalTransformComponent)
-
+  for (let i = 0; i < nodes.length; i++) {
+    const entity = nodes[i]
+    if (typeof entity === 'string') continue
+    LocalTransformComponent.stateMap[entity]!.set(LocalTransformComponent.valueMap[entity])
+    const entityData = newSnapshot.data.scene.entities[getComponent(entity, UUIDComponent)]
+    const component = entityData.components.find((c) => c.name === LocalTransformComponent.jsonID)!
+    component.props = serializeComponent(entity, LocalTransformComponent)
+  }
   dispatchAction(EditorHistoryAction.createSnapshot(newSnapshot))
 }
 

diff --git a/packages/editor/src/systems/EditorControlSystem.tsx b/packages/editor/src/systems/EditorControlSystem.tsx
@@ -664,10 +664,13 @@ const execute = () => {
           EditorControlFunctions.replaceSelection([])
         }
       }
-
       gizmoObj.deselectAxis()
       dragging = false
     }
+
+    // commit transform changes upon releasing the gizmo
+    const nodes = getEntityNodeArrayFromEntities(getState(SelectionState).selectedEntities)
+    EditorControlFunctions.commitTransformSave(nodes)
   }
 
   if (editorHelperState.isFlyModeEnabled) return