Kaynağa Gözat

Editor: Remove remaining dependencies to Geometry.

Mugen87 4 yıl önce
ebeveyn
işleme
a85971c8ea

+ 0 - 62
editor/js/Sidebar.Geometry.Geometry.js

@@ -1,62 +0,0 @@
-import { UIRow, UIText } from './libs/ui.js';
-
-function SidebarGeometryGeometry( editor ) {
-
-	var strings = editor.strings;
-
-	var signals = editor.signals;
-
-	var container = new UIRow();
-
-	// vertices
-
-	var verticesRow = new UIRow();
-	var vertices = new UIText();
-
-	verticesRow.add( new UIText( strings.getKey( 'sidebar/geometry/geometry/vertices' ) ).setWidth( '90px' ) );
-	verticesRow.add( vertices );
-
-	container.add( verticesRow );
-
-	// faces
-
-	var facesRow = new UIRow();
-	var faces = new UIText();
-
-	facesRow.add( new UIText( strings.getKey( 'sidebar/geometry/geometry/faces' ) ).setWidth( '90px' ) );
-	facesRow.add( faces );
-
-	container.add( facesRow );
-
-	//
-
-	function update( object ) {
-
-		if ( object === null ) return; // objectSelected.dispatch( null )
-		if ( object === undefined ) return;
-
-		var geometry = object.geometry;
-
-		if ( geometry && geometry.isGeometry ) {
-
-			container.setDisplay( 'block' );
-
-			vertices.setValue( ( geometry.vertices.length ).format() );
-			faces.setValue( ( geometry.faces.length ).format() );
-
-		} else {
-
-			container.setDisplay( 'none' );
-
-		}
-
-	}
-
-	signals.objectSelected.add( update );
-	signals.geometryChanged.add( update );
-
-	return container;
-
-}
-
-export { SidebarGeometryGeometry };

+ 1 - 9
editor/js/Sidebar.Geometry.Modifiers.js

@@ -15,15 +15,7 @@ function SidebarGeometryModifiers( editor, object ) {
 
 		geometry.computeVertexNormals();
 
-		if ( geometry.isBufferGeometry ) {
-
-			geometry.attributes.normal.needsUpdate = true;
-
-		} else {
-
-			geometry.normalsNeedUpdate = true;
-
-		}
+		geometry.attributes.normal.needsUpdate = true;
 
 		signals.geometryChanged.dispatch( object );
 

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

@@ -4,7 +4,6 @@ import { UIPanel, UIRow, UIText, UIInput, UIButton, UISpan } from './libs/ui.js'
 
 import { SetGeometryValueCommand } from './commands/SetGeometryValueCommand.js';
 
-import { SidebarGeometryGeometry } from './Sidebar.Geometry.Geometry.js';
 import { SidebarGeometryBufferGeometry } from './Sidebar.Geometry.BufferGeometry.js';
 import { SidebarGeometryModifiers } from './Sidebar.Geometry.Modifiers.js';
 
@@ -143,10 +142,6 @@ function SidebarGeometry( editor ) {
 	var parameters = new UISpan();
 	container.add( parameters );
 
-	// geometry
-
-	container.add( new SidebarGeometryGeometry( editor ) );
-
 	// buffergeometry
 
 	container.add( new SidebarGeometryBufferGeometry( editor ) );
@@ -205,7 +200,7 @@ function SidebarGeometry( editor ) {
 
 				parameters.clear();
 
-				if ( geometry.type === 'BufferGeometry' || geometry.type === 'Geometry' ) {
+				if ( geometry.type === 'BufferGeometry' ) {
 
 					parameters.add( new SidebarGeometryModifiers( editor, object ) );
 

+ 0 - 9
editor/js/Strings.js

@@ -160,9 +160,6 @@ function Strings( config ) {
 			'sidebar/geometry/extrude_geometry/bevelSegments': 'Segments',
 			'sidebar/geometry/extrude_geometry/shape': 'Convert to Shape',
 
-			'sidebar/geometry/geometry/vertices': 'Vertices',
-			'sidebar/geometry/geometry/faces': 'Faces',
-
 			'sidebar/geometry/dodecahedron_geometry/radius': 'Radius',
 			'sidebar/geometry/dodecahedron_geometry/detail': 'Detail',
 
@@ -486,9 +483,6 @@ function Strings( config ) {
 			'sidebar/geometry/extrude_geometry/bevelSegments': 'Segments',
 			'sidebar/geometry/extrude_geometry/shape': 'Convertir en forme',
 
-			'sidebar/geometry/geometry/vertices': 'Sommets',
-			'sidebar/geometry/geometry/faces': 'Faces',
-
 			'sidebar/geometry/dodecahedron_geometry/radius': 'Rayon',
 			'sidebar/geometry/dodecahedron_geometry/detail': 'Détail',
 
@@ -802,9 +796,6 @@ function Strings( config ) {
 			'sidebar/geometry/cylinder_geometry/heightsegments': '高度分段',
 			'sidebar/geometry/cylinder_geometry/openended': '开端',
 
-			'sidebar/geometry/geometry/vertices': '顶点',
-			'sidebar/geometry/geometry/faces': '面',
-
 			'sidebar/geometry/dodecahedron_geometry/radius': '半径',
 			'sidebar/geometry/dodecahedron_geometry/detail': '面片分段',
 

+ 0 - 1
editor/sw.js

@@ -137,7 +137,6 @@ const assets = [
 	'./js/Sidebar.Properties.js',
 	'./js/Sidebar.Object.js',
 	'./js/Sidebar.Geometry.js',
-	'./js/Sidebar.Geometry.Geometry.js',
 	'./js/Sidebar.Geometry.BufferGeometry.js',
 	'./js/Sidebar.Geometry.Modifiers.js',
 	'./js/Sidebar.Geometry.BoxGeometry.js',