瀏覽代碼

More ambient term removal.

Mr.doob 10 年之前
父節點
當前提交
7a5ef22a7e

+ 1 - 5
editor/examples/arkanoid.app.json

@@ -67,7 +67,6 @@
 				"uuid": "2F69AF3A-DDF5-4BBA-87B5-80159F90DDBF",
 				"type": "MeshPhongMaterial",
 				"color": 86015,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -76,7 +75,6 @@
 				"uuid": "CFBEAD4C-6695-4A99-887B-8161E2947225",
 				"type": "MeshPhongMaterial",
 				"color": 16777215,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -85,7 +83,6 @@
 				"uuid": "043B208C-1F83-42C6-802C-E0E35621C27C",
 				"type": "MeshPhongMaterial",
 				"color": 16777215,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -94,7 +91,6 @@
 				"uuid": "40EC9BDA-91C0-4671-937A-2BCB6DA7EEBB",
 				"type": "MeshPhongMaterial",
 				"color": 13486790,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -168,4 +164,4 @@
 				"source": "var ball = this.getObjectByName( 'Ball' );\n\nvar direction = new THREE.Vector3();\ndirection.x = Math.random() - 0.5;\ndirection.z = - 0.5;\ndirection.normalize();\n\nvar speed = new THREE.Vector3();\n\n//\n\nvar group = new THREE.Group();\nthis.add( group );\n\nvar paddle = this.getObjectByName( 'Paddle' );\ngroup.add( paddle );\n\nvar brick = this.getObjectByName( 'Brick' );\n\nfor ( var j = 0; j < 8; j ++ ) {\n\n\tvar material = new THREE.MeshPhongMaterial( { color: Math.random() * 0xffffff } );\n\n\tfor ( var i = 0; i < 12; i ++ ) {\n\t\t\n\t\tvar object = brick.clone();\n\t\tobject.material = material;\n\t\tobject.position.x = i * 22 - 120;\n\t\tobject.position.z = j * 14 - 120;\n\t\tgroup.add( object );\n\t\t\n\t}\n\t\n}\n\nbrick.visible = false;\n\n//\n\nvar raycaster = new THREE.Raycaster();\n\nfunction update( event ) {\n\t\n\tif ( ball.position.x < - 150 || ball.position.x > 150 ) direction.x = - direction.x;\n\tif ( ball.position.z < - 200 || ball.position.z > 200 ) direction.z = - direction.z;\n\n\tball.position.add( speed.copy( direction ).multiplyScalar( 4 ) );\n\t\n\traycaster.set( ball.position, direction );\n\t\n\tvar intersections = raycaster.intersectObjects( group.children );\n\t\n\tif ( intersections.length > 0 ) {\n\t\n\t\tvar intersection = intersections[ 0 ];\n\t\t\n\t\tif ( intersection.distance < 5 ) {\n\t\t\t\n\t\t\tif ( intersection.object !== paddle ) {\n\n\t\t\t\tgroup.remove( intersection.object );\n\t\t\t\t\n\t\t\t}\n\t\t\t\n\t\t\tdirection.reflect( intersection.face.normal );\n\t\t\t\n\t\t}\n\t\t\n\t}\n\n}"
 			}]
 	}
-}
+}

+ 0 - 4
editor/examples/camera.app.json

@@ -62,7 +62,6 @@
 				"uuid": "B5943856-E404-45D9-A427-4774202C2CD0",
 				"type": "MeshPhongMaterial",
 				"color": 37119,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -71,7 +70,6 @@
 				"uuid": "3F872310-2067-4BE4-9250-5B3F4E43797E",
 				"type": "MeshPhongMaterial",
 				"color": 15859456,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -80,7 +78,6 @@
 				"uuid": "4AE8130E-B6A8-47BC-ACCF-060973C74044",
 				"type": "MeshPhongMaterial",
 				"color": 16777215,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -89,7 +86,6 @@
 				"uuid": "E1826901-7922-4584-A25D-6D487E2C9BBD",
 				"type": "MeshPhongMaterial",
 				"color": 16711680,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30

+ 0 - 1
editor/examples/particles.app.json

@@ -46,7 +46,6 @@
 				"uuid": "6EDB0369-7E11-4B0F-BF98-4BD761846D65",
 				"type": "MeshPhongMaterial",
 				"color": 16777215,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30

+ 0 - 3
editor/examples/pong.app.json

@@ -56,7 +56,6 @@
 				"uuid": "7EDF7C08-6325-418A-BBAB-89341C694730",
 				"type": "MeshPhongMaterial",
 				"color": 16777215,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 16777215,
 				"shininess": 30
@@ -65,7 +64,6 @@
 				"uuid": "B1CAF098-FE36-45E1-BEBE-8D6AC04821CC",
 				"type": "MeshPhongMaterial",
 				"color": 16711680,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30
@@ -74,7 +72,6 @@
 				"uuid": "FBDBE66D-B613-4741-802D-5AE1DE07DE46",
 				"type": "MeshPhongMaterial",
 				"color": 2752767,
-				"ambient": 16777215,
 				"emissive": 0,
 				"specular": 1118481,
 				"shininess": 30

+ 0 - 10
editor/js/Sidebar.Material.js

@@ -101,16 +101,6 @@ Sidebar.Material = function ( editor ) {
 
 	container.add( materialColorRow );
 
-	// ambient
-
-	var materialAmbientRow = new UI.Panel();
-	var materialAmbient = new UI.Color().onChange( update );
-
-	materialAmbientRow.add( new UI.Text( 'Ambient' ).setWidth( '90px' ) );
-	materialAmbientRow.add( materialAmbient );
-
-	container.add( materialAmbientRow );
-
 	// emissive
 
 	var materialEmissiveRow = new UI.Panel();