Add whole-module addon for webgpu, prevent duplicate addon registers

Author: davepagurek

src/core/main.js

@@ -172,9 +172,16 @@ class p5 {
     return this._renderer.drawingContext;
   }
 
+  static _registeredAddons = new Set();
   static registerAddon(addon) {
     const lifecycles = {};
 
+    // Don't re-register an addon. This allows addons
+    // to register dependency addons without worrying about
+    // them getting double-added.
+    if (p5._registeredAddons.has(addon)) return;
+    p5._registeredAddons.add(addon);
+
     addon(p5, p5.prototype, lifecycles);
 
     const validLifecycles = Object.keys(p5.lifecycleHooks);

src/webgl/index.js

@@ -17,21 +17,21 @@ import rendererGL from './p5.RendererGL';
 import strands from '../strands/p5.strands';
 
 export default function(p5){
-  rendererGL(p5, p5.prototype);
-  primitives3D(p5, p5.prototype);
-  interaction(p5, p5.prototype);
-  light(p5, p5.prototype);
-  loading(p5, p5.prototype);
-  material(p5, p5.prototype);
-  text(p5, p5.prototype);
-  renderBuffer(p5, p5.prototype);
-  quat(p5, p5.prototype);
-  matrix(p5, p5.prototype);
-  geometry(p5, p5.prototype);
-  camera(p5, p5.prototype);
-  framebuffer(p5, p5.prototype);
-  dataArray(p5, p5.prototype);
-  shader(p5, p5.prototype);
-  texture(p5, p5.prototype);
-  strands(p5, p5.prototype);
+  p5.registerAddon(rendererGL);
+  p5.registerAddon(primitives3D);
+  p5.registerAddon(interaction);
+  p5.registerAddon(light);
+  p5.registerAddon(loading);
+  p5.registerAddon(material);
+  p5.registerAddon(text);
+  p5.registerAddon(renderBuffer);
+  p5.registerAddon(quat);
+  p5.registerAddon(matrix);
+  p5.registerAddon(geometry);
+  p5.registerAddon(camera);
+  p5.registerAddon(framebuffer);
+  p5.registerAddon(dataArray);
+  p5.registerAddon(shader);
+  p5.registerAddon(texture);
+  p5.registerAddon(strands);
 }

src/webgpu/index.js

@@ -0,0 +1,37 @@
+import primitives3D from '../webgl/3d_primitives';
+import interaction from '../webgl/interaction';
+import light from '../webgl/light';
+import loading from '../webgl/loading';
+import material from '../webgl/material';
+import text from '../webgl/text';
+import renderBuffer from '../webgl/p5.RenderBuffer';
+import quat from '../webgl/p5.Quat';
+import matrix from '../math/p5.Matrix';
+import geometry from '../webgl/p5.Geometry';
+import framebuffer from '../webgl/p5.Framebuffer';
+import dataArray from '../webgl/p5.DataArray';
+import shader from '../webgl/p5.Shader';
+import camera from '../webgl/p5.Camera';
+import texture from '../webgl/p5.Texture';
+import rendererGL from '../webgl/p5.RendererGL';
+import strands from '../strands/p5.strands';
+
+export default function(p5){
+  p5.registerAddon(rendererGL);
+  p5.registerAddon(primitives3D);
+  p5.registerAddon(interaction);
+  p5.registerAddon(light);
+  p5.registerAddon(loading);
+  p5.registerAddon(material);
+  p5.registerAddon(text);
+  p5.registerAddon(renderBuffer);
+  p5.registerAddon(quat);
+  p5.registerAddon(matrix);
+  p5.registerAddon(geometry);
+  p5.registerAddon(camera);
+  p5.registerAddon(framebuffer);
+  p5.registerAddon(dataArray);
+  p5.registerAddon(shader);
+  p5.registerAddon(texture);
+  p5.registerAddon(strands);
+}

src/webgpu/p5.RendererWebGPU.js

@@ -1939,3 +1939,7 @@ function rendererWebGPU(p5, fn) {
 
 export default rendererWebGPU;
 export { RendererWebGPU };
+
+if (typeof p5 !== "undefined") {
+  rendererWebGPU(p5, p5.prototype);
+}