p5 2.0.1 → 2.0.3

package/dist/webgl/material.js

@@ -1,12 +1,12 @@
-import '../constants-C-g_eAdC.js';
-export { m as default } from '../rendering--aAe5aq3.js';
-import '../creating_reading-D4AAKRbx.js';
+import '../constants-BRcElHU3.js';
+export { m as default } from '../rendering-CvUVN-Vb.js';
+import '../creating_reading-Cr8L2Jnm.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../p5.Renderer-R23xoC7s.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';

package/dist/webgl/p5.Camera.js

@@ -1,17 +1,17 @@
 import '../math/p5.Matrix.js';
 import '../math/p5.Vector.js';
 import './p5.Quat.js';
-export { C as Camera, c as default } from '../rendering--aAe5aq3.js';
+export { C as Camera, c as default } from '../rendering-CvUVN-Vb.js';
 import '../math/Matrices/Matrix.js';
-import '../constants-C-g_eAdC.js';
+import '../constants-BRcElHU3.js';
 import '../math/Matrices/MatrixInterface.js';
-import '../creating_reading-D4AAKRbx.js';
+import '../creating_reading-Cr8L2Jnm.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../p5.Renderer-R23xoC7s.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';

package/dist/webgl/p5.Framebuffer.js

@@ -1,7 +1,7 @@
-import '../constants-C-g_eAdC.js';
-import '../creating_reading-D4AAKRbx.js';
-export { H as Framebuffer, E as FramebufferCamera, F as FramebufferTexture, f as default } from '../rendering--aAe5aq3.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../constants-BRcElHU3.js';
+import '../creating_reading-Cr8L2Jnm.js';
+export { H as Framebuffer, E as FramebufferCamera, F as FramebufferTexture, f as default } from '../rendering-CvUVN-Vb.js';
+import '../p5.Renderer-R23xoC7s.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';

package/dist/webgl/p5.Geometry.js

@@ -1,4 +1,4 @@
-import { F as FLAT, y as SMOOTH } from '../constants-C-g_eAdC.js';
+import { F as FLAT, y as SMOOTH } from '../constants-BRcElHU3.js';
 import { DataArray } from './p5.DataArray.js';
 import { Vector } from '../math/p5.Vector.js';
 

package/dist/webgl/p5.Quat.js

@@ -1,5 +1,5 @@
 import { Vector } from '../math/p5.Vector.js';
