matrix-engine-wgpu 1.3.18 → 1.4.0

package/src/world.js

@@ -5,13 +5,22 @@ import {ArcballCamera, WASDCamera} from "./engine/engine.js";
 import {createInputHandler} from "./engine/engine.js";
 import MEMeshObj from "./engine/mesh-obj.js";
 import MatrixAmmo from "./physics/matrix-ammo.js";
-import {LOG_WARN, genName, mb, scriptManager, urlQuery} from "./engine/utils.js";
+import {LOG_FUNNY_SMALL, LOG_WARN, genName, mb, scriptManager, urlQuery} from "./engine/utils.js";
 import {MultiLang} from "./multilang/lang.js";
 import {MatrixSounds} from "./sounds/sounds.js";
 import {play} from "./engine/loader-obj.js";
 import {SpotLight} from "./engine/lights.js";
 
+/**
+ * @description
+ * Main engine root class.
+ * @author Nikola Lukic 2025
+ * @email zlatnaspirala@gmail.com
+ * @web https://maximumroulette.com
+ * @github zlatnaspirala
+ */
 export default class MatrixEngineWGPU {
+  lightContainer
 
   mainRenderBundle = [];
   lightContainer = [];
@@ -29,9 +38,7 @@ export default class MatrixEngineWGPU {
   matrixAmmo = new MatrixAmmo();
   matrixSounds = new MatrixSounds();
 
-  // The input handler
   constructor(options, callback) {
-    // console.log('typeof options ', typeof options )
     if(typeof options == 'undefined' || typeof options == "function") {
       this.options = {
         useSingleRenderPass: true,
@@ -95,7 +102,6 @@ export default class MatrixEngineWGPU {
         this.label.get = r;
       });
     }
-
     this.init({canvas, callback})
   }
 
@@ -106,15 +112,7 @@ export default class MatrixEngineWGPU {
       extensions: ["ray_tracing"]
     });
 
-    // Maybe works in ssl with webworkers...
-    // const adapterInfo = await this.adapter.requestAdapterInfo();
-    // var test = this.adapter.features()
-    // console.log(adapterInfo.vendor);
-    // console.log('test' + test);
-    // console.log("FEATURES : " + this.adapter.features)
-
     this.context = canvas.getContext('webgpu');
-
     const devicePixelRatio = window.devicePixelRatio;
     canvas.width = canvas.clientWidth * devicePixelRatio;
     canvas.height = canvas.clientHeight * devicePixelRatio;
@@ -132,21 +130,20 @@ export default class MatrixEngineWGPU {
       this.frame = this.framePassPerObject;
     }
 
-    // Global SCENE BUFFER Good idea for future
-    // this.sceneUniformBuffer = this.device.createBuffer({
-    //   // Two 4x4 viewProj matrices,
-    //   // one for the camera and one for the light.
-    //   // Then a vec3 for the light position.
-    //   // Rounded to the nearest multiple of 16.
-    //   size: 2 * 4 * 16 + 4 * 4,
-    //   usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
-    // });
-
+    this.MAX_SPOTLIGHTS = 20;
     this.inputHandler = createInputHandler(window, canvas);
-
+    this.createGlobalStuff();
     this.run(callback)
   };
 
+  createGlobalStuff() {
+    this.spotlightUniformBuffer = this.device.createBuffer({
+      label: 'spotlightUniformBufferGLOBAL',
+      size: this.MAX_SPOTLIGHTS * 80,
+      usage: GPUBufferUsage.UNIFORM | GPUBufferUsage.COPY_DST,
+    });
+  }
+
   getSceneObjectByName(name) {
     return this.mainRenderBundle.find((sceneObject) => sceneObject.name === name)
   }
