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

DirectGeometry: Removed indices.

上级 70925878
......@@ -228,15 +228,23 @@ THREE.BufferGeometry.prototype = {
updateFromObject: function ( object ) {
var geometry;
var geometry = object.geometry;
if ( object instanceof THREE.PointCloud || object instanceof THREE.Line ) {
if ( object instanceof THREE.Mesh ) {
geometry = object.geometry;
var direct = geometry.__directGeometry;
} else if ( object instanceof THREE.Mesh ) {
direct.verticesNeedUpdate = geometry.verticesNeedUpdate;
direct.normalsNeedUpdate = geometry.normalsNeedUpdate;
direct.colorsNeedUpdate = geometry.colorsNeedUpdate;
direct.uvsNeedUpdate = geometry.uvsNeedUpdate;
geometry.verticesNeedUpdate = false;
geometry.normalsNeedUpdate = false;
geometry.colorsNeedUpdate = false;
geometry.uvsNeedUpdate = false;
geometry = object.geometry.__directGeometry.updateFromGeometry( object.geometry );
geometry = direct;
}
......@@ -299,9 +307,6 @@ THREE.BufferGeometry.prototype = {
fromDirectGeometry: function ( geometry ) {
var indices = new Uint16Array( geometry.indices.length * 3 );
this.addAttribute( 'index', new THREE.BufferAttribute( indices, 1 ).copyIndicesArray( geometry.indices ) );
if ( geometry.vertices.length > 0 ) {
var positions = new Float32Array( geometry.vertices.length * 3 );
......
......@@ -11,7 +11,6 @@ THREE.DirectGeometry = function () {
this.name = '';
this.type = 'DirectGeometry';
this.indices = [];
this.vertices = [];
this.colors = [];
this.normals = [];
......@@ -66,9 +65,7 @@ THREE.DirectGeometry.prototype = {
var hasFaceVertexUv = faceVertexUvs[ 0 ] && faceVertexUvs[ 0 ].length > 0;
var hasFaceVertexUv2 = faceVertexUvs[ 1 ] && faceVertexUvs[ 1 ].length > 0;
for ( var i = 0, i3 = 0; i < faces.length; i ++, i3 += 3 ) {
this.indices.push( new THREE.Index( i3, i3 + 1, i3 + 2 ) );
for ( var i = 0; i < faces.length; i ++ ) {
var face = faces[ i ];
......@@ -160,22 +157,6 @@ THREE.DirectGeometry.prototype = {
},
updateFromGeometry: function ( geometry, material ) {
this.verticesNeedUpdate = geometry.verticesNeedUpdate;
this.normalsNeedUpdate = geometry.normalsNeedUpdate;
this.colorsNeedUpdate = geometry.colorsNeedUpdate;
this.uvsNeedUpdate = geometry.uvsNeedUpdate;
geometry.verticesNeedUpdate = false;
geometry.normalsNeedUpdate = false;
geometry.colorsNeedUpdate = false;
geometry.uvsNeedUpdate = false;
return this;
},
dispose: function () {
this.dispatchEvent( { type: 'dispose' } );
......
/**
* @author mrdoob / http://mrdoob.com/
*/
THREE.Index = function ( a, b, c ) {
this.a = a;
this.b = b;
this.c = c;
};
......@@ -20,7 +20,6 @@
"src/math/Triangle.js",
"src/core/Clock.js",
"src/core/EventDispatcher.js",
"src/core/Index.js",
"src/core/Raycaster.js",
"src/core/Object3D.js",
"src/core/Face3.js",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册