Skip to content

Fix: New position not saved to server after reposition dialog #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeyItsBATMAN merged 1 commit into from
Jun 11, 2026
Merged

Fix: New position not saved to server after reposition dialog #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions src/app/services/annotation/annotation.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
import {
ActionManager,
ExecuteCodeAction,
Matrix,
MeshBuilder,
PositionGizmo,
Tags,
Expand Down Expand Up @@ -255,14 +256,16 @@ export class AnnotationService {
.map(anno => anno._id.toString()),
]);

const originalPosition = marker.position.clone();
const originalLocalPosition = marker.position.clone();
marker.computeWorldMatrix(true);
const originalWorldPosition = marker.getAbsolutePosition().clone();
const transformMesh = MeshBuilder.CreateBox(
`${markerName}_reposition_transform`,
{ size: 0 },
this.babylon.getScene(),
);
transformMesh.visibility = 0;
transformMesh.position = marker.position.clone();
transformMesh.position = originalWorldPosition.clone();
marker.setParent(transformMesh);
marker.setPositionWithLocalVector(Vector3.Zero());

Expand Down Expand Up @@ -291,7 +294,7 @@ export class AnnotationService {
// Update camera to current position after drag, which is the position of the transformMesh
this.babylon.cameraManager.setActiveCameraTarget(transformMesh.position, 2);
dialogRef.componentInstance.updatePositions({
prev: originalPosition,
prev: originalWorldPosition,
curr: transformMesh.getAbsolutePosition(),
});
});
Expand All @@ -301,19 +304,42 @@ export class AnnotationService {
gizmo.onDragEndObservable.remove(dragRef);
gizmo.dispose();
utilLayer.dispose();
const nodePosition = transformMesh.position.clone();
marker.setParent(null);
const newWorldPosition = transformMesh.getAbsolutePosition().clone();
transformMesh.dispose();
marker.setParent(null);

if (result !== 'apply') {
marker.position = originalPosition.clone();
const center = this.babylon.getScene().getMeshesByTags('center')[0];
if (result === 'apply' && center) {
const inverseMatrix = Matrix.Invert(center.getWorldMatrix());
const newLocalPosition = Vector3.TransformCoordinates(newWorldPosition, inverseMatrix);
annotation.target.selector.referencePoint = {
x: newLocalPosition.x,
y: newLocalPosition.y,
z: newLocalPosition.z,
};
marker.setParent(center);
marker.position = newLocalPosition;
} else if (center) {
marker.setParent(center);
marker.position = originalLocalPosition;
} else if (result === 'apply') {
annotation.target.selector.referencePoint = {
x: newWorldPosition.x,
y: newWorldPosition.y,
z: newWorldPosition.z,
};
marker.position = newWorldPosition;
} else {
marker.position = nodePosition.clone();
marker.position = originalLocalPosition;
}

const screenshot = await this.babylon.createPreviewScreenshot();
annotation.body.content.relatedPerspective.preview = screenshot;

if (result === 'apply') {
await this.updateAnnotation(annotation);
}

this.hiddenAnnotations$.next([...hiddenAnnotations]);
this.isRepositioning.set(false);
void this.setSelectedAnnotation(annotation._id.toString());
Expand Down
Loading