matrix-engine-wgpu 1.4.7 → 1.5.0

package/examples/glb-loader.js

@@ -0,0 +1,74 @@
+import MatrixEngineWGPU from "../src/world.js";
+import {downloadMeshes} from '../src/engine/loader-obj.js';
+import {LOG_FUNNY, LOG_INFO, LOG_MATRIX} from "../src/engine/utils.js";
+import {loadBVH} from "../src/engine/loaders/bvh.js";
+import {uploadGLBModel} from "../src/engine/loaders/webgpu-gltf.js";
+
+let TEST_ANIM = new MatrixEngineWGPU({
+  useSingleRenderPass: true,
+  canvasSize: 'fullscreen',
+  mainCameraParams: {
+    type: 'WASD',
+    responseCoef: 1000
+  },
+  clearColor: {r: 0, b: 0.122, g: 0.122, a: 1}
+}, () => {
+
+  addEventListener('AmmoReady', async () => {
+    setTimeout(() => {
+      app.cameras.WASD.yaw = -0.03;
+      app.cameras.WASD.pitch = -0.49;
+      app.cameras.WASD.position[2] = 0;
+      app.cameras.WASD.position[1] = 3.76;
+    }, 500)
+
+    downloadMeshes({cube: "./res/meshes/blender/cube.obj"}, onGround, {scale: [20, 1, 20]})
+    // const path = 'https://raw.githubusercontent.com/zlatnaspirala/Matrix-Engine-BVH-test/main/javascript-bvh/example.bvh';
+    const path = 'res/meshes/glb/glb-test1.bvh';
+
+    var glbFile = await fetch(
+      "res/meshes/glb/test.glb")
+      .then(res => res.arrayBuffer().then(buf => uploadGLBModel(buf, TEST_ANIM.device)));
+    TEST_ANIM.addGlbObj({
+      // scale: [1,1,1],
+      position: {x:0,y:-4,z:-20},
+      scale: [10, 10, 10],
+      name: 'firstGlb',
+      texturesPaths: ['./res/meshes/glb/textures/mutant.png'],
+    }, null, glbFile);
+
+
+    // loadBVH(path).then(async (BVHANIM) => {
+    //   var glbFile = await fetch(
+    //     "res/meshes/glb/test.glb")
+    //     .then(res => res.arrayBuffer().then(buf => uploadGLBModel(buf, TEST_ANIM.device)));
+    //   TEST_ANIM.addGlbObj({
+    //     // scale: [1,1,1],
+    //     scale: [10, 10, 10],
+    //     name: 'firstGlb',
+    //     texturesPaths: ['./res/textures/rust.jpg'],
+    //   }, BVHANIM, glbFile);
+    // });
+  })
+
+  function onGround(m) {
+    TEST_ANIM.addLight();
+    TEST_ANIM.globalAmbient[1] = 1.5;
+
+    TEST_ANIM.addMeshObj({
+      position: {x: 0, y: -5, z: -10},
+      rotation: {x: 0, y: 0, z: 0},
+      rotationSpeed: {x: 0, y: 0, z: 0},
+      texturesPaths: ['./res/meshes/blender/cube.png'],
+      name: 'ground',
+      mesh: m.cube,
+      physics: {
+        enabled: false,
+        mass: 0,
+        geometry: "Cube"
+      },
+    })
+  }
+})
+// just for dev
+window.app = TEST_ANIM;

package/examples/load-obj-file.js

@@ -24,11 +24,18 @@ export var loadObjFile = function() {
       }, onGround,
         {scale: [20, 1, 20]})
 
