+ Implemented events for bootstrap

+ Some webgl renderer fixes
DrA1ex · Oct 4, 2023 · f0fecf4 · f0fecf4
1 parent 06cbaf8
commit f0fecf4
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 9 deletions.
diff --git a/examples/common/bootstrap.js b/examples/common/bootstrap.js
@@ -5,6 +5,7 @@ import {Particle} from "../../lib/render/particles/particle.js";
 import {ParticleSystem} from "../../lib/render/particles/system.js";
 import * as Utils from "../../lib/utils/common.js";
 import * as CommonUtils from "./utils.js";
+import {EventEmitter} from "../../lib/misc/event.js";
 
 
 /**
@@ -28,7 +29,7 @@ const ShapeType = {
     rect: 2
 }
 
-export class Bootstrap {
+export class Bootstrap extends EventEmitter {
     /** @type {State} */
     #state = State.stop;
     /** @type {Debug} */
@@ -71,11 +72,25 @@ export class Bootstrap {
     #debug = false;
     #slowMotion = 1;
 
+    /** @type {Event<number>} */
+    #onBeforePhysicsStep = this.createEvent("before_physics_step");
+    /** @type {Event<number>} */
+    #onAfterPhysicsStep = this.createEvent("after_physics_step");
+    /** @type {Event<number>} */
+    #onBeforeRenderStep = this.createEvent("before_render_step");
+    /** @type {Event<number>} */
+    #onAfterRenderStep = this.createEvent("after_render_step");
+
+    get onBeforePhysicsStep() {return this.#onBeforePhysicsStep;}
+    get onAfterPhysicsStep() {return this.#onAfterPhysicsStep;}
+    get onBeforeRenderStep() {return this.#onBeforeRenderStep;}
+    get onAfterRenderStep() {return this.#onAfterRenderStep;}
+
     get state() {return this.#state; }
 
     get renderer() { return this.#renderer; }
     get solver() { return this.#solver; }
-    get debug() {return this.#debugInstance;}
+    get debug() { return this.#debug ? this.#debugInstance : null; }
 
     /** @deprecated Use renderer instead */
     get canvas() { return this.#renderer.canvas; }
@@ -101,6 +116,7 @@ export class Bootstrap {
      * }} options
      */
     constructor(renderer, options = {}) {
+        super();
         this.#renderer = renderer;
 
         this.#slowMotion = 1;
@@ -416,14 +432,22 @@ export class Bootstrap {
         const delta = Math.max(0, Math.min(0.1, elapsed * this.#slowMotion));
         if (delta === 0) return;
 
+        this.onBeforePhysicsStep.emit(delta);
+
         for (const waiterCb of this.#physicsWaiters) waiterCb(delta);
         this.#physicsWaiters.clear();
 
         this.#particleSystem.step(delta);
         this.#solver.solve(delta);
+
+        this.onAfterPhysicsStep.emit(delta);
     }
 
     #render(delta) {
+        if (this.state === State.play) {
+            this.onBeforeRenderStep.emit(delta);
+        }
+
         if (!this.#debugInstance || this.#debugInstance.showBodies) {
             this.#renderer.render(this.state === State.play ? delta : 1e-12);
         } else {
@@ -433,6 +457,7 @@ export class Bootstrap {
         if (this.state === State.play) {
             for (const waiterCb of this.#renderWaiters) waiterCb(delta);
             this.#renderWaiters.clear();
+            this.onAfterRenderStep.emit(delta);
         }
 
         if (this.#debugInstance || this.#shapeId > 0) {

diff --git a/lib/render/renderer/webgl/objects/base.js b/lib/render/renderer/webgl/objects/base.js
@@ -10,7 +10,7 @@ export class IRenderObject {
     get body() {return this.#body;}
 
     /** @description Value within interval [-1;1] */
-    z = 1;
+    z = 0;
 
     /**
      * @abstract
@@ -30,7 +30,8 @@ export class IRenderObject {
     get key() {return this.geometry.key;}
     get group() {return this.constructor.name;}
 
-    get isIOpaque() {return true;}
+    /** @return {boolean} */
+    get isOpaque() {return true;}
 
     constructor(body) {
         this.#body = body;

diff --git a/lib/render/renderer/webgl/objects/common/colored.js b/lib/render/renderer/webgl/objects/common/colored.js
@@ -14,12 +14,12 @@ export class ColoredObject extends IRenderObject {
     get pointsCount() {}
 
     #colorComponents = null;
-    #color = "#000000";
+    #color = "#626262";
 
     opacity = 1;
 
     get color() {return this.#color;}
-    get isIOpaque() {return this.opacity === 1;}
+    get isOpaque() {return this.opacity === 1;}
 
     /**
      * @param {string} value

diff --git a/lib/render/renderer/webgl/objects/sprite.js b/lib/render/renderer/webgl/objects/sprite.js
@@ -8,6 +8,9 @@ export class SpriteObject extends ColoredObject {
     /*** @type {ITextureSource} */
     texture;
     scale = 1;
+    opaque = true;
+
+    get isOpaque() { return this.opaque && super.isOpaque; }
 
     constructor(body) {
         super(body);

diff --git a/lib/render/renderer/webgl/renderer.js b/lib/render/renderer/webgl/renderer.js
@@ -104,14 +104,14 @@ export class WebglRenderer extends IRenderer {
     #prepare() {
         for (const sets of this.#objectsByType.values()) {
             for (const obj of sets.opaque) {
-                if (!obj.isIOpaque) {
+                if (!obj.isOpaque) {
                     sets.opaque.delete(obj);
                     sets.transparent.add(obj);
                 }
             }
 
             for (const obj of sets.transparent) {
-                if (obj.isIOpaque) {
+                if (obj.isOpaque) {
                     sets.transparent.delete(obj);
                     sets.opaque.add(obj);
                 }
@@ -152,7 +152,7 @@ export class WebglRenderer extends IRenderer {
             this.#objectsByType.set(obj.group, sets);
         }
 
-        if (obj.isIOpaque) {
+        if (obj.isOpaque) {
             sets.opaque.add(obj);
         } else {
             sets.transparent.add(obj);