@woosh/meep-engine 2.33.32 → 2.33.36

package/core/geom/Vector2.d.ts

@@ -20,6 +20,14 @@ export default class Vector2 {
 
     _sub(x: number, y: number): void
 
+    abs(): void
+
+    round(): void
+
+    floor(): void
+
+    ceil(): void
+
     copy(other: Vector2): void
 
     distanceTo(other: Vector2): number

package/core/geom/Vector3.d.ts

@@ -31,6 +31,14 @@ export default class Vector3 implements Vector3Like {
 
     _sub(x: number, y: number, z: number): void
 
+    abs(): void
+
+    round(): void
+
+    floor(): void
+
+    ceil(): void
+
     _multiply(x: number, y: number, z: number): void
 
     multiply(other: Vector3Like): void

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

@@ -381,7 +381,7 @@ export class PatchRepresentation {
      *
      * @param {MicronGeometryPatch} result
      * @param {THREE.BufferGeometry} source_geometry
-     * @param {MicronVertexDataSpec} vertex_data_spec
+     * @param {VertexDataSpec} vertex_data_spec
      */
     buildMicronGeometryPatch(result, source_geometry, vertex_data_spec) {
 

package/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -214,7 +214,7 @@ export async function buildMicronGeometryFromBufferGeometry(input) {
  *
  * @param {PatchRepresentation} node
  * @param {THREE.BufferGeometry} geometry
- * @param {MicronVertexDataSpec} vertex_spec
+ * @param {VertexDataSpec} vertex_spec
  * @returns {MicronGeometryPatch}
  */
 function compilePatchGraph(node, geometry, vertex_spec) {

package/engine/graphics/micron/build/fill_patch_geometry_data.js

@@ -134,7 +134,7 @@ function compute_attribute_data_converter(source, spec) {
  * @param {MicronGeometryPatch} result
  * @param {THREE.BufferGeometry} buffer_geometry
  * @param {TopoMesh} topo
- * @param {MicronVertexDataSpec} vertex_data_spec
+ * @param {VertexDataSpec} vertex_data_spec
  */
 export function fill_patch_geometry_data(result, buffer_geometry, topo, vertex_data_spec) {
     /**

package/engine/graphics/micron/format/serialization/deserialize_patch.js

@@ -6,7 +6,7 @@ import { DataType2TypedArrayConstructorMapping } from "../../../../../core/colle
  *
  * @param {BinaryBuffer} buffer
  * @param {MicronGeometryPatch} patch
- * @param {MicronVertexDataSpec} vertex_spec
+ * @param {VertexDataSpec} vertex_spec
  * @param {MicronGeometryPatch[]} patch_array
  */
 export function deserialize_patch(buffer, patch, vertex_spec, patch_array) {

package/engine/graphics/micron/format/serialization/serialize_patch.js

@@ -4,7 +4,7 @@ import { DataTypeByteSizes } from "../../../../../core/collection/table/DataType
  *
  * @param {BinaryBuffer} buffer
  * @param {MicronGeometryPatch} patch
- * @param {MicronVertexDataSpec} vertex_spec
+ * @param {VertexDataSpec} vertex_spec
  * @param {MicronGeometryPatch[]} patch_array
  */
 export function serialize_patch(buffer, patch, vertex_spec, patch_array) {

package/engine/graphics/micron/render/instanced/PatchDataTextures.js

@@ -26,7 +26,7 @@ const MAX_TEXTURE_SIZE = 16384;
 export class PatchDataTextures {
     /**
      *
-     * @param {MicronVertexDataSpec} spec
+     * @param {VertexDataSpec} spec
      * @param {number} [column_count]
      */
     constructor(spec, column_count = 2) {
@@ -35,7 +35,7 @@ export class PatchDataTextures {
 
         /**
          *
-         * @type {MicronVertexDataSpec}
+         * @type {VertexDataSpec}
          * @private
          */
         this.__spec = spec;
@@ -77,7 +77,7 @@ export class PatchDataTextures {
 
     /**
      *
-     * @returns {MicronVertexDataSpec}
+     * @returns {VertexDataSpec}
      */
     get spec() {
         return this.__spec;

package/engine/graphics/micron/render/instanced/ThreeInstancedAdapter.js

@@ -14,7 +14,7 @@ import { shader_rewrite_standard } from "./shader/shader_rewrite_standard.js";
 export class ThreeInstancedAdapter {
     /**
      *
-     * @param {MicronVertexDataSpec} spec
+     * @param {VertexDataSpec} spec
      */
     constructor(spec) {
         /**

package/engine/graphics/micron/render/instanced/shader/shader_rewrite_standard.js

@@ -9,7 +9,7 @@ const DEBUG_PATCHES = false;
  *
  * @param {{vertexShader,fragmentShader,uniforms:Object<IUniform>}} shader
  * @param {Object<IUniform>} uniforms
- * @param {MicronVertexDataSpec} spec
+ * @param {VertexDataSpec} spec
  * @param {number} column_count
  */
 export function shader_rewrite_standard(shader, uniforms, spec, column_count) {

package/engine/graphics/micron/render/makeThreeMeshFromVirtualGeometry.js

@@ -3,7 +3,7 @@ import { Group, Mesh } from "three";
 
 /**
  *
- * @param {MicronVertexDataSpec} spec
+ * @param {VertexDataSpec} spec
  * @param {VirtualGeometry} virtual_geometry
  * @param {THREE.Material[]} materials
  * @returns {Mesh}

package/engine/graphics/micron/render/v1/MaterialContext.js

@@ -1,6 +1,6 @@
 import { ThreeInstancedAdapter } from "../instanced/ThreeInstancedAdapter.js";
 import { composeCompile } from "../../../material/composeCompile.js";
-import { Mesh, MeshDepthMaterial, MeshNormalMaterial, RGBADepthPacking } from "three";
+import { Material, Mesh, MeshDepthMaterial, MeshNormalMaterial, RGBADepthPacking } from "three";
 import { VIRTUAL_MESH_FLAG } from "../VIRTUAL_MESH_FLAG.js";
 
 const MATERIAL_FLAG = '@micron_instanced_rewritten';
@@ -9,7 +9,7 @@ const MATERIAL_VERTEX_DISPLACED = '@meep/vertex-displaced';
 export class MaterialContext {
     /**
      *
-     * @param {MicronVertexDataSpec} spec
+     * @param {VertexDataSpec} spec
      * @param {Material} material
      */
     constructor(spec, material) {
@@ -19,6 +19,13 @@ export class MaterialContext {
          */
         this.adapter = new ThreeInstancedAdapter(spec);
 
+        /**
+         *
+         * @type {VertexDataSpec}
+         * @private
+         */
+        this.__vertex_spec = spec;
+
         /**
          *
          * @type {Material}
@@ -56,6 +63,7 @@ export class MaterialContext {
         this.__patch_count = 0;
     }
 
+
     /**
      *
      * @param {MicronGeometryPatchOccurrence} occurrence
@@ -74,6 +82,7 @@ export class MaterialContext {
 
         if (material[MATERIAL_FLAG] === undefined) {
             material.onBeforeCompile = composeCompile(this.material.onBeforeCompile, rewrite_material);
+
             material[MATERIAL_FLAG] = true;
             material[MATERIAL_VERTEX_DISPLACED] = true;
         } else {

package/engine/graphics/micron/render/v1/MaterialVertexSpec.js

@@ -2,7 +2,7 @@ export class MaterialVertexSpec {
     constructor() {
         /**
          *
-         * @type {MicronVertexDataSpec|null}
+         * @type {VertexDataSpec|null}
          */
         this.spec = null;
         /**
@@ -34,7 +34,7 @@ export class MaterialVertexSpec {
     }
 
     /**
-     * @param {MicronVertexDataSpec} spec
+     * @param {VertexDataSpec} spec
      * @param {Material} material
      */
     static from(spec, material) {

package/engine/graphics/micron/render/v1/ThreeVirtualGeometryAdapter.js

@@ -19,7 +19,7 @@ export class ThreeVirtualGeometryAdapter {
 
         /**
          *
-         * @type {MicronVertexDataSpec}
+         * @type {VertexDataSpec}
          * @private
          */
         this.__vertex_spec = null;

package/engine/graphics/micron/render/v1/VGThreeRenderer.js

@@ -68,7 +68,7 @@ export class VGThreeRenderer {
 
     /**
      *
-     * @param {MicronVertexDataSpec} spec
+     * @param {VertexDataSpec} spec
      * @param {Material} m
      * @returns {MaterialContext}
      * @private

package/engine/input/devices/PointerDevice.js

@@ -60,14 +60,30 @@ function forEachTouch(touchList, callback) {
  */
 function getTouchCenter(touchList, result) {
     const length = touchList.length;
+
     let x = 0, y = 0;
-    for (let i = 0; i < length; i++) {
-        const touch = touchList.item(i);
-        x += touch.clientX;
-        y += touch.clientY;
+
+    if (length > 0) {
+
+        for (let i = 0; i < length; i++) {
+            const touch = touchList.item(i);
+
+            if (touch === null) {
+                continue;
+            }
+
+            x += touch.clientX;
+            y += touch.clientY;
+        }
+
+        // average to get center
+        x /= length;
+        y /= length;
+
     }
-    //
-    result.set(x / length, y / length);
+
+    result.set(x, y);
+
 }
 
 /**
@@ -435,13 +451,13 @@ function PointerDevice(domElement) {
     observeTap(this.on.up, this.on.down, this.on.move, 10, this.on.tap);
     observeDrag(globalUp, this.on.down, this.on.move, this.on.dragStart, this.on.dragEnd, this.on.drag);
     observePinch({
-                     touchStart: touchStart,
-                     touchEnd: touchEnd,
-                     touchMove: touchMove,
-                     pinch: this.on.pinch,
-                     pinchStart: this.on.pinchStart,
-                     pinchEnd: this.on.pinchEnd
-                 });
+        touchStart: touchStart,
+        touchEnd: touchEnd,
+        touchMove: touchMove,
+        pinch: this.on.pinch,
+        pinchStart: this.on.pinchStart,
+        pinchEnd: this.on.pinchEnd
+    });
 }
 
 /**

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@woosh/meep-engine",
   "type": "module",
+  "license": "UNLICENSED",
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.32",
+  "version": "2.33.36",
   "dependencies": {
     "fast-levenshtein": "2.0.6",
     "opentype.js": "1.3.3",
     "simplex-noise": "2.4.0",
-    "three": "^0.132.2"
+    "three": "^0.135.0"
   },
   "devDependencies": {
     "babel-jest": "^26.6.3",
-    "@types/three": "^0.132.2"
+    "@types/three": "^0.135.0"
   }
 }