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

BufferGeometry: Fix clone(). #22566

Merged
merged 1 commit into from
Sep 22, 2021
Merged

BufferGeometry: Fix clone(). #22566

Show file tree
Hide file tree
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
28 changes: 4 additions & 24 deletions src/core/BufferGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,31 +1004,7 @@ class BufferGeometry extends EventDispatcher {

clone() {

/*
// Handle primitives

const parameters = this.parameters;

if ( parameters !== undefined ) {

const values = [];

for ( const key in parameters ) {

values.push( parameters[ key ] );

}

const geometry = Object.create( this.constructor.prototype );
this.constructor.apply( geometry, values );
return geometry;

}

return new this.constructor().copy( this );
*/

return new BufferGeometry().copy( this );

}

Expand Down Expand Up @@ -1133,6 +1109,10 @@ class BufferGeometry extends EventDispatcher {

this.userData = source.userData;

// geometry generator parameters

if ( source.parameters !== undefined ) this.parameters = Object.assign( {}, source.parameters );

return this;

}
Expand Down
2 changes: 1 addition & 1 deletion src/geometries/PolyhedronGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Vector2 } from '../math/Vector2.js';

class PolyhedronGeometry extends BufferGeometry {

constructor( vertices, indices, radius = 1, detail = 0 ) {
constructor( vertices = [], indices = [], radius = 1, detail = 0 ) {
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved

super();

Expand Down
39 changes: 3 additions & 36 deletions test/unit/utils/qunit-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,18 @@ function checkGeometryClone( geom ) {
QUnit.assert.notEqual( copy.uuid, geom.uuid, "clone uuid should differ from original" );
QUnit.assert.notEqual( copy.id, geom.id, "clone id should differ from original" );

var excludedProperties = [ 'parameters', 'widthSegments', 'heightSegments', 'depthSegments' ];

var differingProp = getDifferingProp( geom, copy, excludedProperties );
var differingProp = getDifferingProp( geom, copy );
QUnit.assert.ok( differingProp === undefined, 'properties are equal' );

differingProp = getDifferingProp( copy, geom, excludedProperties );
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved
differingProp = getDifferingProp( copy, geom );
QUnit.assert.ok( differingProp === undefined, 'properties are equal' );

// json round trip with clone
checkGeometryJsonRoundtrip( copy );

}

function getDifferingProp( geometryA, geometryB, excludedProperties ) {

excludedProperties = excludedProperties || [];
function getDifferingProp( geometryA, geometryB ) {

var geometryKeys = Object.keys( geometryA );
var cloneKeys = Object.keys( geometryB );
Expand All @@ -109,8 +105,6 @@ function getDifferingProp( geometryA, geometryB, excludedProperties ) {

var key = geometryKeys[ i ];

if ( excludedProperties.indexOf( key ) >= 0 ) continue;

if ( cloneKeys.indexOf( key ) < 0 ) {

differingProp = key;
Expand Down Expand Up @@ -193,31 +187,6 @@ function checkGeometryJsonRoundtrip( geom ) {

}

// Look for undefined and NaN values in numerical fieds.
function checkFinite( geom ) {

var allVerticesAreFinite = true;

var vertices = geom.vertices || [];
Mugen87 marked this conversation as resolved.
Show resolved Hide resolved

for ( var i = 0, l = vertices.length; i < l; i ++ ) {

var v = geom.vertices[ i ];

if ( ! ( isFinite( v.x ) || isFinite( v.y ) || isFinite( v.z ) ) ) {

allVerticesAreFinite = false;
break;

}

}

// TODO Buffers, normal, etc.

QUnit.assert.ok( allVerticesAreFinite, "contains only finite coordinates" );

}

// Run common geometry tests.
function runStdGeometryTests( assert, geometries ) {
Expand All @@ -226,8 +195,6 @@ function runStdGeometryTests( assert, geometries ) {

var geom = geometries[ i ];

checkFinite( geom );

// Clone
checkGeometryClone( geom );

Expand Down