Skip to content

Commit a2a773a

Browse files
authored
Merge pull request #18367 from Mugen87/dev29
STLLoader: Fix computation of groups data.
2 parents 49fe7e8 + 97660b9 commit a2a773a

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

examples/js/loaders/STLLoader.js

+4-12
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ THREE.STLLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
273273

274274
var result;
275275

276-
var groupVertexes = [];
277276
var groupCount = 0;
278277
var startVertex = 0;
279278
var endVertex = 0;
@@ -329,24 +328,17 @@ THREE.STLLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
329328

330329
}
331330

332-
groupVertexes.push( { startVertex: startVertex, endVertex: endVertex } );
331+
var start = startVertex;
332+
var count = endVertex - startVertex;
333+
334+
geometry.addGroup( start, count, groupCount );
333335
groupCount ++;
334336

335337
}
336338

337339
geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( vertices, 3 ) );
338340
geometry.setAttribute( 'normal', new THREE.Float32BufferAttribute( normals, 3 ) );
339341

340-
if ( groupCount > 0 ) {
341-
342-
for ( var i = 0; i < groupVertexes.length; i ++ ) {
343-
344-
geometry.addGroup( groupVertexes[ i ].startVertex, groupVertexes[ i ].endVertex, i );
345-
346-
}
347-
348-
}
349-
350342
return geometry;
351343

352344
}

examples/jsm/loaders/STLLoader.js

+4-12
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ STLLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
283283

284284
var result;
285285

286-
var groupVertexes = [];
287286
var groupCount = 0;
288287
var startVertex = 0;
289288
var endVertex = 0;
@@ -339,24 +338,17 @@ STLLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
339338

340339
}
341340

342-
groupVertexes.push( { startVertex: startVertex, endVertex: endVertex } );
341+
var start = startVertex;
342+
var count = endVertex - startVertex;
343+
344+
geometry.addGroup( start, count, groupCount );
343345
groupCount ++;
344346

345347
}
346348

347349
geometry.setAttribute( 'position', new Float32BufferAttribute( vertices, 3 ) );
348350
geometry.setAttribute( 'normal', new Float32BufferAttribute( normals, 3 ) );
349351

350-
if ( groupCount > 0 ) {
351-
352-
for ( var i = 0; i < groupVertexes.length; i ++ ) {
353-
354-
geometry.addGroup( groupVertexes[ i ].startVertex, groupVertexes[ i ].endVertex, i );
355-
356-
}
357-
358-
}
359-
360352
return geometry;
361353

362354
}

0 commit comments

Comments
 (0)