Refactor some WebGL sections to try to fix tests

src/core/p5.Graphics.js

@@ -634,7 +634,7 @@ p5.Graphics = class Graphics {
  * </div>
  */
  createFramebuffer(options) {
- return new p5.Framebuffer(this, options);
+ return new p5.Framebuffer(this._pInst, options);
  }
 };
 

src/core/p5.Renderer2D.js

@@ -80,11 +80,7 @@ class Renderer2D extends Renderer {
  getFilterGraphicsLayer() {
  // create hidden webgl renderer if it doesn't exist
  if (!this.filterGraphicsLayer) {
- // the real _pInst is buried when this is a secondary p5.Graphics
- const pInst =
- this._pInst instanceof p5.Graphics ?
- this._pInst._pInst :
- this._pInst;
+ const pInst = this._pInst;
 
  // create secondary layer
  this.filterGraphicsLayer =

src/webgl/3d_primitives.js

@@ -3408,10 +3408,10 @@ p5.RendererGL.prototype.image = function(
 
  this._pInst.push();
 
- this._pInst.noLights();
+ this.noLights();
  this._pInst.noStroke();
 
- this._pInst.texture(img);
+ this.texture(img);
  this._pInst.textureMode(constants.NORMAL);
 
  let u0 = 0;

src/webgl/light.js

@@ -1744,34 +1744,38 @@ p5.prototype.noLights = function (...args) {
  this._assert3d('noLights');
  p5._validateParameters('noLights', args);
 
- this._renderer.states.activeImageLight = null;
- this._renderer.states._enableLighting = false;
-
- this._renderer.states.ambientLightColors.length = 0;
- this._renderer.states.specularColors = [1, 1, 1];
-
- this._renderer.states.directionalLightDirections.length = 0;
- this._renderer.states.directionalLightDiffuseColors.length = 0;
- this._renderer.states.directionalLightSpecularColors.length = 0;
-
- this._renderer.states.pointLightPositions.length = 0;
- this._renderer.states.pointLightDiffuseColors.length = 0;
- this._renderer.states.pointLightSpecularColors.length = 0;
-
- this._renderer.states.spotLightPositions.length = 0;
- this._renderer.states.spotLightDirections.length = 0;
- this._renderer.states.spotLightDiffuseColors.length = 0;
- this._renderer.states.spotLightSpecularColors.length = 0;
- this._renderer.states.spotLightAngle.length = 0;
- this._renderer.states.spotLightConc.length = 0;
-
- this._renderer.states.constantAttenuation = 1;
- this._renderer.states.linearAttenuation = 0;
- this._renderer.states.quadraticAttenuation = 0;
- this._renderer.states._useShininess = 1;
- this._renderer.states._useMetalness = 0;
+ this._renderer.noLights();
 
  return this;
 };
 
+p5.RendererGL.prototype.noLights = function() {
+ this.states.activeImageLight = null;
+ this.states._enableLighting = false;
+
+ this.states.ambientLightColors.length = 0;
+ this.states.specularColors = [1, 1, 1];
+
+ this.states.directionalLightDirections.length = 0;
+ this.states.directionalLightDiffuseColors.length = 0;
+ this.states.directionalLightSpecularColors.length = 0;
+
+ this.states.pointLightPositions.length = 0;
+ this.states.pointLightDiffuseColors.length = 0;
+ this.states.pointLightSpecularColors.length = 0;
+
+ this.states.spotLightPositions.length = 0;
+ this.states.spotLightDirections.length = 0;
+ this.states.spotLightDiffuseColors.length = 0;
+ this.states.spotLightSpecularColors.length = 0;
+ this.states.spotLightAngle.length = 0;
+ this.states.spotLightConc.length = 0;
+
+ this.states.constantAttenuation = 1;
+ this.states.linearAttenuation = 0;
+ this.states.quadraticAttenuation = 0;
+ this.states._useShininess = 1;
+ this.states._useMetalness = 0;
+}
+
 export default p5;

src/webgl/material.js

@@ -1892,14 +1892,18 @@ p5.prototype.texture = function (tex) {
  tex._animateGif(this);
  }
 
- this._renderer.states.drawMode = constants.TEXTURE;
- this._renderer.states._useNormalMaterial = false;
- this._renderer.states._tex = tex;
- this._renderer.states.doFill = true;
+ this._renderer.texture(tex);
 
  return this;
 };
 
+p5.RendererGL.prototype.texture = function(tex) {
+ this.states.drawMode = constants.TEXTURE;
+ this.states._useNormalMaterial = false;
+ this.states._tex = tex;
+ this.states.doFill = true;
+}
+
 /**
  * Changes the coordinate system used for textures when they’re applied to
  * custom shapes.

src/webgl/p5.RendererGL.js

@@ -438,6 +438,11 @@ p5.RendererGL = class RendererGL extends Renderer {
 
  // Create new canvas
  this.canvas = this.elt = elt || document.createElement('canvas');
+ this._initContext();
+ // This redundant property is useful in reminding you that you are
+ // interacting with WebGLRenderingContext, still worth considering future removal
+ this.GL = this.drawingContext;
+ this._pInst.drawingContext = this.drawingContext;
 
  if (this._isMainCanvas) {
  // for pixel method sharing with pimage
@@ -450,11 +455,26 @@ p5.RendererGL = class RendererGL extends Renderer {
  this.elt.id = 'defaultCanvas0';
  this.elt.classList.add('p5Canvas');
 
+ const dimensions = this._adjustDimensions(w, h);
+ w = dimensions.adjustedWidth;
+ h = dimensions.adjustedHeight;
+
+ this.width = w;
+ this.height = h;
+
  // Set canvas size
  this.elt.width = w * this._pixelDensity;
  this.elt.height = h * this._pixelDensity;
  this.elt.style.width = `${w}px`;
  this.elt.style.height = `${h}px`;
+ this._origViewport = {
+ width: this.GL.drawingBufferWidth,
+ height: this.GL.drawingBufferHeight
+ };
+ this.viewport(
+ this._origViewport.width,
+ this._origViewport.height
+ );
 
  // Attach canvas element to DOM
  if (this._pInst._userNode) {
@@ -471,17 +491,11 @@ p5.RendererGL = class RendererGL extends Renderer {
  }
 
  this._setAttributeDefaults(pInst);
- this._initContext();
  this.isP3D = true; //lets us know we're in 3d mode
 
  // When constructing a new p5.Geometry, this will represent the builder
  this.geometryBuilder = undefined;
 
- // This redundant property is useful in reminding you that you are
- // interacting with WebGLRenderingContext, still worth considering future removal
- this.GL = this.drawingContext;
- this._pInst.drawingContext = this.drawingContext;
-
  // Push/pop state
  this.states.uModelMatrix = new p5.Matrix();
  this.states.uViewMatrix = new p5.Matrix();
@@ -786,7 +800,7 @@ p5.RendererGL = class RendererGL extends Renderer {
  }
 
  _initContext() {
- if (this._pInst._glAttributes.version !== 1) {
+ if (this._pInst._glAttributes?.version !== 1) {
  // Unless WebGL1 is explicitly asked for, try to create a WebGL2 context
  this.drawingContext =
  this.canvas.getContext('webgl2', this._pInst._glAttributes);