Pārlūkot izejas kodu

Editor: Geometry2 support.

Mr.doob 11 gadi atpakaļ
vecāks
revīzija
ffe96c174c
3 mainītis faili ar 12 papildinājumiem un 2 dzēšanām
  1. 1 0
      editor/js/Editor.js
  2. 6 2
      editor/js/Sidebar.Geometry.js
  3. 5 0
      editor/js/Viewport.js

+ 1 - 0
editor/js/Editor.js

@@ -357,6 +357,7 @@ Editor.prototype = {
 			'TorusKnotGeometry': THREE.TorusKnotGeometry,
 			'TubeGeometry': THREE.TubeGeometry,
 			'Geometry': THREE.Geometry,
+			'Geometry2': THREE.Geometry2,
 			'BufferGeometry': THREE.BufferGeometry
 
 		};

+ 6 - 2
editor/js/Sidebar.Geometry.js

@@ -165,6 +165,11 @@ Sidebar.Geometry = function ( editor ) {
 			geometryVertices.setValue( geometry.vertices.length );
 			geometryFaces.setValue( geometry.faces.length );
 
+		} else if ( geometry instanceof THREE.Geometry2 ) {
+
+			geometryVertices.setValue( geometry.vertices.length / 3 );
+			geometryFaces.setValue( geometry.vertices.length / 9 );
+
 		} else if ( geometry instanceof THREE.BufferGeometry ) {
 
 			geometryVertices.setValue( geometry.attributes.position.array.length / 3 );
@@ -175,11 +180,10 @@ Sidebar.Geometry = function ( editor ) {
 
 			} else {
 
-				geometryFaces.setValue( geometry.attributes.position.array.length / 3 / 3 );
+				geometryFaces.setValue( geometry.attributes.position.array.length / 9 );
 
 			}
 
-
 		}
 
 	}

+ 5 - 0
editor/js/Viewport.js

@@ -497,6 +497,11 @@ var Viewport = function ( editor ) {
 					vertices += geometry.vertices.length;
 					faces += geometry.faces.length;
 
+				} else if ( geometry instanceof THREE.Geometry2 ) {
+
+					vertices += geometry.vertices.length / 3;
+					faces += geometry.vertices.length / 9;
+
 				} else if ( geometry instanceof THREE.BufferGeometry ) {
 
 					vertices += geometry.attributes.position.array.length / 3;