@woosh/meep-engine 2.33.2 → 2.33.6

package/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -8,6 +8,7 @@ import {
 import ThreeFactory from "../../three/ThreeFactory.js";
 import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
 import { composeCompile } from "../../material/composeCompile.js";
+import { typed_array_copy } from "../../../../core/collection/array/typed/typed_array_copy.js";
 
 /**
  *
@@ -29,14 +30,14 @@ function InstancedMeshGroup() {
      * Minimum spare capacity increase during growing
      * @type {number}
      */
-    this.growConstant = 1;
+    this.growConstant = 4;
 
-    this.shrinkFactor = 0.8;
+    this.shrinkFactor = 0.5;
     /**
      * Minimum capacity reduction for shrinkage to occur
      * @type {number}
      */
-    this.shrinkConstant = 32;
+    this.shrinkConstant = 64;
 
     /**
      *
@@ -217,14 +218,30 @@ InstancedMeshGroup.prototype.setCapacity = function (size) {
  * @param {number} size
  */
 InstancedMeshGroup.prototype.ensureCapacity = function (size) {
+
     const currentCapacity = this.capacity;
+
     if (currentCapacity < size) {
-        const newCapacityRaw = Math.max(size, currentCapacity * this.growFactor, currentCapacity + this.growConstant);
+        // grow
+
+        const newCapacityRaw = Math.max(
+            size,
+            currentCapacity * this.growFactor,
+            currentCapacity + this.growConstant
+        );
+
         const newCapacityInteger = Math.ceil(newCapacityRaw);
+
         this.setCapacity(newCapacityInteger);
-    } else if (currentCapacity * this.shrinkFactor > size && currentCapacity - this.shrinkConstant > size) {
+
+    } else if (
+        currentCapacity * this.shrinkFactor > size
+        && currentCapacity - this.shrinkConstant > size
+    ) {
+        // shrink
         this.setCapacity(size);
     }
+
 };
 
 /**
@@ -375,14 +392,6 @@ InstancedMeshGroup.prototype.remove = function (reference) {
     this.setCount(this.count - 1);
 };
 
-/**
- * @param {Uint8Array|Uint16Array|Uint32Array|Int8Array|Int16Array|Int32Array|Float32Array|Float64Array} source
- * @param {Uint8Array|Uint16Array|Uint32Array|Int8Array|Int16Array|Int32Array|Float32Array|Float64Array}target
- */
-function copyArray(source, target) {
-    target.set(source.subarray(0, Math.min(target.length, source.length)), 0)
-}
-
 InstancedMeshGroup.prototype.build = function () {
     if (this.__threeGeometry !== null) {
         // dispose old geometry's GPU memory
@@ -415,16 +424,16 @@ InstancedMeshGroup.prototype.build = function () {
     if (this.__attributePosition !== null) {
         //copy old data
         const oldPositionArray = this.__attributePosition.array;
-        copyArray(oldPositionArray, newPositionArray);
+        typed_array_copy(oldPositionArray, newPositionArray);
     }
     if (this.__attributeRotation !== null) {
         //copy old data
         const oldRotationArray = this.__attributeRotation.array;
-        copyArray(oldRotationArray, newRotationArray);
+        typed_array_copy(oldRotationArray, newRotationArray);
     }
     if (this.__attributeScale !== null) {
         const oldScaleArray = this.__attributeScale.array;
-        copyArray(oldScaleArray, newScaleArray);
+        typed_array_copy(oldScaleArray, newScaleArray);
 
         if (newScaleArray.length > oldScaleArray.length) {
             //fill the rest of the array with scale factor of 1 as a default

package/engine/graphics/material/SplatMaterial.js

@@ -4,7 +4,7 @@
 import {
     ClampToEdgeWrapping,
     Color,
-    DoubleSide,
+    FrontSide,
     GLSL3,
     LinearFilter,
     NormalBlending,
@@ -15,95 +15,10 @@ import {
     Vector4 as ThreeVector4
 } from 'three';
 import TerrainShader from "../shaders/TerrainShader.js";
-import Vector4 from "../../../core/geom/Vector4.js";
 import { Sampler2D } from "../texture/sampler/Sampler2D.js";
 import sampler2D2Texture from "../texture/sampler/Sampler2D2Texture.js";
 
-/**
- *
- * @param {Vector4} tex0
- * @param {Vector4} tex1
- * @param {Vector4} tex2
- * @param {Vector4} tex3
- * @param {Vector4} splat
- * @param {Vector4} result
- */
-export function blendSplatTextures(tex0, tex1, tex2, tex3, splat, result) {
-    const b0 = splat.x;
-    const b1 = splat.y;
-    const b2 = splat.z;
-    const b3 = splat.w;
-
-    const bT = b0 + b1 + b2 + b3;
-
-
-    result.set(
-        (tex0.x * b0 + tex1.x * b1 + tex2.x * b2 + tex3.x * b3) / bT,
-        (tex0.y * b0 + tex1.y * b1 + tex2.y * b2 + tex3.y * b3) / bT,
-        (tex0.z * b0 + tex1.z * b1 + tex2.z * b2 + tex3.z * b3) / bT,
-        (tex0.w * b0 + tex1.w * b1 + tex2.w * b2 + tex3.w * b3) / bT
-    );
-}
-
-/**
- *
- * @param {Sampler2D[]} diffuse
- * @param {Vector2} diffuseRepeat
- * @param {Sampler2D} splat
- * @param {Vector2} gridSize
- * @param {Vector2} resultTextureSize
- * @returns {Sampler2D}
- */
-export function buildTerrainTexture({ diffuse, diffuseRepeat, splat, gridSize, resultTextureSize }) {
-    const texture0 = diffuse[0];
-    const texture1 = diffuse[1];
-    const texture2 = diffuse[2];
-    const texture3 = diffuse[3];
-
-    const resultData = new Uint8Array(resultTextureSize.x * resultTextureSize.y * 4);
-
-    const result = new Sampler2D(resultData, 4, resultTextureSize.x, resultTextureSize.y);
-
-    //do the splatting
-    let x, y, u, v;
-
-    const tex0 = new Vector4(0, 0, 0, 0);
-    const tex1 = new Vector4(0, 0, 0, 0);
-    const tex2 = new Vector4(0, 0, 0, 0);
-    const tex3 = new Vector4(0, 0, 0, 0);
-
-    const vSplat = new Vector4(0, 0, 0, 0);
-
-    const vTemp = new Vector4(0, 0, 0, 0);
-
-    for (x = 0; x < resultTextureSize.x; x++) {
-
-        u = x / (resultTextureSize.x - 1);
-
-        for (y = 0; y < resultTextureSize.y; y++) {
-
-            v = y / (resultTextureSize.y - 1);
-
-            const dU = (u * diffuseRepeat.x) % 1;
-            const dV = (v * diffuseRepeat.y) % 1;
-
-            texture0.sample(dU, dV, tex0);
-            texture1.sample(dU, dV, tex1);
-            texture2.sample(dU, dV, tex2);
-            texture3.sample(dU, dV, tex3);
-
-            splat.sample(u, v, vSplat);
-
-            blendSplatTextures(tex0, tex1, tex2, tex3, vSplat, vTemp);
-
-            result.set(x, y, [vTemp.x, vTemp.y, vTemp.z, 255]);
-        }
-    }
-
-    return result;
-}
-
-function whitePixelTexture() {
+export function whitePixelTexture() {
     const sampler = Sampler2D.uint8(4, 1, 1);
 
     for (let i = 0; i < sampler.data.length; i++) {
@@ -205,17 +120,12 @@ export function SplatMaterial(
         uniforms.gridResolution.value.set(gridResolution.x, gridResolution.y);
     }
 
-
-    //this is for the water shader, so that back of the terrain reflects in the water, otherwise edges of shoreline look odd
-    //TODO check how this can be removed, it would speed water(and ordinary) rendering if back faces could be culled
-    const side = DoubleSide;
-
     const sm = new ShaderMaterial({
 
         uniforms: uniforms,
         vertexShader: TerrainShader.vertexShader,
         fragmentShader: TerrainShader.fragmentShader,
-        side: side,
+        side: FrontSide,
         blending: NormalBlending,
         depthTest: true,
         depthWrite: true,
@@ -249,11 +159,8 @@ export function SplatMaterial(
         sm.aoMap = true;
         uniforms.aoMap.value = lightMap;
         uniforms.aoMapIntensity.value = 0.7;
-        //
-        // sm.lightMap = true;
-        // uniforms.lightMap.value = options.lightMap;
-        // uniforms.lightMapIntensity.value = 1;
     }
+
     sm.extensions.derivatives = true; //needed for rendering grid
     sm.needsUpdate = true;