Skip to content

Fixed camera tilt up vector #7702

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

Draft
Forchapeatl wants to merge 10 commits into
base: dev-2.0
Choose a base branch
from
Draft

Fixed camera tilt up vector #7702

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0dd073b
Fixed camera tilt up vector
Forchapeatl Apr 5, 2025
b3b2b50
Removed P5 Vector
Forchapeatl Apr 6, 2025
fb8672c
Fixed syntax error
Forchapeatl Apr 6, 2025
517946d
Fixed failed tests
Forchapeatl Apr 6, 2025
80cf66e
Added test on Rotated Up Vector
Forchapeatl Apr 6, 2025
9199cd9
Remove P5 Vector
Forchapeatl Apr 6, 2025
ff0c805
Update p5.Camera.js
Forchapeatl Apr 6, 2025
f7c9c8c
Update p5.Camera.js
Forchapeatl Apr 6, 2025
bd240a7
Update p5.Camera.js tests
Forchapeatl Apr 6, 2025
91d8260
reverted changes
Forchapeatl Apr 6, 2025
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
Prev Previous commit
Next Next commit
Remove P5 Vector
  • Loading branch information
@Forchapeatl
Forchapeatl authored Apr 6, 2025
commit 9199cd94bdd29aa3babd3c3bef78bdb42d839111
123 changes: 78 additions & 45 deletions test/unit/webgl/p5.Camera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,51 +290,84 @@
});

