@woosh/meep-engine 2.39.12 → 2.39.15

package/core/geom/3d/topology/bounds/computeTopoMeshBoundingSphere.js

@@ -28,9 +28,10 @@ export function computeTopoMeshBoundingSphere(result, mesh) {
     const miniball = new Miniball(pointSet);
 
     const center = miniball.center();
+    const radius = miniball.radius();
 
     result[0] = center[0];
     result[1] = center[1];
     result[2] = center[2];
-    result[3] = miniball.radius();
+    result[3] = radius;
 }

package/engine/ecs/terrain/ecs/Terrain.js

@@ -928,38 +928,49 @@ class Terrain {
      * @param opt
      * @param {Engine} engine
      */
-    fromJSON(opt, engine) {
+    fromJSON({
+                 resolution = 4,
+                 preview,
+                 size = 1,
+                 scale = 1,
+                 material,
+                 heights,
+                 layers,
+                 splat,
+                 overlayTileImage
+             } = {}, engine) {
         // mark as needing rebuilding
         this.clearFlag(TerrainFlags.Built);
 
-        if (opt === undefined) {
-            opt = {};
+        if (preview !== undefined) {
+            this.preview.fromJSON(preview);
         }
 
-        if (opt.preview !== undefined) {
-            this.preview.fromJSON(opt.preview);
-        }
-
-        this.resolution = opt.resolution !== undefined ? opt.resolution : 4;
-
-        const size = this.size;
+        this.resolution = resolution;
 
-        if (opt.size !== undefined) {
-            size.fromJSON(opt.size);
-        }
+        this.size.fromJSON(size);
 
-        this.gridScale = opt.scale !== undefined ? opt.scale : 2;
+        this.gridScale = scale;
         //
 
-        this.materialDesc = opt.material;
+        this.materialDesc = material;
+
+        if (heights !== undefined) {
+            this.samplerHeight.fromJSON(heights);
+        } else {
+            this.samplerHeight.data = new Float32Array(1);
+            this.samplerHeight.width = 1;
+            this.samplerHeight.height = 1;
+            this.samplerHeight.itemSize = 1;
+            this.samplerHeight.version++;
+        }
 
-        this.samplerHeight.fromJSON(opt.heights);
-        this.layers.fromJSON(opt.layers);
-        this.splat.fromJSON(opt.splat);
+        this.layers.fromJSON(layers);
+        this.splat.fromJSON(splat);
 
-        if (opt.overlayTileImage !== undefined) {
+        if (overlayTileImage !== undefined) {
 
-            this.overlay.baseTileImage(opt.overlayTileImage);
+            this.overlay.baseTileImage(overlayTileImage);
 
         }
 

package/engine/ecs/terrain/ecs/layers/TerrainLayers.js

@@ -111,6 +111,8 @@ const scaled_texture_cache = new Cache({
     }
 });
 
+const DEFAULT_RESOLUTION = 512;
+
 export class TerrainLayers {
     constructor() {
 
@@ -124,7 +126,7 @@ export class TerrainLayers {
          *
          * @type {Vector2}
          */
-        this.resolution = new Vector2(512, 512);
+        this.resolution = new Vector2(DEFAULT_RESOLUTION, DEFAULT_RESOLUTION);
 
         /**
          *
@@ -166,7 +168,7 @@ export class TerrainLayers {
         };
     }
 
-    fromJSON({ resolution, layers }) {
+    fromJSON({ resolution = DEFAULT_RESOLUTION, layers = [] } = {}) {
         this.resolution.fromJSON(resolution);
         this.layers.fromJSON(layers, TerrainLayer);
     }

package/engine/ecs/terrain/ecs/splat/SplatMapping.js

@@ -59,7 +59,11 @@ export class SplatMapping {
         };
     }
 
-    fromJSON({ size, depth, data }) {
+    fromJSON({
+                 size = { x: 1, y: 1 },
+                 depth = 0,
+                 data = []
+    } = {}) {
         this.resize(size.x, size.y, depth);
         array_copy(data, 0, this.weightData, 0, data.length);
 

package/engine/ecs/terrain/overlay/TerrainOverlay.js

@@ -16,6 +16,7 @@ import { uint82float } from "../../../../core/binary/uint82float.js";
 import { float2uint8 } from "../../../../core/binary/float2uint8.js";
 import { isTypedArray } from "../../../../core/collection/array/typed/isTypedArray.js";
 import { array_copy } from "../../../../core/collection/array/copyArray.js";
+import { WHITE_PIXEL_DATA_URL } from "../../../graphics/WHITE_PIXEL_DATA_URL.js";
 
 class Context {
     /**
@@ -48,7 +49,6 @@ class Context {
 
 const COLOR_UINT_8_TRANSPARENT = [0, 0, 0, 0];
 
-
 export class TerrainOverlay {
     /**
      *
@@ -69,11 +69,11 @@ export class TerrainOverlay {
          */
         this.size = new Vector2(size.x, size.y);
 
-        /**
+       /**
          *
          * @type {ObservedString}
          */
-        this.tileImage = new ObservedString("");
+        this.tileImage = new ObservedString(WHITE_PIXEL_DATA_URL);
 
         /**
          *

package/engine/graphics/WHITE_PIXEL_DATA_URL.js

@@ -0,0 +1 @@
+export const WHITE_PIXEL_DATA_URL = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAA1JREFUGFdj+P///38ACfsD/QVDRcoAAAAASUVORK5CYII=";

package/engine/graphics/micron/build/hierarchy/build_merge_graph.js

@@ -74,6 +74,7 @@ export function build_merge_graph(leaves) {
             const connection_weight = computePatchMergeScore(leaf, neighbour);
 
             assert.isNumber(connection_weight, 'connection_weight');
+            assert.notNaN(connection_weight, 'connection_weight');
             assert.isFiniteNumber(connection_weight, 'connection_weight');
 
             const edge = new WeightedEdge(node_leaf, node_neighbour);

package/engine/graphics/micron/build/hierarchy/computePatchMergeScore.js

@@ -1,9 +1,12 @@
 import { ConicRay } from "../../../../../core/geom/ConicRay.js";
 import { compute_bounding_cone_of_2_cones } from "../../../../../core/geom/3d/cone/compute_bounding_cone_of_2_cones.js";
 import { compute_patches_shared_vertex_count } from "./compute_patches_shared_vertex_count.js";
-import { compute_bounding_sphere_of_2_spheres } from "../../../../../core/geom/3d/compute_bounding_sphere_of_2_spheres.js";
+import {
+    compute_bounding_sphere_of_2_spheres
+} from "../../../../../core/geom/3d/compute_bounding_sphere_of_2_spheres.js";
 import { max2 } from "../../../../../core/math/max2.js";
 import { min2 } from "../../../../../core/math/min2.js";
+import { assert } from "../../../../../core/assert.js";
 
 
 /**
@@ -74,6 +77,12 @@ function compute_sphere_volume(r) {
  * @return {number}
  */
 function normalized_difference(a, b) {
+    assert.isNumber(a, 'a');
+    assert.isNumber(b, 'a');
+
+    assert.notNaN(a,'a');
+    assert.notNaN(b,'b');
+
     return Math.abs(a - b) / (max2(a, b) + 0.0001);
 }
 
@@ -85,10 +94,13 @@ function normalized_difference(a, b) {
  */
 export function computePatchMergeScore(a, b) {
     // compute common neighbours
-    const common_neighbours = array_compute_common_element_count(a.neighbours, b.neighbours);
+    const a_neighbours = a.neighbours;
+    const b_neighbours = b.neighbours;
+
+    const common_neighbours = array_compute_common_element_count(a_neighbours, b_neighbours);
 
     // normalize neighbour count
-    const common_neighbour_score = common_neighbours / (min2(a.neighbours.length, b.neighbours.length) + 0.01);
+    const common_neighbour_score = common_neighbours / (min2(a_neighbours.length, b_neighbours.length) + 0.01);
 
     // prefer merging patches of similar LOD level, this creates a more flat hierarchy
     const lod_score = 1 - normalized_difference(a.lod, b.lod);
@@ -123,10 +135,12 @@ export function computePatchMergeScore(a, b) {
      */
     const shared_vertex_count = compute_patches_shared_vertex_count(a, b);
 
-    return similar_volume_score * 0.01
+    const result = similar_volume_score * 0.01
         + shared_vertex_count
         + normal_score * 0.001
         + common_neighbour_score
         + lod_score * 0.1
         + volume_score;
+
+    return result;
 }

package/engine/graphics/micron/plugin/GLTFAssetTransformer.js

@@ -91,6 +91,14 @@ export class GLTFAssetTransformer extends AssetTransformer {
          * @private
          */
         this.__active_mesh_micron_cache = [];
+
+        /**
+         * @deprecated
+         * Whether override mesh will be created for the asset, this is generally outdated
+         * @type {boolean}
+         * @private
+         */
+        this.__settings_build_override_mesh = false;
     }
 
     /**
@@ -198,7 +206,7 @@ export class GLTFAssetTransformer extends AssetTransformer {
          */
         const root = source.create();
 
-        await this.__load_mesh_micron_data(source.gltf,asset_description);
+        await this.__load_mesh_micron_data(source.gltf, asset_description);
 
         // attempt to load existing micron geometries
         await async_traverse_three_object(root, this.__visitObjectToLoadMicron, this, {
@@ -212,12 +220,14 @@ export class GLTFAssetTransformer extends AssetTransformer {
             return source;
         }
 
-        const micron_root = await convert_three_object_to_micron(root.clone(), this.__cache);
-        micron_root.boundingSphere = root.boundingSphere;
+        if (this.__settings_build_override_mesh) {
+            const micron_root = await convert_three_object_to_micron(root.clone(), this.__cache);
+            micron_root.boundingSphere = root.boundingSphere;
 
-        source.override_mesh = micron_root;
+            source.override_mesh = micron_root;
 
-        traverseThreeObject(micron_root, ensureProxy);
+            traverseThreeObject(micron_root, ensureProxy);
+        }
 
         return source;
     }

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.39.12",
+  "version": "2.39.15",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",