Skip to content
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

Addresses issue #6519 #6532

Closed
wants to merge 16 commits into from
Closed

Addresses issue #6519 #6532

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
00b13ff
Solves issue #6502
Garima3110 Oct 28, 2023
716732f
Merge branch 'processing:main' into main
Garima3110 Oct 30, 2023
e8d6626
Merge branch 'processing:main' into main
Garima3110 Oct 31, 2023
4dc77be
Merge branch 'processing:main' into main
Garima3110 Nov 4, 2023
9eb1671
Addresses issue #6519
Garima3110 Nov 6, 2023
fa7b5ef
resolving conflicts
Garima3110 Nov 6, 2023
850d94f
Merge branch 'processing:main' into perspective
Garima3110 Nov 10, 2023
9033c26
Resolving conflicts
Garima3110 Nov 10, 2023
b420f8e
Merge remote-tracking branch 'upstream/main' into perspective
Garima3110 Nov 10, 2023
d662e48
Merge branch 'main' of https://github.com/Garima3110/p5.js
Garima3110 Nov 10, 2023
e508b44
Merge branch 'perspective' of https://github.com/Garima3110/p5.js int…
Garima3110 Nov 10, 2023
9d478f3
Solves issue #6519
Garima3110 Nov 10, 2023
7ad21af
ClearColors method applied
perminder-17 Oct 26, 2023
fe9e39a
Resolving conflicts
Garima3110 Nov 11, 2023
e6d6901
Merge branch 'perspective' of https://github.com/Garima3110/p5.js int…
Garima3110 Nov 11, 2023
e445663
Merge remote-tracking branch 'origin' into perspective
Garima3110 Nov 11, 2023
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
31 changes: 23 additions & 8 deletions src/webgl/p5.Camera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,31 @@ p5.prototype.camera = function (...args) {
* vertical field of view, aspect ratio (usually width/height), and near and far
* clipping planes.
*
* If no parameters are given, the following default is used:
* perspective(PI/3, width/height, eyeZ/10, eyeZ*10),
* where eyeZ is equal to ((height/2) / tan(PI/6)).
* If no parameters are given, the default values are used, with a fixed location and a variable field of view.
* @method perspective
* @for p5
* @param {Number} [fovy] camera frustum vertical field of view,
* from bottom to top of view, in <a href="#/p5/angleMode">angleMode</a> units
* @param {Number} [aspect] camera frustum aspect ratio
* @param {Number} [near] frustum near plane length
* @param {Number} [far] frustum far plane length
* @param {Number} [fovy] - camera frustum vertical field of view,
* from bottom to top of view, in <a href="#/p5/angleMode">angleMode</a> units.
* The default value is now variable and based on the canvas size as:
* this.defaultEyeZ = 800;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of writing this as code, maybe we can write what's going on in plain English? i.e. we pick a field of view that ensures you can see exactly width pixels across horizontally and height pixels across vertically 800 units away from the camera.

* defaultCameraFOV = 2 * Math.atan(this._renderer.height / 2 / this.defaultEyeZ);
*
* @param {Number} [aspect] camera frustum aspect ratio .The default value = this._renderer.width / this._renderer.height;
* @param {Number} [near] frustum near plane length or the near clipping plane. The default value = this.defaultEyeZ * 0.1;
* @param {Number} [far] frustum far plane length or the far clipping plane. The default value = this.defaultEyeZ * 10;
*
* However,If you prefer a fixed field of view, you can use the old defaults:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than referring to these as the old defaults, we can motivate why someone might want to do this by starting with "If you want a fixed field of view". To ensure that you can see width across horizontally and height across vertically at that fixed field of view, you need to place your camera (height/2) / tan(fovy / 2) away from the subject, and ten go on to explain how the near/far values are derived from that.

*
* - Field of view: PI/3 (60 degrees)
* - Canvas aspect ratio: width / height
* - Near clipping plane: eyeZ / 10
* - Far clipping plane: eyeZ * 10
*
* @example
* Set a fixed field of view
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intended to be a new example with code?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intended to be a new example with code?

yes my bad , I thought of providing a separate example for the perspective function's syntax with the old default values. But now , i think there's no need of a separate example for this. I 'll just remove this one.

* perspective(PI/3, width / height, eyeZ / 10, eyeZ * 10);
* where eyeZ is equal to ((height/2) / tan(PI/6)).
*
* @chainable
* @example
* <div>
Expand Down
Loading