suite('Camera Tilt and Up Vector', function() {
test('Tilt() correctly updates the up vector', function() {
var orig = getVals(myCam); // Store original camera values

// Apply tilt to the camera
myCam.tilt(30); // Tilt by 30 degrees
// Compute expected up vector (normalized)
let forward = myp5.createVector(
myCam.centerX - myCam.eyeX,
myCam.centerY - myCam.eyeY,
myCam.centerZ - myCam.eyeZ
);
let up = myp5.createVector(orig.ux, orig.uy, orig.uz);
let right = p5.Vector.cross(forward, up);
let expectedUp = p5.Vector.cross(right, forward).normalize();
// Verify that the up vector has changed
assert.notStrictEqual(myCam.upX, orig.ux, 'upX should be updated');
assert.notStrictEqual(myCam.upY, orig.uy, 'upY should be updated');
assert.notStrictEqual(myCam.upZ, orig.uz, 'upZ should be updated');
// Verify up vector matches expected values within a small margin of error
assert.closeTo(myCam.upX, expectedUp.x, 0.001, 'upX mismatch');
assert.closeTo(myCam.upY, expectedUp.y, 0.001, 'upY mismatch');
assert.closeTo(myCam.upZ, expectedUp.z, 0.001, 'upZ mismatch');
});

test('Tilt() with negative angle correctly updates the up vector', function() {
var orig = getVals(myCam); // Store original camera values
myCam.tilt(-30); // Tilt by -30 degrees
// Compute expected up vector (normalized)
let forward = myp5.createVector(
myCam.centerX - myCam.eyeX,
myCam.centerY - myCam.eyeY,
myCam.centerZ - myCam.eyeZ
);
let up = myp5.createVector(orig.ux, orig.uy, orig.uz);
let right = p5.Vector.cross(forward, up);
let expectedUp = p5.Vector.cross(right, forward).normalize();
// Verify that the up vector has changed
assert.notStrictEqual(myCam.upX, orig.ux, 'upX should be updated');
assert.notStrictEqual(myCam.upY, orig.uy, 'upY should be updated');
assert.notStrictEqual(myCam.upZ, orig.uz, 'upZ should be updated');
// Verify up vector matches expected values within a small margin of error
assert.closeTo(myCam.upX, expectedUp.x, 0.001, 'upX mismatch');
assert.closeTo(myCam.upY, expectedUp.y, 0.001, 'upY mismatch');
assert.closeTo(myCam.upZ, expectedUp.z, 0.001, 'upZ mismatch');
});
test('Tilt() correctly updates the up vector', function() {
var orig = getVals(myCam); // Store original camera values
// Apply tilt to the camera
myCam.tilt(30); // Tilt by 30 degrees

// Compute expected up vector without p5.Vector
let forwardX = myCam.centerX - myCam.eyeX;
let forwardY = myCam.centerY - myCam.eyeY;
let forwardZ = myCam.centerZ - myCam.eyeZ;

let upX = orig.ux;
let upY = orig.uy;
let upZ = orig.uz;

let rightX = forwardY * upZ - forwardZ * upY;
let rightY = forwardZ * upX - forwardX * upZ;
let rightZ = forwardX * upY - forwardY * upX;

// Now compute expected up vector (normalize)
let expectedUpX = rightY * forwardZ - rightZ * forwardY;
let expectedUpY = rightZ * forwardX - rightX * forwardZ;
let expectedUpZ = rightX * forwardY - rightY * forwardX;

// Normalize the expected up vector
let length = Math.sqrt(expectedUpX * expectedUpX + expectedUpY * expectedUpY + expectedUpZ * expectedUpZ);
expectedUpX /= length;
expectedUpY /= length;
expectedUpZ /= length;

// Verify that the up vector has changed
assert.notStrictEqual(myCam.upX, orig.ux, 'upX should be updated');

Check failure on line 323 in test/unit/webgl/p5.Camera.js

View workflow job for this annotation

GitHub Actions / test

test/unit/webgl/p5.Camera.js > p5.Camera > Camera Tilt and Up Vector > Tilt() correctly updates the up vector 

AssertionError: upX should be updated: expected +0 to not equal +0
 ❯ test/unit/webgl/p5.Camera.js:323:18
assert.notStrictEqual(myCam.upY, orig.uy, 'upY should be updated');
assert.notStrictEqual(myCam.upZ, orig.uz, 'upZ should be updated');

// Verify up vector matches expected values within a small margin of error
assert.closeTo(myCam.upX, expectedUpX, 0.001, 'upX mismatch');
assert.closeTo(myCam.upY, expectedUpY, 0.001, 'upY mismatch');
assert.closeTo(myCam.upZ, expectedUpZ, 0.001, 'upZ mismatch');
});

test('Tilt() with negative angle correctly updates the up vector', function() {
var orig = getVals(myCam); // Store original camera values
myCam.tilt(-30); // Tilt by -30 degrees

// Compute expected up vector without p5.Vector
let forwardX = myCam.centerX - myCam.eyeX;
let forwardY = myCam.centerY - myCam.eyeY;
let forwardZ = myCam.centerZ - myCam.eyeZ;

let upX = orig.ux;
let upY = orig.uy;
let upZ = orig.uz;

let rightX = forwardY * upZ - forwardZ * upY;
let rightY = forwardZ * upX - forwardX * upZ;
let rightZ = forwardX * upY - forwardY * upX;

// Now compute expected up vector (normalize)
let expectedUpX = rightY * forwardZ - rightZ * forwardY;
let expectedUpY = rightZ * forwardX - rightX * forwardZ;
let expectedUpZ = rightX * forwardY - rightY * forwardX;

// Normalize the expected up vector
let length = Math.sqrt(expectedUpX * expectedUpX + expectedUpY * expectedUpY + expectedUpZ * expectedUpZ);
expectedUpX /= length;
expectedUpY /= length;
expectedUpZ /= length;

// Verify that the up vector has changed
assert.notStrictEqual(myCam.upX, orig.ux, 'upX should be updated');

Check failure on line 362 in test/unit/webgl/p5.Camera.js

View workflow job for this annotation

GitHub Actions / test

test/unit/webgl/p5.Camera.js > p5.Camera > Camera Tilt and Up Vector > Tilt() with negative angle correctly updates the up vector 

AssertionError: upX should be updated: expected +0 to not equal +0
 ❯ test/unit/webgl/p5.Camera.js:362:18
assert.notStrictEqual(myCam.upY, orig.uy, 'upY should be updated');
assert.notStrictEqual(myCam.upZ, orig.uz, 'upZ should be updated');

// Verify up vector matches expected values within a small margin of error
assert.closeTo(myCam.upX, expectedUpX, 0.001, 'upX mismatch');
assert.closeTo(myCam.upY, expectedUpY, 0.001, 'upY mismatch');
assert.closeTo(myCam.upZ, expectedUpZ, 0.001, 'upZ mismatch');
});
});

suite('Rotation with angleMode(DEGREES)', function() {
Expand Down
Loading