@woosh/meep-engine 2.48.20 → 2.48.22

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.48.20",
+  "version": "2.48.22",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/{engine/graphics/micron/build/clustering → core/geom/3d/topology/util}/compute_face_connection_weight.js

@@ -1,35 +1,40 @@
-import { vec3 } from "gl-matrix";
-import { v3_distance_sqr } from "../../../../../core/geom/v3_distance_sqr.js";
-
-/**
- *
- * @param {TopoTriangle} f0
- * @param {TopoTriangle} f1
- * @returns {number}
- */
-export function compute_face_connection_weight(f0, f1) {
-    const vertices_0 = f0.vertices;
-    const vertices_1 = f1.vertices;
-
-    // compute center
-    const f0_center_x = (vertices_0[0].x + vertices_0[1].x + vertices_0[2].x) * 0.333;
-    const f0_center_y = (vertices_0[0].y + vertices_0[1].y + vertices_0[2].y) * 0.333;
-    const f0_center_z = (vertices_0[0].z + vertices_0[1].z + vertices_0[2].z) * 0.333;
-
-    const f1_center_x = (vertices_1[0].x + vertices_1[1].x + vertices_1[2].x) * 0.333;
-    const f1_center_y = (vertices_1[0].y + vertices_1[1].y + vertices_1[2].y) * 0.333;
-    const f1_center_z = (vertices_1[0].z + vertices_1[1].z + vertices_1[2].z) * 0.333;
-
-    const distance_sqr = v3_distance_sqr(
-        f0_center_x, f0_center_y, f0_center_z,
-        f1_center_x, f1_center_y, f1_center_z
-    );
-
-    // compute normal dot
-    const dot = vec3.dot(
-        f0.normal,
-        f1.normal
-    );
-
-    return 2 + (1 / distance_sqr) * 0.01 + dot * 0.1;
-}
+import { v3_distance_sqr } from "../../../v3_distance_sqr";
+import { v3_dot } from "../../../v3_dot.js";
+
+/**
+ *
+ * @param {TopoTriangle} f0
+ * @param {TopoTriangle} f1
+ * @returns {number}
+ */
+export function compute_face_connection_weight(f0, f1) {
+    const vertices_0 = f0.vertices;
+    const vertices_1 = f1.vertices;
+
+    // compute center
+    const f0_center_x = (vertices_0[0].x + vertices_0[1].x + vertices_0[2].x) * 0.333;
+    const f0_center_y = (vertices_0[0].y + vertices_0[1].y + vertices_0[2].y) * 0.333;
+    const f0_center_z = (vertices_0[0].z + vertices_0[1].z + vertices_0[2].z) * 0.333;
+
+    const f1_center_x = (vertices_1[0].x + vertices_1[1].x + vertices_1[2].x) * 0.333;
+    const f1_center_y = (vertices_1[0].y + vertices_1[1].y + vertices_1[2].y) * 0.333;
+    const f1_center_z = (vertices_1[0].z + vertices_1[1].z + vertices_1[2].z) * 0.333;
+
+    const distance_sqr = v3_distance_sqr(
+        f0_center_x, f0_center_y, f0_center_z,
+        f1_center_x, f1_center_y, f1_center_z
+    );
+
+    // compute normal dot
+    const n0 = f0.normal;
+    const n1 = f1.normal;
+
+    const dot = v3_dot(
+        n0[0], n0[1], n0[2],
+        n1[0], n1[1], n1[2],
+    );
+
+    const distance_weight = distance_sqr !== 0 ? 0.01 / distance_sqr : 10000;
+
+    return 2 + distance_weight + dot * 0.1;
+}

package/src/core/graph/build_face_graph_from_mesh.js

@@ -2,7 +2,7 @@ import { Graph } from "./v2/Graph.js";
 import { MultiNode } from "./MultiNode.js";
 import {
     compute_face_connection_weight
-} from "../../engine/graphics/micron/build/clustering/compute_face_connection_weight.js";
+} from "../geom/3d/topology/util/compute_face_connection_weight.js";
 import { WeightedEdge } from "./WeightedEdge.js";
 import { graph_compute_disconnected_clusters } from "./graph_compute_disconnected_clusters.js";
 

