Skip to content

Triangle: Return null in getBarycoord() if the triangle is degenerated. #27311

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

Merged
merged 6 commits into from
Dec 6, 2023
Merged

Triangle: Return null in getBarycoord() if the triangle is degenerated. #27311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a3d9b3
BatchedMesh: Add sorting and frustum culling for shadows
gkjohnson Nov 27, 2023
16b102c
Triangle.getBarycoord: throw error if a degenerate triangle is used
gkjohnson Dec 5, 2023
08dae56
Merge remote-tracking branch 'mrdoob/dev' into barycoord-error
gkjohnson Dec 5, 2023
398f9b9
Return null, instead
gkjohnson Dec 5, 2023
dae8969
Fix test
gkjohnson Dec 5, 2023
28ff6fb
Fix containsPoint
gkjohnson Dec 5, 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
2 changes: 1 addition & 1 deletion docs/api/en/math/Triangle.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ <h3>
[page:Vector3 target] — the result will be copied into this Vector3.<br /><br />

Return a [link:https://en.wikipedia.org/wiki/Barycentric_coordinate_system barycentric coordinate]
from the given vector. <br /><br />
from the given vector. Returns null if the triangle is degenerate.<br /><br />

[link:http://commons.wikimedia.org/wiki/File:Barycentric_coordinates_1.png Picture of barycentric coordinates]
</p>
Expand Down
12 changes: 8 additions & 4 deletions src/math/Triangle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ class Triangle {
// collinear or singular triangle
if ( denom === 0 ) {

// arbitrary location outside of triangle?
// not sure if this is the best idea, maybe should be returning undefined
return target.set( - 2, - 1, - 1 );
target.set( 0, 0, 0 );
return null;

}

Expand All @@ -77,7 +76,12 @@ class Triangle {

static containsPoint( point, a, b, c ) {

this.getBarycoord( point, a, b, c, _v3 );
// if the triangle is degenerate then we can't contain a point
if ( this.getBarycoord( point, a, b, c, _v3 ) === null ) {

return false;

}

return ( _v3.x >= 0 ) && ( _v3.y >= 0 ) && ( ( _v3.x + _v3.y ) <= 1 );

Expand Down
10 changes: 3 additions & 7 deletions test/unit/src/math/Triangle.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,12 @@ export default QUnit.module( 'Maths', () => {

let a = new Triangle();

const bad = new Vector3( - 2, - 1, - 1 );
const barycoord = new Vector3();
const midpoint = new Vector3();

a.getBarycoord( a.a, barycoord );
assert.ok( barycoord.equals( bad ), 'Passed!' );
a.getBarycoord( a.b, barycoord );
assert.ok( barycoord.equals( bad ), 'Passed!' );
a.getBarycoord( a.c, barycoord );
assert.ok( barycoord.equals( bad ), 'Passed!' );
assert.ok( a.getBarycoord( a.a, barycoord ) === null, 'Passed!' );
assert.ok( a.getBarycoord( a.b, barycoord ) === null, 'Passed!' );
assert.ok( a.getBarycoord( a.c, barycoord ) === null, 'Passed!' );

a = new Triangle( new Vector3( 0, 0, 0 ), new Vector3( 1, 0, 0 ), new Vector3( 0, 1, 0 ) );
a.getMidpoint( midpoint );
Expand Down