matrix-engine-wgpu 1.2.0 → 1.2.2

package/main.js

@@ -1,6 +1,6 @@
 import MatrixEngineWGPU from "./src/world.js";
 import {downloadMeshes} from './src/engine/loader-obj.js';
-import {LOG_FUNNY, LOG_INFO, LOG_MATRIX, mb, randomFloatFromTo, randomIntFromTo} from "./src/engine/utils.js";
+import {byId, LOG_FUNNY, LOG_INFO, LOG_MATRIX, mb, randomFloatFromTo, randomIntFromTo} from "./src/engine/utils.js";
 import {dices, myDom} from "./examples/games/jamb/jamb.js";
 import {addRaycastListener, touchCoordinate, rayIntersectsSphere, getRayFromMouse} from "./src/engine/raycast.js";
 
@@ -19,9 +19,58 @@ export let application = new MatrixEngineWGPU({
   };
   application.myDom = myDom;
   myDom.createJamb();
+  myDom.addDraggerForTable();
   myDom.createBlocker();
   application.dices = dices;
 
+
+  application.activateDiceClickListener = null;
+
+  // -------------------------
+  // TEST
+  application.matrixAmmo.detectTopFaceFromQuat = (q) => {
+    // Define based on *visual face* → object-space normal mapping
+    const faces = [
+      {face: 1, vec: [0, 1, 0]},   // top
+      {face: 2, vec: [0, -1, 0]},  // bottom
+      {face: 3, vec: [0, 0, 1]},   // front
+      {face: 4, vec: [0, 0, -1]},  // back
+      {face: 5, vec: [1, 0, 0]},   // right
+      {face: 6, vec: [-1, 0, 0]}   // left
+    ];
+
+    let maxDot = -Infinity;
+    let topFace = null;
+
+    for(const f of faces) {
+      const v = application.matrixAmmo.applyQuatToVec(q, f.vec);
+      const dot = v.y; // Compare with world up (0, 1, 0)
+      if(dot > maxDot) {
+        maxDot = dot;
+        topFace = f.face;
+      }
+    }
+
+    return topFace;
+  };
+
+  application.matrixAmmo.applyQuatToVec = (q, vec) => {
+    const [x, y, z] = vec;
+    const qx = q.x(), qy = q.y(), qz = q.z(), qw = q.w();
+
+    // Quaternion * vector * inverse(quaternion)
+    const ix = qw * x + qy * z - qz * y;
+    const iy = qw * y + qz * x - qx * z;
+    const iz = qw * z + qx * y - qy * x;
+    const iw = -qx * x - qy * y - qz * z;
+
+    return {
+      x: ix * qw + iw * -qx + iy * -qz - iz * -qy,
+      y: iy * qw + iw * -qy + iz * -qx - ix * -qz,
+      z: iz * qw + iw * -qz + ix * -qy - iy * -qx
+    };
+  }
+  // -------------------------
   // This code must be on top (Physics)
   application.matrixAmmo.detectCollision = function() {
     this.lastRoll = '';
@@ -44,48 +93,60 @@ export let application = new MatrixEngineWGPU({
           var testR = contactManifold.getBody0().getWorldTransform().getRotation();
         }
         var passed = false;
-        if(Math.abs(testR.y()) < 0.00001) {
-          this.lastRoll = "3";
-          this.presentScore += 4;
-          passed = true;
-        }
-        if(Math.abs(testR.x()) < 0.00001) {
-          this.lastRoll = "5";
-          this.presentScore += 3;
-          passed = true;
-        }
-        if(testR.x().toString().substring(0, 5) == testR.y().toString().substring(1, 6)) {
-          this.lastRoll = "6";
-          this.presentScore += 2;
-          passed = true;
-        }
-        if(testR.x().toString().substring(0, 5) == testR.y().toString().substring(0, 5)) {
-          this.lastRoll = "2";
-          this.presentScore += 1;
-          passed = true;
-        }
-        if(testR.z().toString().substring(0, 5) == testR.y().toString().substring(1, 6)) {
-          this.lastRoll = "4";
-          this.presentScore += 6;
-          passed = true;
-        }
-        if(testR.z().toString().substring(0, 5) == testR.y().toString().substring(0, 5)) {
-          this.lastRoll = "1";
-          this.presentScore += 5;
-          passed = true;
+        const face = application.matrixAmmo.detectTopFaceFromQuat(testR);
+        if(face) {
+          this.lastRoll = face.toString();
+          // Update score logic
+          dispatchEvent(new CustomEvent(`dice-${face}`, {detail: {result: `dice-${face}`, cubeId: MY_DICE_NAME}}));
         }
-        if(passed == true) dispatchEvent(new CustomEvent(`dice-${this.lastRoll}`, {
-          detail: {
-            result: `dice-${this.lastRoll}`,
-            cubeId: MY_DICE_NAME
-          }
-        }))
+        // if(Math.abs(testR.y()) < 0.00001) {
+        //   this.lastRoll = "3";
+        //   this.presentScore += 4;
+        //   passed = true;
+        // }
+        // if(Math.abs(testR.x()) < 0.00001) {
+        //   this.lastRoll = "5";
+        //   this.presentScore += 3;
+        //   passed = true;
+        // }
+        // if(testR.x().toString().substring(0, 5) == testR.y().toString().substring(1, 6)) {
+        //   this.lastRoll = "6";
+        //   this.presentScore += 2;
+        //   passed = true;
+        // }
+        // if(testR.x().toString().substring(0, 5) == testR.y().toString().substring(0, 5)) {
+        //   this.lastRoll = "2";
+        //   this.presentScore += 1;
+        //   passed = true;
+        // }
+        // if(testR.z().toString().substring(0, 5) == testR.y().toString().substring(1, 6)) {
+        //   this.lastRoll = "4";
+        //   this.presentScore += 6;
+        //   passed = true;
+        // }
+        // if(testR.z().toString().substring(0, 5) == testR.y().toString().substring(0, 5)) {
+        //   this.lastRoll = "1";
+        //   this.presentScore += 5;
+        //   passed = true;
+        // }
+        // if(passed == true) dispatchEvent(new CustomEvent(`dice-${this.lastRoll}`, {
+        //   detail: {
+        //     result: `dice-${this.lastRoll}`,
+        //     cubeId: MY_DICE_NAME
+        //   }
+        // }))
       }
     }
   }
 
   addRaycastListener();
   addEventListener("ray.hit.event", (e) => {
+    if(byId('topTitleDOM') && byId('topTitleDOM').getAttribute('data-gamestatus') != 'FREE' &&
+      byId('topTitleDOM').getAttribute('data-gamestatus') != 'status-select') {
+      console.log('no hit in middle of game ...');
+      return;
+    }
+
     if(application.dices.STATUS == "FREE_TO_PLAY") {
       console.log("hit cube status free to play prevent pick. ", e.detail.hitObject.name)
     } else if(application.dices.STATUS == "SELECT_DICES_1" ||
@@ -112,8 +173,12 @@ export let application = new MatrixEngineWGPU({
   application.matrixSounds.createAudio('dice1', 'res/audios/dice1.mp3', 6)
   application.matrixSounds.createAudio('dice2', 'res/audios/dice2.mp3', 6)
   application.matrixSounds.createAudio('hover', 'res/audios/toggle_002.mp3', 3)
+  application.matrixSounds.createAudio('roll', 'res/audios/dice-roll.mp3', 2)
 
   addEventListener('AmmoReady', () => {
+
+    app.matrixAmmo.speedUpSimulation = 2;
+
     downloadMeshes({
       cube: "./res/meshes/jamb/dice.obj",
     }, onLoadObj, {scale: [1, 1, 1], swap: [null]})
@@ -379,12 +444,37 @@ export let application = new MatrixEngineWGPU({
         if(dices.STATUS == "FREE_TO_PLAY" || dices.STATUS == "IN_PLAY") {
           dices.STATUS = "SELECT_DICES_1";
           console.log(`%cStatus<SELECT_DICES_1>`, LOG_FUNNY)
+          setTimeout(() => {
+            dispatchEvent(new CustomEvent('updateTitle',
+              {
+                detail: {
+                  text: app.label.get.freetoroll,
+                  status: 'FREE'
+                }
+              }));
+          }, 500);
         } else if(dices.STATUS == "SELECT_DICES_1") {
           dices.STATUS = "SELECT_DICES_2";
+          setTimeout(() => {
+            dispatchEvent(new CustomEvent('updateTitle',
+              {
+                detail: {
+                  text: app.label.get.freetoroll,
+                  status: 'FREE'
+                }
+              }));
+          }, 500);
           console.log(`%cStatus<SELECT_DICES_2>`, LOG_FUNNY)
         } else if(dices.STATUS == "SELECT_DICES_2") {
           dices.STATUS = "FINISHED";
           console.log(`%cStatus<FINISHED>`, LOG_FUNNY)
+          dispatchEvent(new CustomEvent('updateTitle',
+            {
+              detail: {
+                text: app.label.get.pick5,
+                status: 'status-select'
+              }
+            }));
         }
       }
     };
@@ -403,6 +493,14 @@ export let application = new MatrixEngineWGPU({
       app.cameras.WASD.pitch = 0;
       app.cameras.WASD.position[2] = 0;
       app.cameras.WASD.position[1] = 3.76;
+
+      dispatchEvent(new CustomEvent('updateTitle',
+        {
+          detail: {
+            text: app.label.get.hand1,
+            status: 'FREE'
+          }
+        }));
     })
 
     // ACTIONS
@@ -450,10 +548,11 @@ export let application = new MatrixEngineWGPU({
         app.matrixAmmo.getBodyByName(`CubePhysics${x}`).setLinearVelocity(new Ammo.btVector3(
           randomFloatFromTo(-5, 5), 15, -20
         ))
+        setTimeout(() => app.matrixSounds.play('roll'), 1500)
       }, 200 * x)
     }
 
-    let activateDiceClickListener = (index) => {
+    application.activateDiceClickListener = (index) => {
       index = parseInt(index);
       switch(index) {
         case 1:
@@ -472,11 +571,20 @@ export let application = new MatrixEngineWGPU({
     };
 
     let rollProcedure = () => {
+      if(topTitleDOM.getAttribute('data-gamestatus') != 'FREE') {
+        console.log('validation fails...');
+        return;
+      }
       if(dices.STATUS == "FREE_TO_PLAY") {
         app.matrixSounds.play('start')
         dices.STATUS = "IN_PLAY";
-
-        dispatchEvent(new CustomEvent('updateTitle', {detail: app.label.get.hand1}))
+        dispatchEvent(new CustomEvent('updateTitle',
+          {
+            detail: {
+              text: app.label.get.hand1,
+              status: 'inplay'
+            }
+          }));
         addEventListener('dice-1', dice1Click)
         addEventListener('dice-2', dice2Click)
         addEventListener('dice-3', dice3Click)
@@ -493,10 +601,24 @@ export let application = new MatrixEngineWGPU({
           const key = "CubePhysics" + i;
           if(!(key in app.dices.SAVED_DICES)) {
             console.log("Still in game last char is id : ", key[key.length - 1]);
-            activateDiceClickListener(parseInt(key[key.length - 1]))
+            application.activateDiceClickListener(parseInt(key[key.length - 1]))
             shootDice(key[key.length - 1])
+          } else {
+            console.log("??????????Still in game last char is id : ", key[key.length - 1]);
+            application.activateDiceClickListener(parseInt(key[key.length - 1]))
           }
         }
+        // ????
+        // application.activateDiceClickListener(1);
+
+        dispatchEvent(new CustomEvent('updateTitle',
+          {
+            detail: {
+              text: dices.STATUS == "SELECT_DICES_1" ? app.label.get.hand1 : app.label.get.hand2,
+              status: 'inplay'
+            }
+          }));
+
       } else if(dices.STATUS == "FINISHED") {
         mb.error('No more roll...');
         mb.show('Pick up 5 dices');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-engine-wgpu",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "+HOTFIX raycast, webGPU powered pwa application. Crazy fast rendering with AmmoJS physics support. Simple raycaster hit object added.",
   "main": "index.js",
   "scripts": {