Skip to content

Back from vacation fixes #17097

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
merged 2 commits into from
Sep 1, 2025
Merged

Back from vacation fixes #17097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f49d803
Back from vacation fixes
CedricGuillemet Sep 1, 2025
bff14f5
separate axis for plane drag
CedricGuillemet Sep 1, 2025
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
34 changes: 21 additions & 13 deletions packages/dev/core/src/Gizmos/planeDragGizmo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ export class PlaneDragGizmo extends Gizmo implements IPlaneDragGizmo {
this._gizmoMesh.scaling.scaleInPlace(1 / 3);
this._gizmoMesh.parent = this._rootMesh;

let currentSnapDragDistance = 0;
const currentSnapDragDistance = new Vector3();
const tmpVector = new Vector3();
const tmpVector2 = new Vector3();
const tmpSnapEvent = { snapDistance: 0 };
// Add dragPlaneNormal drag behavior to handle events when the gizmo is dragged
this.dragBehavior = new PointerDragBehavior({ dragPlaneNormal: dragPlaneNormal });
Expand All @@ -156,20 +157,27 @@ export class PlaneDragGizmo extends Gizmo implements IPlaneDragGizmo {
this.attachedNode.getWorldMatrix().addTranslationFromFloats(event.delta.x, event.delta.y, event.delta.z);
}
} else {
currentSnapDragDistance += event.dragDistance;
if (Math.abs(currentSnapDragDistance) > this.snapDistance) {
const dragSteps = Math.floor(Math.abs(currentSnapDragDistance) / this.snapDistance);
currentSnapDragDistance = currentSnapDragDistance % this.snapDistance;
event.delta.normalizeToRef(tmpVector);
tmpVector.scaleInPlace(this.snapDistance * dragSteps);
this.attachedNode.getWorldMatrix().getTranslationToRef(TmpVectors.Vector3[0]);
TmpVectors.Vector3[0].addToRef(tmpVector, TmpVectors.Vector3[0]);
if (this.dragBehavior.validateDrag(TmpVectors.Vector3[0])) {
this.attachedNode.getWorldMatrix().addTranslationFromFloats(tmpVector.x, tmpVector.y, tmpVector.z);
tmpSnapEvent.snapDistance = this.snapDistance * dragSteps;
this.onSnapObservable.notifyObservers(tmpSnapEvent);
currentSnapDragDistance.addInPlace(event.delta);
tmpVector2.set(0, 0, 0);
const currentSnapDragDistanceArray = currentSnapDragDistance.asArray();
for (let axis = 0; axis < 3; axis++) {
const axisDistance = currentSnapDragDistanceArray[axis];
if (Math.abs(axisDistance) > this.snapDistance) {
const dragSteps = (axisDistance < 0 ? Math.ceil : Math.floor)(axisDistance / this.snapDistance);
currentSnapDragDistanceArray[axis] = currentSnapDragDistanceArray[axis] % this.snapDistance;
tmpVector.set(axis == 0 ? 1 : 0, axis == 1 ? 1 : 0, axis == 2 ? 1 : 0);
tmpVector.scaleInPlace(this.snapDistance * dragSteps);
tmpVector2.addInPlace(tmpVector);
}
}
currentSnapDragDistance.fromArray(currentSnapDragDistanceArray);
this.attachedNode.getWorldMatrix().getTranslationToRef(TmpVectors.Vector3[0]);
TmpVectors.Vector3[0].addToRef(tmpVector2, TmpVectors.Vector3[0]);
if (this.dragBehavior.validateDrag(TmpVectors.Vector3[0])) {
this.attachedNode.getWorldMatrix().addTranslationFromFloats(tmpVector2.x, tmpVector2.y, tmpVector2.z);
tmpSnapEvent.snapDistance = tmpVector2.length();
this.onSnapObservable.notifyObservers(tmpSnapEvent);
}
}
this._matrixChanged();
}
Expand Down
13 changes: 3 additions & 10 deletions packages/dev/core/src/Meshes/GaussianSplatting/gaussianSplattingMesh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,19 +400,12 @@ export class GaussianSplattingMesh extends Mesh {

const vertexData = new VertexData();

// Use an intanced quad or triangle. Triangle might be a bit faster because of less shader invocation but I didn't see any difference.
// Keeping both and use triangle for now.
// for quad, use following lines
//vertexData.positions = [-2, -2, 0, 2, -2, 0, 2, 2, 0, -2, 2, 0];
//vertexData.indices = [0, 1, 2, 0, 2, 3];
vertexData.positions = [-3, -2, 0, 3, -2, 0, 0, 4, 0];
vertexData.indices = [0, 1, 2];
vertexData.positions = [-2, -2, 0, 2, -2, 0, 2, 2, 0, -2, 2, 0];
vertexData.indices = [0, 1, 2, 0, 2, 3];
vertexData.applyToMesh(this);

this.subMeshes = [];
// for quad, use following line
//new SubMesh(0, 0, 4, 0, 6, this);
new SubMesh(0, 0, 3, 0, 3, this);
new SubMesh(0, 0, 4, 0, 6, this);

this.setEnabled(false);
// webGL2 and webGPU support for RG texture with float16 is fine. not webGL1
Expand Down