fuhtho/3d-viewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify z-scaling calculations in generateCapMeshes

Browse source
This commit is contained in:
Fuhrmann 2025-03-31 09:40:19 +02:00
parent e3a4018582
commit 233216c284
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/three/SceneView.ts
View file

@ -424,13 +424,6 @@ export class SceneView extends EventTarget {
// Set z scaling factor // Set z scaling factor
setZScale(scale: number) { setZScale(scale: number) {
// Update extent
//this._extent = {
// ...this._extent,
// zmin: (scale * this._extent.zmin) / this._scene.scale.z,
// zmax: (scale * this._extent.zmax) / this._scene.scale.z,
//};
// Set scale factor // Set scale factor
this._scene.scale.set(1, 1, scale); this._scene.scale.set(1, 1, scale);

16
app/three/utils/build-clipping-planes.ts
View file

@ -397,7 +397,7 @@ export function buildClippingplanes(
// Generate new cap meshes // Generate new cap meshes
const capMeshes = generateCapMeshes( const capMeshes = generateCapMeshes(
meshes, meshes,
plane, plane.clone(),
planes, planes,
orientation, orientation,
scene scene
@ -580,7 +580,10 @@ function generateCapMeshes(
scene: Scene scene: Scene
) { ) {
const capMeshes: Mesh[] = []; const capMeshes: Mesh[] = [];
const scaleFactor = scene.scale.z;
// Rescale to local coordinates
if (orientation === Orientation.Z || orientation === Orientation.NZ)
plane.constant /= scene.scale.z;
// Iterate over the list of geologic meshes // Iterate over the list of geologic meshes
for (const mesh of meshes) { for (const mesh of meshes) {
@ -601,17 +604,17 @@ function generateCapMeshes(
const v1 = new Vector3( const v1 = new Vector3(
position[i1], position[i1],
position[i1 + 1], position[i1 + 1],
scaleFactor * (position[i1 + 2] + mesh.position.z) position[i1 + 2] + mesh.position.z
); );
const v2 = new Vector3( const v2 = new Vector3(
position[i2], position[i2],
position[i2 + 1], position[i2 + 1],
scaleFactor * (position[i2 + 2] + mesh.position.z) position[i2 + 2] + mesh.position.z
); );
const v3 = new Vector3( const v3 = new Vector3(
position[i3], position[i3],
position[i3 + 1], position[i3 + 1],
scaleFactor * (position[i3 + 2] + mesh.position.z) position[i3 + 2] + mesh.position.z
); );
// Check if the triangle is cut by the plane // Check if the triangle is cut by the plane
@ -627,11 +630,8 @@ function generateCapMeshes(
if (d3 * d1 < 0) intersections.push(intersectEdge(v3, v1, d3, d1)); if (d3 * d1 < 0) intersections.push(intersectEdge(v3, v1, d3, d1));
if (intersections.length === 2) { if (intersections.length === 2) {
// Rescale local coordinates and push to edges
const start = intersections[0]; const start = intersections[0];
const end = intersections[1]; const end = intersections[1];
start.z = start.z / scaleFactor;
end.z = end.z / scaleFactor;
edges.push([start, end]); edges.push([start, end]);
} }
} }