From 63496cdd632b7d4f3a421f52a1b9b64676c09dbc Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Wed, 14 May 2014 18:48:56 +0100 Subject: [PATCH] STLLoader: Removed TypedGeometry dependency. --- examples/js/loaders/STLLoader.js | 20 +++++++++++++------- examples/webgl_loader_stl.html | 1 - src/textures/CubeTexture.js | 2 -- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/examples/js/loaders/STLLoader.js b/examples/js/loaders/STLLoader.js index 30f9cd9a49..a0b26a182d 100644 --- a/examples/js/loaders/STLLoader.js +++ b/examples/js/loaders/STLLoader.js @@ -108,7 +108,10 @@ THREE.STLLoader.prototype.parseBinary = function ( data ) { var offset = 0; - var geometry = new THREE.TypedGeometry( faces ); + var geometry = new THREE.BufferGeometry(); + + var vertices = new Float32Array( faces * 3 * 3 ); + var normals = new Float32Array( faces * 3 * 3 ); for ( var face = 0; face < faces; face ++ ) { @@ -118,13 +121,13 @@ THREE.STLLoader.prototype.parseBinary = function ( data ) { var vertexstart = start + i * 12; - geometry.vertices[ offset ] = reader.getFloat32( vertexstart, true ); - geometry.vertices[ offset + 1 ] = reader.getFloat32( vertexstart + 4, true ); - geometry.vertices[ offset + 2 ] = reader.getFloat32( vertexstart + 8, true ); + vertices[ offset ] = reader.getFloat32( vertexstart, true ); + vertices[ offset + 1 ] = reader.getFloat32( vertexstart + 4, true ); + vertices[ offset + 2 ] = reader.getFloat32( vertexstart + 8, true ); - geometry.normals[ offset ] = reader.getFloat32( start , true ); - geometry.normals[ offset + 1 ] = reader.getFloat32( start + 4, true ); - geometry.normals[ offset + 2 ] = reader.getFloat32( start + 8, true ); + normals[ offset ] = reader.getFloat32( start , true ); + normals[ offset + 1 ] = reader.getFloat32( start + 4, true ); + normals[ offset + 2 ] = reader.getFloat32( start + 8, true ); offset += 3; @@ -132,6 +135,9 @@ THREE.STLLoader.prototype.parseBinary = function ( data ) { } + geometry.addAttribute( 'position', new THREE.BufferAttribute( vertices, 3 ) ); + geometry.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) ); + return geometry; }; diff --git a/examples/webgl_loader_stl.html b/examples/webgl_loader_stl.html index 2b7bb354b8..91e52d73a6 100644 --- a/examples/webgl_loader_stl.html +++ b/examples/webgl_loader_stl.html @@ -45,7 +45,6 @@ - diff --git a/src/textures/CubeTexture.js b/src/textures/CubeTexture.js index 09c5463d5e..1acd4550f1 100644 --- a/src/textures/CubeTexture.js +++ b/src/textures/CubeTexture.js @@ -1,7 +1,5 @@ /** * @author mrdoob / http://mrdoob.com/ - * @author alteredq / http://alteredqualia.com/ - * @author szimek / https://github.com/szimek/ */ THREE.CubeTexture = function ( images, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy ) { -- GitLab