Skip to content

3D engine that AI agents drive

Guard EditMesh against double removal, duplicate faces and fractional indices (#2516)

Nguyen Xuan An53b513782ded
diff --git a/changes/2516.md b/changes/2516.md
new file mode 100644
index 00000000..bc8a6a5d
--- /dev/null
+++ b/changes/2516.md
@@ -0,0 +1 @@
+- Mesh editing refuses to remove an element twice, to create a face over the vertices of an existing face and to take a fractional vertex index, instead of corrupting the element lists (#2516, #2517, #2518)
diff --git a/changes/2516.size.md b/changes/2516.size.md
new file mode 100644
index 00000000..b6148dbc
--- /dev/null
+++ b/changes/2516.size.md
@@ -0,0 +1 @@
+- scene:agent-scene+lazy: +160 bytes gzip for three guards that stop element-list corruption (a double remove hands one index to two elements) and duplicate faces; no hot path changes.
diff --git a/src/mesh-edit.js b/src/mesh-edit.js
index 9a9f5c88..682abcc5 100644
--- a/src/mesh-edit.js
+++ b/src/mesh-edit.js
@@ -74,7 +74,11 @@ class ElementStore {
}
isLive(index) {
- return index >= 0 && index < this.count && !this.removed[index];
+ return Number.isInteger(index) && index >= 0 && index < this.count && !this.removed[index];
+ }
+
+ requireLive(index, label) {
+ if (!this.isLive(index)) throw new RangeError(`${label} ${index} does not exist or was already removed.`);
}
}
@@ -299,6 +303,7 @@ export class EditMesh {
}
removeEdge(edge) {
+ this.edges.requireLive(edge, 'Edge');
while (this.edges.arrays.loop[edge] !== -1) {
this.removeFace(this.loops.arrays.face[this.edges.arrays.loop[edge]]);
}
@@ -354,6 +359,7 @@ export class EditMesh {
for (const vertex of vertices) {
if (!this.vertices.isLive(vertex)) throw new RangeError(`Vertex ${vertex} does not exist.`);
}
+ if (this.faceExists(vertices)) throw new RangeError('A face over these vertices already exists.');
const edges = new Array(size);
for (let corner = 0; corner < size; corner++) {
edges[corner] = this.ensureEdge(vertices[corner], vertices[(corner + 1) % size]);
@@ -383,8 +389,20 @@ export class EditMesh {
return face;
}
+ /** Whether a face already uses exactly these vertices in any order, as BM_face_exists does. */
+ faceExists(vertices) {
+ const firstEdge = this.findEdge(vertices[0], vertices[1]);
+ if (firstEdge === -1) return false;
+ const wanted = new Set(vertices);
+ return this.edgeLoops(firstEdge).some(loop => {
+ const face = this.loops.arrays.face[loop];
+ return this.faces.arrays.size[face] === vertices.length && this.faceVertices(face).every(vertex => wanted.has(vertex));
+ });
+ }
+
/** Remove a face and its loops. Edges and vertices stay, as BM_face_kill. */
removeFace(face) {
+ this.faces.requireLive(face, 'Face');
const loopArrays = this.loops.arrays;
const first = this.faces.arrays.loop[face];
let loop = first;
@@ -400,6 +418,7 @@ export class EditMesh {
/** Remove a vertex together with every edge and face using it. */
removeVertex(vertex) {
+ this.vertices.requireLive(vertex, 'Vertex');
while (this.vertices.arrays.edgeSlot[vertex] !== -1) {
this.removeEdge(this.vertices.arrays.edgeSlot[vertex] >> 1);
}
diff --git a/tests/mesh-edit-element-guards.test.js b/tests/mesh-edit-element-guards.test.js
new file mode 100644
index 00000000..9fa29f4c
--- /dev/null
+++ b/tests/mesh-edit-element-guards.test.js
@@ -0,0 +1,41 @@
+import './support/load-agent-scene-modules.mjs';
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { box } from '../src/geometry.js';
+import { meshFromGeometry } from '../src/mesh.js';
+import { editMesh } from '../src/mesh-edit.js';
+
+function boxEdit() {
+ return editMesh(meshFromGeometry(box(0, 1)));
+}
+
+test('removing a removed face, edge or vertex throws and keeps the free lists clean (#2516)', () => {
+ const edit = boxEdit();
+ edit.removeFace(0);
+ const faceCount = edit.faceCount;
+ const freeFaces = edit.faces.free.length;
+ assert.throws(() => edit.removeFace(0), /Face 0 does not exist or was already removed/);
+ assert.equal(edit.faceCount, faceCount);
+ assert.equal(edit.faces.free.length, freeFaces);
+ edit.removeVertex(0);
+ assert.throws(() => edit.removeVertex(0), /Vertex 0 does not exist/);
+ assert.throws(() => edit.removeEdge(edit.edges.free[0]), /Edge \d+ does not exist/);
+ const first = edit.createVertex(0, 0, 0);
+ const second = edit.createVertex(1, 1, 1);
+ assert.notEqual(first, second);
+});
+
+test('createFace rejects a face over the vertices of an existing face (#2517)', () => {
+ const edit = boxEdit();
+ const vertices = edit.faceVertices(0);
+ const faceCount = edit.faceCount;
+ assert.throws(() => edit.createFace(vertices), /already exists/);
+ assert.throws(() => edit.createFace([...vertices].reverse()), /already exists/);
+ assert.equal(edit.faceCount, faceCount);
+ assert.equal(edit.edgeFaceCount(edit.findEdge(vertices[0], vertices[1])), 2);
+});
+
+test('createFace refuses a fractional vertex index (#2518)', () => {
+ const edit = boxEdit();
+ assert.throws(() => edit.createFace([0, 1, 2.5]), /Vertex 2.5 does not exist/);
+});