Skip to content

ExtrudeGeometry: Fix regression introduced by #30750. #30822

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
Mugen87 merged 6 commits into from
Mar 31, 2025
Merged

ExtrudeGeometry: Fix regression introduced by #30750. #30822

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3d0045
Fix vertex lists not being generated correctly when bevelSegments == 0
mlasala45 Mar 29, 2025
4f133bf
Removed superfluous scope block around new code
mlasala45 Mar 29, 2025
58bb79d
Fixed using the wrong variable to populate contractedContourVertices
mlasala45 Mar 30, 2025
9091141
Restructured fix for efficiency and clarity
mlasala45 Mar 30, 2025
fc809e3
Update ExtrudeGeometry.js
Mugen87 Mar 31, 2025
8eecc07
Update ExtrudeGeometry.js
Mugen87 Mar 31, 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
64 changes: 37 additions & 27 deletions src/geometries/ExtrudeGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,53 +393,63 @@ class ExtrudeGeometry extends BufferGeometry {

}

const contractedContourVertices = [];
const expandedHoleVertices = [];
let faces;

// Loop bevelSegments, 1 for the front, 1 for the back
if ( bevelSegments === 0 ) {

for ( let b = 0; b < bevelSegments; b ++ ) {
faces = ShapeUtils.triangulateShape( contour, holes );

//for ( b = bevelSegments; b > 0; b -- ) {
} else {

const t = b / bevelSegments;
const z = bevelThickness * Math.cos( t * Math.PI / 2 );
const bs = bevelSize * Math.sin( t * Math.PI / 2 ) + bevelOffset;
const contractedContourVertices = [];
const expandedHoleVertices = [];

// contract shape
// Loop bevelSegments, 1 for the front, 1 for the back

for ( let i = 0, il = contour.length; i < il; i ++ ) {
for ( let b = 0; b < bevelSegments; b ++ ) {

const vert = scalePt2( contour[ i ], contourMovements[ i ], bs );
//for ( b = bevelSegments; b > 0; b -- ) {

v( vert.x, vert.y, - z );
if ( t == 0 ) contractedContourVertices.push( vert );
const t = b / bevelSegments;
const z = bevelThickness * Math.cos( t * Math.PI / 2 );
const bs = bevelSize * Math.sin( t * Math.PI / 2 ) + bevelOffset;

}
// contract shape

// expand holes

for ( let h = 0, hl = numHoles; h < hl; h ++ ) {
for ( let i = 0, il = contour.length; i < il; i ++ ) {

const ahole = holes[ h ];
oneHoleMovements = holesMovements[ h ];
const oneHoleVertices = [];
for ( let i = 0, il = ahole.length; i < il; i ++ ) {

const vert = scalePt2( ahole[ i ], oneHoleMovements[ i ], bs );
const vert = scalePt2( contour[ i ], contourMovements[ i ], bs );

v( vert.x, vert.y, - z );
if ( t == 0 ) oneHoleVertices.push( vert );
if ( t === 0 ) contractedContourVertices.push( vert );

}

if ( t == 0 ) expandedHoleVertices.push( oneHoleVertices );
// expand holes

for ( let h = 0, hl = numHoles; h < hl; h ++ ) {

const ahole = holes[ h ];
oneHoleMovements = holesMovements[ h ];
const oneHoleVertices = [];
for ( let i = 0, il = ahole.length; i < il; i ++ ) {

const vert = scalePt2( ahole[ i ], oneHoleMovements[ i ], bs );

v( vert.x, vert.y, - z );
if ( t === 0 ) oneHoleVertices.push( vert );

}

if ( t === 0 ) expandedHoleVertices.push( oneHoleVertices );

}

}

}
faces = ShapeUtils.triangulateShape( contractedContourVertices, expandedHoleVertices );

const faces = ShapeUtils.triangulateShape( contractedContourVertices, expandedHoleVertices );
}

const flen = faces.length;

Expand Down