giers10/webeditor3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor brush transformation pivot position calculation in viewport-host.ts

Browse Source
This commit is contained in:
Victor Giers
2026-04-05 01:56:59 +02:00
parent 5dce46904d
commit 30f4a24571
1 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/viewport-three/viewport-host.ts
View File

@@ -1053,67 +1053,20 @@ export class ViewportHost {
private getTransformPivotPosition(session: ActiveTransformSession): Vec3 { private getTransformPivotPosition(session: ActiveTransformSession): Vec3 {
if (session.preview.kind === "brush") { if (session.preview.kind === "brush") {
if (session.target.kind === "brushFace") { const previewBrush = this.createPreviewBrushForSession(session);
return getBoxBrushFaceWorldCenter(
{
id: session.target.brushId,
kind: "box",
center: session.preview.center,
rotationDegrees: session.preview.rotationDegrees,
size: session.preview.size,
faces: this.currentDocument?.brushes[session.target.brushId]?.faces ?? this.currentDocument?.brushes[session.target.brushId]?.faces ?? {
posX: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negX: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
posY: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negY: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
posZ: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negZ: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } }
}
},
session.target.faceId
);
}
if (session.target.kind === "brushEdge") { if (previewBrush !== null) {
return getBoxBrushEdgeWorldSegment( if (session.target.kind === "brushFace") {
{ return getBoxBrushFaceWorldCenter(previewBrush, session.target.faceId);
id: session.target.brushId, }
kind: "box",
center: session.preview.center,
rotationDegrees: session.preview.rotationDegrees,
size: session.preview.size,
faces: this.currentDocument?.brushes[session.target.brushId]?.faces ?? {
posX: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negX: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
posY: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negY: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
posZ: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negZ: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } }
}
},
session.target.edgeId
).center;
}
if (session.target.kind === "brushVertex") { if (session.target.kind === "brushEdge") {
return getBoxBrushVertexWorldPosition( return getBoxBrushEdgeWorldSegment(previewBrush, session.target.edgeId).center;
{ }
id: session.target.brushId,
kind: "box", if (session.target.kind === "brushVertex") {
center: session.preview.center, return getBoxBrushVertexWorldPosition(previewBrush, session.target.vertexId);
rotationDegrees: session.preview.rotationDegrees, }
size: session.preview.size,
faces: this.currentDocument?.brushes[session.target.brushId]?.faces ?? {
posX: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negX: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
posY: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negY: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
posZ: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } },
negZ: { materialId: null, uv: { offset: { x: 0, y: 0 }, scale: { x: 1, y: 1 }, rotationQuarterTurns: 0, flipU: false, flipV: false } }
}
},
session.target.vertexId
);
} }
} }
@@ -1127,6 +1080,40 @@ export class ViewportHost {
} }
} }
private createPreviewBrushForSession(session: ActiveTransformSession): BoxBrush | null {
if (session.preview.kind !== "brush") {
return null;
}
if (
session.target.kind !== "brush" &&
session.target.kind !== "brushFace" &&
session.target.kind !== "brushEdge" &&
session.target.kind !== "brushVertex"
) {
return null;
}
const currentBrush = this.currentDocument?.brushes[session.target.brushId];
if (currentBrush === undefined || currentBrush.kind !== "box") {
return null;
}
return {
...currentBrush,
center: {
...session.preview.center
},
rotationDegrees: {
...session.preview.rotationDegrees
},
size: {
...session.preview.size
}
};
}
private clearTransformGizmo() { private clearTransformGizmo() {
for (const child of [...this.transformGizmoGroup.children]) { for (const child of [...this.transformGizmoGroup.children]) {
this.transformGizmoGroup.remove(child); this.transformGizmoGroup.remove(child);