Skip to content

VTKLoader: Remove usage of Geometry #14202

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 1 commit into from
Jun 4, 2018
Merged

VTKLoader: Remove usage of Geometry #14202

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
70 changes: 22 additions & 48 deletions examples/js/loaders/VTKLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,77 +250,51 @@ Object.assign( THREE.VTKLoader.prototype, THREE.EventDispatcher.prototype, {

}

var geometry;
var stagger = 'point';
var geometry = new THREE.BufferGeometry();
geometry.setIndex( indices );
geometry.addAttribute( 'position', new THREE.Float32BufferAttribute( positions, 3 ) );

if ( colors.length === indices.length ) {
if ( normals.length === positions.length ) {

stagger = 'cell';
geometry.addAttribute( 'normal', new THREE.Float32BufferAttribute( normals, 3 ) );

}

if ( stagger === 'point' ) {
if ( colors.length !== indices.length ) {

// Nodal. Use BufferGeometry
geometry = new THREE.BufferGeometry();
geometry.setIndex( new THREE.BufferAttribute( new Uint32Array( indices ), 1 ) );
geometry.addAttribute( 'position', new THREE.BufferAttribute( new Float32Array( positions ), 3 ) );
// stagger

if ( colors.length === positions.length ) {

geometry.addAttribute( 'color', new THREE.BufferAttribute( new Float32Array( colors ), 3 ) );

}

if ( normals.length === positions.length ) {

geometry.addAttribute( 'normal', new THREE.BufferAttribute( new Float32Array( normals ), 3 ) );
geometry.addAttribute( 'color', new THREE.Float32BufferAttribute( colors, 3 ) );

}

} else {

// Cell centered colors. The only way to attach a solid color to each triangle
// is to use Geometry, which is less efficient than BufferGeometry
geometry = new THREE.Geometry();

var numTriangles = indices.length / 3;
var numPoints = positions.length / 3;
var face;
var ia, ib, ic;
var x, y, z;
var r, g, b;
// cell

for ( var j = 0; j < numPoints; ++ j ) {
geometry = geometry.toNonIndexed();
var numTriangles = geometry.attributes.position.count / 3;

x = positions[ 3 * j + 0 ];
y = positions[ 3 * j + 1 ];
z = positions[ 3 * j + 2 ];
geometry.vertices.push( new THREE.Vector3( x, y, z ) );
if ( colors.length === ( numTriangles * 3 ) ) {

}

for ( var i = 0; i < numTriangles; ++ i ) {

ia = indices[ 3 * i + 0 ];
ib = indices[ 3 * i + 1 ];
ic = indices[ 3 * i + 2 ];
geometry.faces.push( new THREE.Face3( ia, ib, ic ) );
var newColors = [];

}

if ( colors.length === numTriangles * 3 ) {
for ( var i = 0; i < numTriangles; i ++ ) {

for ( var i = 0; i < numTriangles; ++ i ) {
var r = colors[ 3 * i + 0 ];
var g = colors[ 3 * i + 1 ];
var b = colors[ 3 * i + 2 ];

face = geometry.faces[ i ];
r = colors[ 3 * i + 0 ];
g = colors[ 3 * i + 1 ];
b = colors[ 3 * i + 2 ];
face.color = new THREE.Color().setRGB( r, g, b );
newColors.push( r, g, b );
newColors.push( r, g, b );
newColors.push( r, g, b );

}

geometry.addAttribute( 'color', new THREE.Float32BufferAttribute( newColors, 3 ) );

}

}
Expand Down