-        // loadObjFile.addLight();
+      // loadObjFile.addLight();
     })
 
     function onGround(m) {
 
+      setTimeout(() => {
+        app.cameras.WASD.yaw = -0.03;
+        app.cameras.WASD.pitch = -0.49;
+        app.cameras.WASD.position[2] = 0;
+        app.cameras.WASD.position[1] = 3.76;
+      }, 500)
+
       loadObjFile.addMeshObj({
         position: {x: 0, y: -5, z: -10},
         rotation: {x: 0, y: 0, z: 0},
@@ -83,7 +90,7 @@ export var loadObjFile = function() {
       console.log(`%c Test access scene ${TEST} object.`, LOG_MATRIX);
 
       loadObjFile.addLight();
-      loadObjFile.lightContainer[0].behavior.setOsc0(-1,1,0.1)
+      loadObjFile.lightContainer[0].behavior.setOsc0(-1, 1, 0.1)
       loadObjFile.lightContainer[0].behavior.value_ = -1;
       loadObjFile.lightContainer[0].updater.push((light) => {
         light.position[0] = light.behavior.setPath0()

package/examples/load-objs-sequence.js

@@ -30,7 +30,7 @@ export var loadObjsSequence = function() {
           to: 20
         }),
         onLoadObj,
-        {scale: [10,10,10]}
+        {scale: [0.1,0.1,0.1]}
       );
     })
 
@@ -69,6 +69,13 @@ export var loadObjsSequence = function() {
         objAnim: objAnim
       })
       app.mainRenderBundle[0].objAnim.play('walk');
+
+      setTimeout(()=> {
+      app.cameras.WASD.pitch =  -0.2605728267949113;
+      app.cameras.WASD.yaw = -0.0580;
+      app.cameras.WASD.position[1] = 15
+      app.cameras.WASD.position[2] = 11
+      }, 200)
     }
   })
   // Just for dev - easy console access

package/examples/unlit-textures.js

@@ -23,6 +23,9 @@ export var unlitTextures = function() {
       };
       unlitTextures.addCube(o)
       unlitTextures.addBall(c)
+
+      // just to fix warns
+      unlitTextures.addLight()
     });
   })
 

package/examples.js

@@ -55,12 +55,8 @@ byId('video-texture').addEventListener("click", () => {
 })
 
 byId('jamb').addEventListener("click", () => {
-  // byId('unlitTextures').setAttribute('disabled', true)
-  // byId('loadObjFile').setAttribute('disabled', true)
-  // byId('jamb').removeAttribute('disabled')
-  if(typeof app !== "undefined") app.destroyProgram()
-  destroyJambDoms();
-  // loadJamb()
+  
+  open("https://maximumroulette.com/apps/webgpu/");
 })
 
 byId('objs-anim').addEventListener("click", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-engine-wgpu",
-  "version": "1.4.7",
+  "version": "1.5.0",
   "description": "Fixed shadows casting vs camera/video texture, webGPU powered pwa application. Crazy fast rendering with AmmoJS physics support. Simple raycaster hit object added.",
   "main": "index.js",
   "scripts": {
@@ -10,7 +10,25 @@
     "empty": "watchify empty.js -p [esmify --noImplicitAny] -o public/empty.js",
     "build-all": "npm run main-worker | npm run examples | npm run main | npm run empty",
     "hosts": "http-server ./public/ -p 3000",
-    "build.demo1": "browserify main.js -p esmify > public/app.js"
+    "build.test": "browserify main.js -p esmify > public/app.js",
+    "glb-loader": "watchify ./examples/glb-loader.js -p [esmify --noImplicitAny] -o public/app.js"
+  },
+  "author": "Nikola Lukic",
+  "license": "MIT",
+  "devDependencies": {
+    "browser-resolve": "^2.0.0",
+    "browserify": "^17.0.0",
+    "esmify": "^2.1.1",
+    "watchify": "^4.0.0",
+    "wgpu-matrix": "^2.0.0",
+    "http-server": "^14.1.1"
+  },
+  "dependencies": {
+    "bvh-loader": "1.0.10",
+    "gl-matrix": "^3.4.4"
+  },
+  "peerDependencies": {
+    "wgpu-matrix": "^2.0.0"
   },
   "keywords": [
     "3dScene",
@@ -35,26 +53,12 @@
     "maximumroulette.com",
     "GLSL",
     "Lights",
+    "shadows-cast",
     "multi-spot-lights",
     "raycast",
     "hit-3d-object",
     "hit-object",
     "webgpu-obj-loader",
     "webgpu-fps"
-  ],
-  "author": "Nikola Lukic",
-  "license": "MIT",
-  "devDependencies": {
-    "browser-resolve": "^2.0.0",
-    "browserify": "^17.0.0",
-    "esmify": "^2.1.1",
-    "watchify": "^4.0.0",
-    "wgpu-matrix": "^2.0.0"
-  },
-  "dependencies": {
-    "http-server": "^14.1.1"
-  },
-  "peerDependencies": {
-    "wgpu-matrix": "^2.0.0"
-  }
-}
+  ]
+}