Skip to content

BufferGeometryUtils: Fixed index merge in .mergeBufferGeometries() #14338

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 2 commits into from
Jun 21, 2018
Merged

BufferGeometryUtils: Fixed index merge in .mergeBufferGeometries() #14338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eec000
BufferGeometryUtils: Fixed index merge in .mergeBufferGeometries()
Mugen87 Jun 20, 2018
65a4179
BufferGeometryUtils: Format
Mugen87 Jun 20, 2018
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
25 changes: 7 additions & 18 deletions examples/js/BufferGeometryUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ THREE.BufferGeometryUtils = {

for ( var name in geometry.attributes ) {

if ( !attributesUsed.has( name ) ) return null;
if ( ! attributesUsed.has( name ) ) return null;

if ( attributes[ name ] === undefined ) attributes[ name ] = [];

Expand All @@ -226,7 +226,7 @@ THREE.BufferGeometryUtils = {

for ( var name in geometry.morphAttributes ) {

if ( !morphAttributesUsed.has( name ) ) return null;
if ( ! morphAttributesUsed.has( name ) ) return null;

if ( morphAttributes[ name ] === undefined ) morphAttributes[ name ] = [];

Expand Down Expand Up @@ -270,34 +270,23 @@ THREE.BufferGeometryUtils = {
if ( isIndexed ) {

var indexOffset = 0;
var indexList = [];
var mergedIndex = [];

for ( var i = 0; i < geometries.length; ++ i ) {

var index = geometries[ i ].index;

if ( indexOffset > 0 ) {
for ( var j = 0; j < index.count; ++ j ) {

index = index.clone();

for ( var j = 0; j < index.count; ++ j ) {

index.setX( j, index.getX( j ) + indexOffset );

}
mergedIndex.push( index.getX( j ) + indexOffset );

}

indexList.push( index );
indexOffset += geometries[ i ].attributes.position.count;

}

var mergedIndex = this.mergeBufferAttributes( indexList );

if ( !mergedIndex ) return null;

mergedGeometry.index = mergedIndex;
mergedGeometry.setIndex( mergedIndex );

}

Expand Down Expand Up @@ -336,7 +325,7 @@ THREE.BufferGeometryUtils = {

var mergedMorphAttribute = this.mergeBufferAttributes( morphAttributesToMerge );

if ( !mergedMorphAttribute ) return null;
if ( ! mergedMorphAttribute ) return null;

mergedGeometry.morphAttributes[ name ].push( mergedMorphAttribute );

Expand Down