Skip to content

Fix build*Shader methods to pass context parameter for instance mode #8537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
esca-A wants to merge 1 commit into from
Closed

Fix build*Shader methods to pass context parameter for instance mode #8537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/webgl/material.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1567,8 +1567,8 @@ function material(p5, fn) {
* @param {Object} hooks An object specifying p5.strands hooks in GLSL.
* @returns {p5.Shader} The material shader.
*/
fn.buildMaterialShader = function (cb) {
return this.baseMaterialShader().modify(cb);
fn.buildMaterialShader = function (cb, context) {
return this.baseMaterialShader().modify(cb, context);
};

/**
Expand Down Expand Up @@ -1631,7 +1631,7 @@ function material(p5, fn) {
fn.loadMaterialShader = async function (url, onSuccess, onFail) {
try {
const cb = await urlToStrandsCallback(url);
let shader = withGlobalStrands(this, () => this.buildMaterialShader(cb));
let shader = withGlobalStrands(this, () => this.buildMaterialShader(cb, context));
if (onSuccess) {
shader = onSuccess(shader) || shader;
}
Expand Down Expand Up @@ -1783,8 +1783,8 @@ function material(p5, fn) {
* @param {Object} hooks An object specifying p5.strands hooks in GLSL.
* @returns {p5.Shader} The normal shader.
*/
fn.buildNormalShader = function (cb) {
return this.baseNormalShader().modify(cb);
fn.buildNormalShader = function (cb, context) {
return this.baseNormalShader().modify(cb, context);
};

/**
Expand Down Expand Up @@ -1849,7 +1849,7 @@ function material(p5, fn) {
try {
const cb = await urlToStrandsCallback(url);
let shader = this.withGlobalStrands(this, () =>
this.buildNormalShader(cb),
this.buildNormalShader(cb, this),
);
if (onSuccess) {
shader = onSuccess(shader) || shader;
Expand Down Expand Up @@ -1947,8 +1947,8 @@ function material(p5, fn) {
* @param {Object} hooks An object specifying p5.strands hooks in GLSL.
* @returns {p5.Shader} The color shader.
*/
fn.buildColorShader = function (cb) {
return this.baseColorShader().modify(cb);
fn.buildColorShader = function (cb, context) {
return this.baseColorShader().modify(cb, context);
};

/**
Expand Down Expand Up @@ -2012,7 +2012,7 @@ function material(p5, fn) {
fn.loadColorShader = async function (url, onSuccess, onFail) {
try {
const cb = await urlToStrandsCallback(url);
let shader = withGlobalStrands(this, () => this.buildColorShader(cb));
let shader = withGlobalStrands(this, () => this.buildColorShader(cb, this));
if (onSuccess) {
shader = onSuccess(shader) || shader;
}
Expand Down Expand Up @@ -2202,8 +2202,8 @@ function material(p5, fn) {
* @param {Object} hooks An object specifying p5.strands hooks in GLSL.
* @returns {p5.Shader} The stroke shader.
*/
fn.buildStrokeShader = function (cb) {
return this.baseStrokeShader().modify(cb);
fn.buildStrokeShader = function (cb, context) {
return this.baseStrokeShader().modify(cb, context);
};

/**
Expand Down Expand Up @@ -2271,7 +2271,7 @@ function material(p5, fn) {
fn.loadStrokeShader = async function (url, onSuccess, onFail) {
try {
const cb = await urlToStrandsCallback(url);
let shader = withGlobalStrands(this, () => this.buildStrokeShader(cb));
let shader = withGlobalStrands(this, () => this.buildStrokeShader(cb, this));
if (onSuccess) {
shader = onSuccess(shader) || shader;
}
Expand Down