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

Enhance water material merging logic with normal alignment and profile settings

Browse Source
This commit is contained in:
Victor Giers
2026-04-07 05:50:55 +02:00
parent b9bda55693
commit b62edd7e88
7 changed files with 281 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/rendering/water-material.js
View File

@@ -265,6 +265,16 @@ function createPatchFromProjectedPoints(projectedPoints, preferredAxis, minimumT
};
}
function computeTriangleNormal(pointA, pointB, pointC) {
const edgeAB = pointB.clone().sub(pointA);
const edgeAC = pointC.clone().sub(pointA);
const normal = edgeAB.cross(edgeAC);
if (normal.lengthSq() <= WATER_CONTACT_EPSILON) {
return null;
}
return normal.normalize();
}
function createPatchCornerPoints(patch) {
const axis = new Vector2(patch.axisX, patch.axisZ);
if (axis.lengthSq() <= WATER_CONTACT_EPSILON) {
@@ -305,11 +315,33 @@ function measurePatchExtentsInBasis(points, axis) {
};
}
function mergeTriangleMeshContactPatches(rawPatches, minimumThickness) {
function getTriangleMeshMergeSettings(mergeProfile, minimumThickness) {
if (mergeProfile === "aggressive") {
return {
axisAlignment: 0.88,
normalAlignment: 0.9,
minimumPrimaryGap: Math.max(0.26, minimumThickness * 2.8),
minimumSecondaryGap: Math.max(0.18, minimumThickness * 2.2),
primaryGapScale: 0.34,
secondaryGapScale: 0.55
};
}
return {
axisAlignment: 0.95,
normalAlignment: 0.97,
minimumPrimaryGap: Math.max(0.08, minimumThickness * 1.25),
minimumSecondaryGap: Math.max(0.1, minimumThickness * 1.4),
primaryGapScale: 0.12,
secondaryGapScale: 0.3
};
}
function mergeTriangleMeshContactPatches(rawPatches, minimumThickness, mergeProfile) {
const mergeSettings = getTriangleMeshMergeSettings(mergeProfile, minimumThickness);
const clusters = [];
for (const patch of rawPatches) {
const patchPoints = createPatchCornerPoints(patch);
const patchAxis = new Vector2(patch.axisX, patch.axisZ);
for (const rawPatch of rawPatches) {
const patchPoints = createPatchCornerPoints(rawPatch.patch);
const patchAxis = new Vector2(rawPatch.patch.axisX, rawPatch.patch.axisZ);
if (patchAxis.lengthSq() <= WATER_CONTACT_EPSILON) {
patchAxis.set(1, 0);
}
@@ -319,14 +351,20 @@ function mergeTriangleMeshContactPatches(rawPatches, minimumThickness) {
let merged = false;
for (const cluster of clusters) {
const alignment = Math.abs(cluster.axis.dot(patchAxis));
if (alignment < 0.92) {
if (alignment < mergeSettings.axisAlignment) {
continue;
}
const normalAlignment = Math.abs(cluster.normal.dot(rawPatch.normal));
if (normalAlignment < mergeSettings.normalAlignment) {
continue;
}
const patchExtents = measurePatchExtentsInBasis(patchPoints, cluster.axis);
const primaryGap = Math.max(0, Math.max(cluster.extents.minPrimary - patchExtents.maxPrimary, patchExtents.minPrimary - cluster.extents.maxPrimary));
const secondaryGap = Math.max(0, Math.max(cluster.extents.minSecondary - patchExtents.maxSecondary, patchExtents.minSecondary - cluster.extents.maxSecondary));
const allowedPrimaryGap = Math.max(0.18, Math.max(patch.halfWidth, (cluster.extents.maxPrimary - cluster.extents.minPrimary) * 0.12));
const allowedSecondaryGap = Math.max(minimumThickness * 1.5, Math.max(patch.halfDepth, (cluster.extents.maxSecondary - cluster.extents.minSecondary) * 0.35));
const clusterPrimarySpan = cluster.extents.maxPrimary - cluster.extents.minPrimary;
const clusterSecondarySpan = cluster.extents.maxSecondary - cluster.extents.minSecondary;
const allowedPrimaryGap = Math.max(mergeSettings.minimumPrimaryGap, Math.max(rawPatch.patch.halfWidth, clusterPrimarySpan) * mergeSettings.primaryGapScale);
const allowedSecondaryGap = Math.max(mergeSettings.minimumSecondaryGap, Math.max(rawPatch.patch.halfDepth, clusterSecondarySpan) * mergeSettings.secondaryGapScale);
if (primaryGap > allowedPrimaryGap || secondaryGap > allowedSecondaryGap) {
continue;
}
@@ -338,6 +376,7 @@ function mergeTriangleMeshContactPatches(rawPatches, minimumThickness) {
if (!merged) {
clusters.push({
axis: patchAxis,
normal: rawPatch.normal.clone(),
points: patchPoints.map((point) => point.clone()),
extents: measurePatchExtentsInBasis(patchPoints, patchAxis)
});
@@ -372,16 +411,23 @@ function appendTriangleMeshContactPatches(patches, source, volume, inverseRotati
vertex.applyQuaternion(inverseRotation);
polygon.push(vertex.clone());
}
const triangleNormal = computeTriangleNormal(polygon[0] ?? new Vector3(), polygon[1] ?? new Vector3(), polygon[2] ?? new Vector3());
if (triangleNormal === null) {
continue;
}
const clippedPolygon = clipPolygonToContactVolume(polygon, halfX, surfaceY - surfaceBand, surfaceY + surfaceBand, halfZ);
if (clippedPolygon.length < 2) {
continue;
}
const patch = createPatchFromProjectedPoints(clippedPolygon.map((point) => new Vector2(point.x, point.z)), null, bandMinimumThickness);
if (patch !== null) {
rawPatches.push(patch);
rawPatches.push({
patch,
normal: triangleNormal
});
}
}
patches.push(...mergeTriangleMeshContactPatches(rawPatches, bandMinimumThickness));
patches.push(...mergeTriangleMeshContactPatches(rawPatches, bandMinimumThickness, source.mergeProfile));
}
export function collectWaterContactPatches(volume, contactBounds) {

84
src/rendering/water-material.ts
View File

@@ -18,6 +18,7 @@ export interface WaterContactTriangleMesh {
kind: "triangleMesh";
vertices: Float32Array;
indices: Uint32Array;
mergeProfile?: "default" | "aggressive";
transform?: {
position: Vec3;
rotationDegrees: Vec3;
@@ -65,6 +66,11 @@ interface OrientedWaterVolume {
size: Vec3;
}
interface TriangleMeshPatchSample {
patch: WaterContactPatch;
normal: Vector3;
}
const MAX_WATER_CONTACT_PATCHES = 6;
const WATER_CONTACT_EPSILON = 1e-4;
@@ -392,6 +398,18 @@ function createPatchFromProjectedPoints(projectedPoints: Vector2[], preferredAxi
};
}
function computeTriangleNormal(pointA: Vector3, pointB: Vector3, pointC: Vector3) {
const edgeAB = pointB.clone().sub(pointA);
const edgeAC = pointC.clone().sub(pointA);
const normal = edgeAB.cross(edgeAC);
if (normal.lengthSq() <= WATER_CONTACT_EPSILON) {
return null;
}
return normal.normalize();
}
function createPatchCornerPoints(patch: WaterContactPatch) {
const axis = new Vector2(patch.axisX, patch.axisZ);
if (axis.lengthSq() <= WATER_CONTACT_EPSILON) {
@@ -434,16 +452,40 @@ function measurePatchExtentsInBasis(points: Vector2[], axis: Vector2) {
};
}
function mergeTriangleMeshContactPatches(rawPatches: WaterContactPatch[], minimumThickness: number) {
function getTriangleMeshMergeSettings(mergeProfile: WaterContactTriangleMesh["mergeProfile"], minimumThickness: number) {
if (mergeProfile === "aggressive") {
return {
axisAlignment: 0.88,
normalAlignment: 0.9,
minimumPrimaryGap: Math.max(0.26, minimumThickness * 2.8),
minimumSecondaryGap: Math.max(0.18, minimumThickness * 2.2),
primaryGapScale: 0.34,
secondaryGapScale: 0.55
};
}
return {
axisAlignment: 0.95,
normalAlignment: 0.97,
minimumPrimaryGap: Math.max(0.08, minimumThickness * 1.25),
minimumSecondaryGap: Math.max(0.1, minimumThickness * 1.4),
primaryGapScale: 0.12,
secondaryGapScale: 0.3
};
}
function mergeTriangleMeshContactPatches(rawPatches: TriangleMeshPatchSample[], minimumThickness: number, mergeProfile: WaterContactTriangleMesh["mergeProfile"]) {
const mergeSettings = getTriangleMeshMergeSettings(mergeProfile, minimumThickness);
const clusters: Array<{
axis: Vector2;
normal: Vector3;
points: Vector2[];
extents: ReturnType<typeof measurePatchExtentsInBasis>;
}> = [];
for (const patch of rawPatches) {
const patchPoints = createPatchCornerPoints(patch);
const patchAxis = new Vector2(patch.axisX, patch.axisZ);
for (const rawPatch of rawPatches) {
const patchPoints = createPatchCornerPoints(rawPatch.patch);
const patchAxis = new Vector2(rawPatch.patch.axisX, rawPatch.patch.axisZ);
if (patchAxis.lengthSq() <= WATER_CONTACT_EPSILON) {
patchAxis.set(1, 0);
} else {
@@ -454,15 +496,28 @@ function mergeTriangleMeshContactPatches(rawPatches: WaterContactPatch[], minimu
for (const cluster of clusters) {
const alignment = Math.abs(cluster.axis.dot(patchAxis));
if (alignment < 0.92) {
if (alignment < mergeSettings.axisAlignment) {
continue;
}
const normalAlignment = Math.abs(cluster.normal.dot(rawPatch.normal));
if (normalAlignment < mergeSettings.normalAlignment) {
continue;
}
const patchExtents = measurePatchExtentsInBasis(patchPoints, cluster.axis);
const primaryGap = Math.max(0, Math.max(cluster.extents.minPrimary - patchExtents.maxPrimary, patchExtents.minPrimary - cluster.extents.maxPrimary));
const secondaryGap = Math.max(0, Math.max(cluster.extents.minSecondary - patchExtents.maxSecondary, patchExtents.minSecondary - cluster.extents.maxSecondary));
const allowedPrimaryGap = Math.max(0.18, Math.max(patch.halfWidth, (cluster.extents.maxPrimary - cluster.extents.minPrimary) * 0.12));
const allowedSecondaryGap = Math.max(minimumThickness * 1.5, Math.max(patch.halfDepth, (cluster.extents.maxSecondary - cluster.extents.minSecondary) * 0.35));
const clusterPrimarySpan = cluster.extents.maxPrimary - cluster.extents.minPrimary;
const clusterSecondarySpan = cluster.extents.maxSecondary - cluster.extents.minSecondary;
const allowedPrimaryGap = Math.max(
mergeSettings.minimumPrimaryGap,
Math.max(rawPatch.patch.halfWidth, clusterPrimarySpan) * mergeSettings.primaryGapScale
);
const allowedSecondaryGap = Math.max(
mergeSettings.minimumSecondaryGap,
Math.max(rawPatch.patch.halfDepth, clusterSecondarySpan) * mergeSettings.secondaryGapScale
);
if (primaryGap > allowedPrimaryGap || secondaryGap > allowedSecondaryGap) {
continue;
@@ -477,6 +532,7 @@ function mergeTriangleMeshContactPatches(rawPatches: WaterContactPatch[], minimu
if (!merged) {
clusters.push({
axis: patchAxis,
normal: rawPatch.normal.clone(),
points: patchPoints.map((point) => point.clone()),
extents: measurePatchExtentsInBasis(patchPoints, patchAxis)
});
@@ -511,7 +567,7 @@ function appendTriangleMeshContactPatches(
);
const bandMinimumThickness = Math.max(0.08, Math.min(0.22, surfaceBand * 0.45));
const triangleVertices = [new Vector3(), new Vector3(), new Vector3()];
const rawPatches: WaterContactPatch[] = [];
const rawPatches: TriangleMeshPatchSample[] = [];
for (let indexOffset = 0; indexOffset <= source.indices.length - 3; indexOffset += 3) {
const polygon: Vector3[] = [];
@@ -532,6 +588,11 @@ function appendTriangleMeshContactPatches(
polygon.push(vertex.clone());
}
const triangleNormal = computeTriangleNormal(polygon[0] ?? new Vector3(), polygon[1] ?? new Vector3(), polygon[2] ?? new Vector3());
if (triangleNormal === null) {
continue;
}
const clippedPolygon = clipPolygonToContactVolume(polygon, halfX, surfaceY - surfaceBand, surfaceY + surfaceBand, halfZ);
if (clippedPolygon.length < 2) {
@@ -545,11 +606,14 @@ function appendTriangleMeshContactPatches(
);
if (patch !== null) {
rawPatches.push(patch);
rawPatches.push({
patch,
normal: triangleNormal
});
}
}
patches.push(...mergeTriangleMeshContactPatches(rawPatches, bandMinimumThickness));
patches.push(...mergeTriangleMeshContactPatches(rawPatches, bandMinimumThickness, source.mergeProfile));
}
export function collectWaterContactPatches(volume: OrientedWaterVolume, contactBounds: WaterContactSource[]): WaterContactPatch[] {