提交 0fa0baf3 编写于 作者: M Mr.doob

Updated examples and loaders to latest Geometry2/IndexedGeometry2.

上级 aaca0a8a
......@@ -106,12 +106,10 @@ THREE.STLLoader.prototype.parseBinary = function ( data ) {
var dataOffset = 84;
var faceLength = 12 * 4 + 2;
var vertices = new Float32Array( faces * 3 * 3 );
var normals = new Float32Array( faces * 3 * 3 );
var uvs = new Float32Array( faces * 3 * 2 );
var offset = 0;
var geometry = new THREE.Geometry2( faces );
for ( var face = 0; face < faces; face ++ ) {
var start = dataOffset + face * faceLength;
......@@ -120,13 +118,13 @@ THREE.STLLoader.prototype.parseBinary = function ( data ) {
var vertexstart = start + i * 12;
vertices[ offset ] = reader.getFloat32( vertexstart, true );
vertices[ offset + 1 ] = reader.getFloat32( vertexstart + 4, true );
vertices[ offset + 2 ] = reader.getFloat32( vertexstart + 8, true );
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 );
normals[ offset ] = reader.getFloat32( start , true );
normals[ offset + 1 ] = reader.getFloat32( start + 4, true );
normals[ offset + 2 ] = reader.getFloat32( start + 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 );
offset += 3;
......@@ -134,7 +132,7 @@ THREE.STLLoader.prototype.parseBinary = function ( data ) {
}
return new THREE.Geometry2( vertices, normals, uvs );
return geometry;
};
......
......@@ -107,8 +107,8 @@
nxGeometry.applyMatrix( matrix.makeTranslation( - 50, 0, 0 ) );
var pyGeometry = new THREE.PlaneGeometry( 100, 100 );
pyGeometry.attributes.uv.array[ 5 ] = 0.5;
pyGeometry.attributes.uv.array[ 7 ] = 0.5;
pyGeometry.uvs[ 5 ] = 0.5;
pyGeometry.uvs[ 7 ] = 0.5;
// pyGeometry.faceVertexUvs[ 0 ][ 0 ][ 1 ].y = 0.5;
// pyGeometry.faceVertexUvs[ 0 ][ 1 ][ 0 ].y = 0.5;
// pyGeometry.faceVertexUvs[ 0 ][ 1 ][ 1 ].y = 0.5;
......
......@@ -64,7 +64,9 @@ THREE.CircleGeometry = function ( radius, segments, thetaStart, thetaLength ) {
}
THREE.IndexedGeometry2.call( this, indices, vertices, normals, uvs );
THREE.IndexedGeometry2.call( this );
this.setArrays( indices, vertices, normals, uvs );
this.boundingSphere = new THREE.Sphere( new THREE.Vector3(), radius );
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册