package/src/engine/graphics/ecs/mesh-v2/sample/load_gltf.js

@@ -6,7 +6,6 @@ import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
 import { three_object_to_entity_composition } from "../three_object_to_entity_composition.js";
 import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/TransformAttachmentSystem.js";
 import { Camera } from "../../camera/Camera.js";
-import { MicronRenderPlugin } from "../../../micron/plugin/MicronRenderPlugin.js";
 import { enableEditor } from "../../../../../../editor/enableEditor.js";
 import { MeshSystem } from "../../mesh/MeshSystem.js";
 
@@ -31,8 +30,6 @@ async function init(harness) {
     config.addLoader(GameAssetType.ModelGLTF_JSON, gltfAssetLoader);
     config.addLoader(GameAssetType.ModelGLTF, gltfAssetLoader);
 
-    config.addPlugin(MicronRenderPlugin);
-
     await config.apply(engine);
 
     enableEditor(engine);

package/src/engine/graphics/micron/MICRON_GEOMETRY_FIELD.js

@@ -1 +0,0 @@
-export const MICRON_GEOMETRY_FIELD = '@micron_geometry';

package/src/engine/graphics/micron/MICRON_URI_FIELD.js

@@ -1 +0,0 @@
-export const MICRON_URI_FIELD = '@micron_path';

package/src/engine/graphics/micron/build/MICRON_PATCH_SIZE_MAX.js

@@ -1,5 +0,0 @@
-/**
- * Maximum number of triangles per patch
- * @type {number}
- */
-export const MICRON_PATCH_SIZE_MAX = 128;

package/src/engine/graphics/micron/build/PatchRepresentation.js

@@ -1,424 +0,0 @@
-import { TopoMesh } from "../../../../core/geom/3d/topology/struct/TopoMesh.js";
-import { MicronGeometryPatch } from "../format/MicronGeometryPatch.js";
-import { fill_patch_geometry_data } from "./fill_patch_geometry_data.js";
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
-import { assert } from "../../../../core/assert.js";
-import {
-    computeTriangleClusterNormalBoundingCone
-} from "../../../../core/geom/3d/topology/bounds/computeTriangleClusterNormalBoundingCone.js";
-import { noop } from "../../../../core/function/Functions.js";
-import { ConicRay } from "../../../../core/geom/ConicRay.js";
-import { vec4 } from "gl-matrix";
-import { computeTopoMeshBoundiningBox } from "../../../../core/geom/3d/topology/bounds/computeTopoMeshBoundiningBox.js";
-import {
-    computeTopoMeshBoundingSphere
-} from "../../../../core/geom/3d/topology/bounds/computeTopoMeshBoundingSphere.js";
-import { meshopt_optimizeVertexCache } from "../../geometry/optimization/VertexCacheOptimizer.js";
-import { array_copy } from "../../../../core/collection/array/copyArray.js";
-
-/**
- *
- * @type {PatchRepresentation[]}
- */
-const parent_stack = [];
-
-export class PatchRepresentation {
-    constructor() {
-        /**
-         *
-         * @type {number}
-         */
-        this.id = 0;
-
-        this.bounding_box = new AABB3(
-            Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY,
-            Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY
-        );
-
-        /**
-         *
-         * @type {AABB3}
-         */
-        this.group_aabb = new AABB3(0, 0, 0, 0, 0, 0);
-
-        /**
-         *
-         * @type {vec4|Float32Array}
-         */
-        this.group_bounding_sphere = new Float32Array(4);
-
-        /**
-         *
-         * @type {number}
-         */
-        this.group_error = 0;
-
-        /**
-         *
-         * @type {vec4}
-         */
-        this.bounding_sphere = vec4.create()
-
-        /**
-         * Bounding cone of face normals
-         * @type {ConicRay}
-         */
-        this.normal_cone = new ConicRay();
-
-        /**
-         *
-         * @type {TopoMesh|null}
-         */
-        this.topology_snapshot = null;
-
-        /**
-         * @deprecated
-         * Vertices that are shared with neighbours
-         * @type {Set<number>}
-         */
-        this.vertices_shared = new Set();
-
-        /**
-         *
-         * @type {Set<number>}
-         */
-        this.vertices_included = new Set();
-
-        /**
-         * Runtime dependency patches, if this patch is refined at runtime - dependencies must be refined as well
-         * These dependencies allow for more aggressive simplification of topology
-         * @type {PatchRepresentation[]}
-         */
-        this.dependencies = [];
-
-        /**
-         * Patches that share 1 or more edges with this one
-         * This includes patches at all LOD levels
-         * @type {PatchRepresentation[]}
-         */
-        this.neighbours = [];
-
-        /**
-         *
-         * @type {PatchRepresentation[]}
-         */
-        this.children = [];
-
-        /**
-         *
-         * @type {PatchRepresentation[]}
-         */
-        this.parents = [];
-
-        this.lod = 0;
-    }
-
-
-    /**
-     * @deprecated
-     */
-    set topology_mask(v) {
-        throw new Error('E');
-    }
-
-
-    /**
-     * @deprecated
-     */
-    get topology_mask() {
-        throw new Error('E');
-    }
-
-    /**
-     * @deprecated
-     */
-    get parent() {
-        throw new Error('Single parent is no longer supported, use .parents instead');
-    }
-
-    /**
-     * @deprecated
-     */
-    set parent(v) {
-        throw new Error('Single parent is no longer supported, use .parents instead');
-    }
-
-    snapshotTopology() {
-        const mesh = new TopoMesh();
-
-        mesh.add(this.topology_mask);
-
-        this.topology_snapshot = mesh;
-    }
-
-    /**
-     *
-     * @param {function(string)} error_consumer
-     * @param {*} thisArg
-     * @returns {boolean}
-     */
-    validate(error_consumer = noop, thisArg) {
-        let result = true;
-        // check neighbours
-        const neighbours = this.neighbours;
-        const neighbour_count = neighbours.length;
-
-        for (let i = 0; i < neighbour_count; i++) {
-            const neighbour = neighbours[i];
-
-            if (!neighbour.hasNeighbour(this)) {
-                result = false;
-                error_consumer.call(thisArg, `Neighbour[${i}] missing back link`);
-            }
-        }
-
-        // check that parent contains all of the children's neighbours except for descendants
-        const children = this.children;
-        const child_count = children.length;
-        for (let i = 0; i < child_count; i++) {
-            const child = children[i];
-
-            const child_neighbours = child.neighbours;
-            const child_neighbour_count = child_neighbours.length;
-
-            for (let j = 0; j < child_neighbour_count; j++) {
-                const child_neighbour = child_neighbours[j];
-
-                if (child_neighbour.isDescendantOf(this)) {
-                    // skip descendants
-                    continue;
-                }
-
-                if (!this.hasNeighbour(child_neighbour)) {
-                    result = false;
-                    error_consumer.call(thisArg, `Missing inherited neighbour[${j}] of child[${i}]`);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    computeBounds() {
-        computeTopoMeshBoundiningBox(this.bounding_box, this.topology_snapshot);
-        computeTopoMeshBoundingSphere(this.bounding_sphere, this.topology_snapshot);
-    }
-
-    /**
-     * @returns {number}
-     */
-    computePerimeterLength() {
-        let result = 0;
-        const edges = this.topology_snapshot.getEdges();
-        for (const edge of edges) {
-            if (edge.isTopologyBorder()) {
-                result += edge.length;
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     *
-     * @param {function(PatchRepresentation):boolean} filter
-     * @returns {PatchRepresentation[]}
-     */
-    collectNodes(filter) {
-        const result = [];
-        this.traverse(p => {
-            if (filter(p)) {
-                result.push(p);
-            }
-        });
-
-        return result;
-    }
-
-    /**
-     *
-     * @param {function(path:PatchRepresentation):boolean?} callback
-     * @param {*} [thisArg]
-     */
-    traverse(callback, thisArg) {
-        const stack = [this];
-        let stack_cursor = 1;
-        const seen_nodes = new Set();
-        seen_nodes.add(this);
-
-
-        while (stack_cursor > 0) {
-            stack_cursor--;
-
-            const patch = stack[stack_cursor];
-
-
-            const traverse_deeper = callback.call(thisArg, patch);
-
-            if (traverse_deeper === false) {
-                continue;
-            }
-
-            const children = patch.children;
-            const child_count = children.length;
-
-            for (let i = 0; i < child_count; i++) {
-                const child = children[i];
-
-                if (seen_nodes.has(child)) {
-                    continue;
-                }
-
-                seen_nodes.add(child);
-
-                stack[stack_cursor++] = child;
-            }
-        }
-    }
-
-    /**
-     *
-     * @returns {number}
-     */
-    countDescendants() {
-        let result = 0;
-
-        const children = this.children;
-        const child_count = children.length;
-        for (let i = 0; i < child_count; i++) {
-            result++;
-
-            const child = children[i];
-
-            result += child.countDescendants();
-        }
-
-        return result;
-    }
-
-    /**
-     *
-     * @param {PatchRepresentation} p
-     * @returns {boolean}
-     */
-    isDescendantOf(p) {
-
-        let cursor = 1;
-        parent_stack[0] = this;
-
-        do {
-            cursor--;
-
-            const x = parent_stack[cursor];
-
-            if (x === p) {
-                return true;
-            }
-
-            const parents = x.parents;
-            const parent_count = parents.length;
-            for (let i = 0; i < parent_count; i++) {
-                parent_stack[cursor++] = parents[i];
-            }
-
-        } while (cursor > 0);
-
-        return false;
-    }
-
-    /**
-     *
-     * @param {PatchRepresentation} p
-     * @returns {boolean}
-     */
-    hasDescendant(p) {
-        const children = this.children;
-        const child_count = children.length;
-        for (let i = 0; i < child_count; i++) {
-            const child = children[i];
-
-            if (child === p) {
-                return true;
-            }
-
-            if (child.hasDescendant(p)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     *
-     * @param {PatchRepresentation} p
-     * @returns {boolean}
-     */
-    hasChild(p) {
-        return this.children.indexOf(p) !== -1;
-    }
-
-    /**
-     *
-     * @param {PatchRepresentation} p
-     * @returns {boolean}
-     */
-    hasNeighbour(p) {
-        return this.neighbours.indexOf(p) !== -1;
-    }
-
-    /**
-     *
-     * @param {PatchRepresentation} p
-     */
-    addNeighbour(p) {
-        assert.notEqual(this, p, 'cannot add self as a neighbour');
-        assert.arrayHasNo(this.neighbours, p, 'already contained');
-
-        this.neighbours.push(p);
-    }
-
-    computeNormalBoundingCone() {
-        computeTriangleClusterNormalBoundingCone(this.normal_cone, this.topology_snapshot.getFaces());
-    }
-
-    /**
-     *
-     * @param {MicronGeometryPatch} result
-     * @param {THREE.BufferGeometry} source_geometry
-     * @param {VertexDataSpec} vertex_data_spec
-     */
-    buildMicronGeometryPatch(result, source_geometry, vertex_data_spec) {
-
-        assert.defined(source_geometry, 'source_geometry');
-        assert.equal(source_geometry.isBufferGeometry, true, 'source_geometry.isBufferGeometry !== true');
-        assert.defined(vertex_data_spec, 'vertex_data_spec');
-
-        result.id = this.id;
-        result.lod = this.lod;
-
-        const topology = this.topology_snapshot;
-
-        result.polygon_count = topology.getFaces().size;
-
-        // copy bounding_box
-        this.bounding_box.writeToArray(result.bounding_box, 0);
-
-        this.group_aabb.writeToArray(result.group_bounding_box, 0);
-
-        this.group_aabb.getCorners(result.group_bounding_box_corners);
-
-        array_copy(this.group_bounding_sphere, 0, result.group_bounding_sphere, 0, 4);
-
-        result.group_error = this.group_error;
-
-        array_copy(this.bounding_sphere, 0, result.bounding_sphere, 0, 4);
-
-        result.normal_cone.copy(this.normal_cone);
-
-        fill_patch_geometry_data(result, source_geometry, this.topology_snapshot, vertex_data_spec);
-
-        // optimize index buffer for better caching
-        meshopt_optimizeVertexCache(result.face_indices, result.face_indices, result.face_indices.length, result.vertex_count);
-    }
-}