Browse Source

Editor: Updated geometry and material classes.

Mr.doob 12 years ago
parent
commit
67f4c5cdf1
2 changed files with 12 additions and 9 deletions
  1. 5 3
      editor/js/ui/Sidebar.Geometry.js
  2. 7 6
      editor/js/ui/Sidebar.Material.js

+ 5 - 3
editor/js/ui/Sidebar.Geometry.js

@@ -1,7 +1,8 @@
 Sidebar.Geometry = function ( signals ) {
 
-	var geometries = {
+	var geometryClasses = {
 
+		"CircleGeometry": THREE.CircleGeometry,
 		"ConvexGeometry": THREE.ConvexGeometry,
 		"CubeGeometry": THREE.CubeGeometry,
 		"CylinderGeometry": THREE.CylinderGeometry,
@@ -12,6 +13,7 @@ Sidebar.Geometry = function ( signals ) {
 		"ParametricGeometry": THREE.ParametricGeometry,
 		"PlaneGeometry": THREE.PlaneGeometry,
 		"PolyhedronGeometry": THREE.PolyhedronGeometry,
+		"ShapeGeometry": THREE.ShapeGeometry,
 		"SphereGeometry": THREE.SphereGeometry,
 		"TetrahedronGeometry": THREE.TetrahedronGeometry,
 		"TextGeometry": THREE.TextGeometry,
@@ -110,9 +112,9 @@ Sidebar.Geometry = function ( signals ) {
 
 	function getGeometryInstanceName( geometry ) {
 
-		for ( var key in geometries ) {
+		for ( var key in geometryClasses ) {
 
-			if ( geometry instanceof geometries[ key ] ) return key;
+			if ( geometry instanceof geometryClasses[ key ] ) return key;
 
 		}
 

+ 7 - 6
editor/js/ui/Sidebar.Material.js

@@ -1,8 +1,9 @@
 Sidebar.Material = function ( signals ) {
 
-    var materials = {
+    var materialClasses = {
 
 		'LineBasicMaterial': THREE.LineBasicMaterial,
+		'LineDashedMaterial': THREE.LineDashedMaterial,
 		'MeshBasicMaterial': THREE.MeshBasicMaterial,
 		'MeshDepthMaterial': THREE.MeshDepthMaterial,
 		'MeshFaceMaterial': THREE.MeshFaceMaterial,
@@ -11,7 +12,6 @@ Sidebar.Material = function ( signals ) {
 		'MeshPhongMaterial': THREE.MeshPhongMaterial,
 		'ParticleBasicMaterial': THREE.ParticleBasicMaterial,
 		'ParticleCanvasMaterial': THREE.ParticleCanvasMaterial,
-		'ParticleDOMMaterial': THREE.ParticleDOMMaterial,
 		'ShaderMaterial': THREE.ShaderMaterial,
 		'Material': THREE.Material
 
@@ -41,6 +41,7 @@ Sidebar.Material = function ( signals ) {
 	var materialClass = new UI.Select( 'absolute' ).setOptions( {
 
 		'LineBasicMaterial': 'LineBasicMaterial',
+		'LineDashedMaterial': 'LineDashedMaterial',
 		'MeshBasicMaterial': 'MeshBasicMaterial',
 		'MeshDepthMaterial': 'MeshDepthMaterial',
 		'MeshFaceMaterial': 'MeshFaceMaterial',
@@ -229,9 +230,9 @@ Sidebar.Material = function ( signals ) {
 
 			material.name = materialName.getValue();
 
-			if ( material instanceof materials[ materialClass.getValue() ] == false ) {
+			if ( material instanceof materialClasses[ materialClass.getValue() ] == false ) {
 
-				material = new materials[ materialClass.getValue() ]();
+				material = new materialClasses[ materialClass.getValue() ]();
 				selected.material = material;
 
 			}
@@ -452,9 +453,9 @@ Sidebar.Material = function ( signals ) {
 
 	function getMaterialInstanceName( material ) {
 
-		for ( var key in materials ) {
+		for ( var key in materialClasses ) {
 
-			if ( material instanceof materials[ key ] ) return key;
+			if ( material instanceof materialClasses[ key ] ) return key;
 
 		}