@@ -252,12 +249,11 @@ export default class MatrixEngineWGPU {
   }
 
   addLight(o) {
-    // test light global; entity
     const camera = this.cameras[this.mainCameraParams.type];
     let newLight = new SpotLight(camera, this.inputHandler);
     newLight.prepareBuffer(this.device);
     this.lightContainer.push(newLight);
-    console.log('Add light : ', newLight);
+    console.log(`%cAdd light: ${newLight}`, LOG_FUNNY_SMALL);
   }
 
   addMeshObj = (o, clearColor = this.options.clearColor) => {
@@ -289,18 +285,14 @@ export default class MatrixEngineWGPU {
     if(typeof o.physics.scale === 'undefined') {o.physics.scale = o.scale;}
     if(typeof o.physics.rotation === 'undefined') {o.physics.rotation = o.rotation;}
     o.physics.position = o.position;
-    //  console.log('Mesh procedure', o)
-    // TEST OBJS SEQ ANIMS 
     if(typeof o.objAnim == 'undefined' || typeof o.objAnim == null) {
       o.objAnim = null;
     } else {
-      // console.log('o.anim', o.objAnim)
       if(typeof o.objAnim.animations !== 'undefined') {
         o.objAnim.play = play;
       }
       // no need for single test it in future
       o.objAnim.meshList = o.objAnim.meshList;
-
       if(typeof o.mesh === 'undefined') {
         o.mesh = o.objAnim.meshList[0];
         console.info('objSeq animation is active.');
@@ -314,7 +306,7 @@ export default class MatrixEngineWGPU {
       }
     }
     let myMesh1 = new MEMeshObj(this.canvas, this.device, this.context, o);
-    myMesh1.lightContainer = this.lightContainer;
+    myMesh1.spotlightUniformBuffer = this.spotlightUniformBuffer;
     myMesh1.inputHandler = this.inputHandler;
     myMesh1.clearColor = clearColor;
     if(o.physics.enabled == true) {
@@ -340,9 +332,6 @@ export default class MatrixEngineWGPU {
     if(!this.lastFrameMS) {dt = 16;}
     this.lastFrameMS = now;
     const camera = this.cameras[this.mainCameraParams.type];
-
-    // engine, once per frame
-    // const camera = this.cameras[this.mainCameraParams.type];
     camera.update(dt, this.inputHandler());
     const camVP = mat4.multiply(camera.projectionMatrix, camera.view); // P * V
 
@@ -356,27 +345,19 @@ export default class MatrixEngineWGPU {
         camVP.byteLength
       );
     }
-    // engine frame
-    // camera.update(dt, this.inputHandler());
-    // const camVP = mat4.multiply(camera.projectionMatrix, camera.view);
-
-    // for(const mesh of this.mainRenderBundle) {
-    //   // Light’s viewProj should come from your SpotLight
-    //   // If you have multiple lights, you’ll need an array UBO or multiple passes.
-    //   const sceneData = new Float32Array(16 + 16 + 4); // lightVP, camVP, lightPos(+pad)
-    //   sceneData.set(this.lightContainer[0].viewProjMatrix, 0);
-    //   sceneData.set(camVP, 16);
-    //   sceneData.set(this.lightContainer[0].position, 32);
-
-    //   // sceneUniformBuffer
-    //   this.device.queue.writeBuffer(
-    //     mesh.sceneUniformBuffer,  // or a shared one if/when you centralize it
-    //     0,
-    //     sceneData.buffer,
-    //     sceneData.byteOffset,
-    //     sceneData.byteLength
-    //   );
-    // }
+  }
+
+  updateLights() {
+    // Update buffer every frame
+    const data = new Float32Array(this.MAX_SPOTLIGHTS * 20);
+    for(let i = 0;i < this.MAX_SPOTLIGHTS;i++) {
+      if(i < this.lightContainer.length) {
+        data.set(this.lightContainer[i].getLightDataBuffer(), i * 20);
+      } else {
+        data.set(new Float32Array(20), i * 20);
+      }
+    }
+    this.device.queue.writeBuffer(this.spotlightUniformBuffer, 0, data.buffer);
   }
 
   frameSinglePass = () => {
@@ -389,35 +370,24 @@ export default class MatrixEngineWGPU {
       let renderPass;
       let commandEncoder = this.device.createCommandEncoder();
 
+      this.updateLights()
       this.test()
+
       // 1️⃣ Update light data (position, direction, uniforms)
       for(const light of this.lightContainer) {
-        light.updateLightBuffer();
         this.mainRenderBundle.forEach((meItem, index) => {
+      
           light.updateSceneUniforms(this.mainRenderBundle, this.cameras.WASD);
         })
       }
 
       this.mainRenderBundle.forEach((meItem, index) => {meItem.position.update()})
       if(this.matrixAmmo) this.matrixAmmo.updatePhysics();
-
-      // no cast WORKING
-      // this.mainRenderBundle.forEach((meItem, index) => {
-      //   meItem.draw(commandEncoder);
-
-      //   shadowPass = commandEncoder.beginRenderPass(meItem.shadowPassDescriptor);
-      //   shadowPass.setPipeline(meItem.shadowPipeline);
-      //   meItem.drawShadows(shadowPass);
-      //   shadowPass.end();
-      // })
-
-      // cast!
       const firstItem = this.mainRenderBundle[0];
       shadowPass = commandEncoder.beginRenderPass(firstItem.shadowPassDescriptor);
       shadowPass.setPipeline(firstItem.shadowPipeline);
       for(const meItem of this.mainRenderBundle) {
-        // meItem.draw(commandEncoder);
-        meItem.drawShadows(shadowPass); // Draw ALL objects
+        meItem.drawShadows(shadowPass);
       }
       shadowPass.end();
 
@@ -441,7 +411,7 @@ export default class MatrixEngineWGPU {
       this.device.queue.submit([commandEncoder.finish()]);
       requestAnimationFrame(this.frame);
     } catch(err) {
-      console.log('%cDraw func (err):' + err, LOG_WARN)
+      console.log('%cLoop (err):' + err, LOG_WARN)
       requestAnimationFrame(this.frame);
     }
   }
@@ -456,7 +426,7 @@ export default class MatrixEngineWGPU {
         if(meItem.renderPassDescriptor) meItem.renderPassDescriptor.colorAttachments[0].loadOp = 'load';
       }
       // Update transforms, physics, etc. (optional)
-      meItem.draw(commandEncoder); // optional: if this does per-frame updates
+      meItem.draw(commandEncoder);
       if(meItem.renderBundle) {
         // Set up view per object
         meItem.renderPassDescriptor.colorAttachments[0].view =
@@ -465,7 +435,7 @@ export default class MatrixEngineWGPU {
         passEncoder.executeBundles([meItem.renderBundle]); // ✅ Use only this bundle
         passEncoder.end();
       } else {
-        meItem.draw(commandEncoder); // fallback if no renderBundle
+        meItem.draw(commandEncoder);
       }
     });
     this.device.queue.submit([commandEncoder.finish()]);