-import '../constants-C-g_eAdC.js';
+import '../constants-BRcElHU3.js';
 
 /**
  * @module Math

package/dist/webgl/p5.RendererGL.js

@@ -1,8 +1,8 @@
-import '../constants-C-g_eAdC.js';
+import '../constants-BRcElHU3.js';
 import './GeometryBuilder.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../p5.Renderer-R23xoC7s.js';
 import '../math/p5.Matrix.js';
-export { R as RendererGL, r as default, B as readPixelWebGL, A as readPixelsWebGL } from '../rendering--aAe5aq3.js';
+export { R as RendererGL, r as default, B as readPixelWebGL, A as readPixelsWebGL } from '../rendering-CvUVN-Vb.js';
 import '../math/p5.Vector.js';
 import './p5.RenderBuffer.js';
 import './p5.DataArray.js';
@@ -11,7 +11,7 @@ import './ShapeBuilder.js';
 import './GeometryBufferCache.js';
 import '../image/const.js';
 import '../shape/custom_shapes.js';
-import '../creating_reading-D4AAKRbx.js';
+import '../creating_reading-Cr8L2Jnm.js';
 import '../math/Matrices/Matrix.js';
 import './p5.Geometry.js';
 import '../math/Matrices/MatrixInterface.js';

package/dist/webgl/p5.Shader.js

@@ -1,12 +1,12 @@
-export { S as Shader, s as default } from '../rendering--aAe5aq3.js';
-import '../constants-C-g_eAdC.js';
-import '../creating_reading-D4AAKRbx.js';
+export { S as Shader, s as default } from '../rendering-CvUVN-Vb.js';
+import '../constants-BRcElHU3.js';
+import '../creating_reading-Cr8L2Jnm.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../p5.Renderer-R23xoC7s.js';
 import '../image/filters.js';
 import '../math/p5.Vector.js';
 import '../shape/custom_shapes.js';

package/dist/webgl/p5.Texture.js

@@ -1,11 +1,11 @@
-import '../constants-C-g_eAdC.js';
+import '../constants-BRcElHU3.js';
 import '../dom/p5.Element.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../p5.Renderer-R23xoC7s.js';
 import '../dom/p5.MediaElement.js';
-export { M as MipmapTexture, T as Texture, D as checkWebGLCapabilities, t as default } from '../rendering--aAe5aq3.js';
+export { M as MipmapTexture, T as Texture, D as checkWebGLCapabilities, t as default } from '../rendering-CvUVN-Vb.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../creating_reading-D4AAKRbx.js';
+import '../creating_reading-Cr8L2Jnm.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../image/filters.js';

package/dist/webgl/text.js

@@ -1,15 +1,15 @@
-import { T as TEXTURE } from '../constants-C-g_eAdC.js';
-import { R as RendererGL } from '../rendering--aAe5aq3.js';
+import { T as TEXTURE } from '../constants-BRcElHU3.js';
+import { R as RendererGL } from '../rendering-CvUVN-Vb.js';
 import { Vector } from '../math/p5.Vector.js';
 import { Geometry } from './p5.Geometry.js';
 import { Font, arrayCommandsToObjects } from '../type/p5.Font.js';
-import '../creating_reading-D4AAKRbx.js';
+import '../creating_reading-Cr8L2Jnm.js';
 import 'colorjs.io/fn';
 import '../color/color_spaces/hsb.js';
 import '../dom/p5.Element.js';
 import '../dom/p5.File.js';
 import '../io/p5.XML.js';
-import '../p5.Renderer-CwAYZOC2.js';
+import '../p5.Renderer-R23xoC7s.js';
 import '../image/filters.js';
 import '../shape/custom_shapes.js';
 import '../core/States.js';
@@ -49,24 +49,7 @@ import '@davepagurek/bezier-path';
 function text(p5, fn) {
   RendererGL.prototype.maxCachedGlyphs = function() {
     // TODO: use more than vibes to find a good value for this
-    return 200
-  };
-
-  RendererGL.prototype.freeGlyphInfo = function(gi) {
-    const datas = [
-      gi.strokeImageInfo.imageData,
-      gi.rowInfo.cellImageInfo.imageData,
-      gi.rowInfo.dimImageInfo.imageData,
-      gi.colInfo.cellImageInfo.imageData,
-      gi.colInfo.dimImageInfo.imageData,
-    ];
-    for (const data of datas) {
-      const tex = this.textures.get(data);
-      if (tex) {
-        tex.remove();
-        this.textures.delete(data);
-      }
-    }
+    return 200;
   };
 
   Font.prototype._getFontInfo = function(axs) {
@@ -834,7 +817,7 @@ function text(p5, fn) {
     sh.setUniform("uMaterialColor", curFillColor);
     gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
 
-    this.fontCache = this.fontCache || new Map();
+    this.glyphDataCache = this.glyphDataCache || new Set();
 
     try {
       // fetch the glyphs in the line of text
@@ -843,20 +826,35 @@ function text(p5, fn) {
       for (const glyph of glyphs) {
         const gi = fontInfo.getGlyphInfo(glyph);
         if (gi.uGlyphRect) {
+          const rowInfo = gi.rowInfo;
+          const colInfo = gi.colInfo;
 
-          const cacheKey = JSON.stringify({ font: font.id, axs, glyph: glyph.shape.g });
-          // Bump this font to the end of the cache list by deleting and re-adding it
-          this.fontCache.delete(cacheKey);
-          this.fontCache.set(cacheKey, gi);
-          if (this.fontCache.size > this.maxCachedGlyphs()) {
-            const keyToRemove = this.fontCache.keys().next().value;
-            const val = this.fontCache.get(keyToRemove);
-            this.fontCache.delete(keyToRemove);
-            this.freeGlyphInfo(val);
+          // Bump the resources for this glyph to the end of the cache list by deleting and re-adding
+          const glyphResources = [
+            gi.strokeImageInfo.imageData,
+            rowInfo.cellImageInfo.imageData,
+            rowInfo.dimImageInfo.imageData,
+            colInfo.cellImageInfo.imageData,
+            colInfo.dimImageInfo.imageData
+          ];
+          for (const resource of glyphResources) {
+            this.glyphDataCache.delete(resource);
+            this.glyphDataCache.add(resource);
+          }
+
+          // If we have too many glyph textures, remove the least recently used
+          // ones from GPU memory. The data still exists on the CPU and will be
+          // re-uploaded if it gets actively used again.
+          while (this.glyphDataCache.size > this.maxCachedGlyphs()) {
+            const data = this.glyphDataCache.values().next().value;
+            this.glyphDataCache.delete(data);
+            const tex = this.textures.get(data);
+            if (tex) {
+              tex.remove();
+              this.textures.delete(data);
+            }
           }
 
-          const rowInfo = gi.rowInfo;
-          const colInfo = gi.colInfo;
           sh.setUniform("uSamplerStrokes", gi.strokeImageInfo.imageData);
           sh.setUniform("uSamplerRowStrokes", rowInfo.cellImageInfo.imageData);
           sh.setUniform("uSamplerRows", rowInfo.dimImageInfo.imageData);