Skip to content

fix: add parameter count validation to directionalLight() and pointLight() (fixes #8581) #8582

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

Open
MASTERsj01 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −4
Open

fix: add parameter count validation to directionalLight() and pointLight() (fixes #8581) #8582

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
25 changes: 21 additions & 4 deletions src/webgl/light.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,16 @@ p5.prototype.directionalLight = function (v1, v2, v3, x, y, z) {
this._assert3d('directionalLight');
p5._validateParameters('directionalLight', arguments);

//@TODO: check parameters number
const args = arguments.length;
if (args !== 2 && args !== 4 && args !== 6) {
p5._friendlyError(
'directionalLight() expects 2, 4, or 6 arguments, but received ' + args + '. ' +
'Accepted forms: (color, direction), (v1, v2, v3, direction), (color, x, y, z), or (v1, v2, v3, x, y, z).',
'directionalLight'
);
return this;
}

let color;
if (v1 instanceof p5.Color) {
color = v1;
Expand Down Expand Up @@ -917,7 +926,16 @@ p5.prototype.pointLight = function (v1, v2, v3, x, y, z) {
this._assert3d('pointLight');
p5._validateParameters('pointLight', arguments);

//@TODO: check parameters number
const args = arguments.length;
if (args !== 2 && args !== 4 && args !== 6) {
p5._friendlyError(
'pointLight() expects 2, 4, or 6 arguments, but received ' + args + '. ' +
'Accepted forms: (color, position), (v1, v2, v3, position), (color, x, y, z), or (v1, v2, v3, x, y, z).',
'pointLight'
);
return this;
}

let color;
if (v1 instanceof p5.Color) {
color = v1;
Expand Down Expand Up @@ -1637,8 +1655,7 @@ p5.prototype.spotLight = function (

default:
console.warn(
`Sorry, input for spotlight() is not in prescribed format. Too ${
length < 3 ? 'few' : 'many'
`Sorry, input for spotlight() is not in prescribed format. Too ${length < 3 ? 'few' : 'many'
} arguments were provided`
);
return this;
Expand Down