ambientOcclusion -> ao per @WestLangley feedback here: https://github.com/mrdoob/three.js/pull/6263#issuecomment-83794671 #2

editor/js/Sidebar.Material.js

@@ -292,17 +292,17 @@ Sidebar.Material = function ( editor ) {
 
 	// ambient occlusion map
 
-	var materialAmbientOcclusionMapRow = new UI.Panel();
-	var materialAmbientOcclusionMapEnabled = new UI.Checkbox( false ).onChange( update );
-	var materialAmbientOcclusionMap = new UI.Texture().onChange( update );
-	var materialAmbientOcclusionScale = new UI.Number( 1 ).setRange( 0, 1 ).setWidth( '30px' ).onChange( update );
+	var materialAOMapRow = new UI.Panel();
+	var materialAOMapEnabled = new UI.Checkbox( false ).onChange( update );
+	var materialAOMap = new UI.Texture().onChange( update );
+	var materialAOScale = new UI.Number( 1 ).setRange( 0, 1 ).setWidth( '30px' ).onChange( update );
 
-	materialAmbientOcclusionMapRow.add( new UI.Text( 'Ambient Occlusion Map' ).setWidth( '90px' ) );
-	materialAmbientOcclusionMapRow.add( materialAmbientOcclusionMapEnabled );
-	materialAmbientOcclusionMapRow.add( materialAmbientOcclusionMap );
-	materialAmbientOcclusionMapRow.add( materialAmbientOcclusionScale );
+	materialAOMapRow.add( new UI.Text( 'AO Map' ).setWidth( '90px' ) );
+	materialAOMapRow.add( materialAOMapEnabled );
+	materialAOMapRow.add( materialAOMap );
+	materialAOMapRow.add( materialAOScale );
 
-	container.add( materialAmbientOcclusionMapRow );
+	container.add( materialAOMapRow );
 
 	// side
 
@@ -618,19 +618,19 @@ Sidebar.Material = function ( editor ) {
 
 			}
 
-			if ( material.ambientOcclusionMap !== undefined ) {
+			if ( material.aoMap !== undefined ) {
 
-				var ambientOcclusionMapEnabled = materialAmbientOcclusionMapEnabled.getValue() === true;
+				var aoMapEnabled = materialAOMapEnabled.getValue() === true;
 
 				if ( objectHasUvs ) {
 
-					material.ambientOcclusionMap = ambientOcclusionMapEnabled ? materialAmbientOcclusionMap.getValue() : null;
-					material.ambientOcclusionScale = materialAmbientOcclusionScale.getValue();
+					material.aoMap = aoMapEnabled ? materialAOMap.getValue() : null;
+					material.aoScale = materialAOScale.getValue();
 					material.needsUpdate = true;
 
 				} else {
 
-					if ( ambientOcclusionMapEnabled ) textureWarning = true;
+					if ( aoMapEnabled ) textureWarning = true;
 
 				}
 
@@ -712,7 +712,7 @@ Sidebar.Material = function ( editor ) {
 			'specularMap': materialSpecularMapRow,
 			'envMap': materialEnvMapRow,
 			'lightMap': materialLightMapRow,
-			'ambientOcclusionMap': materialAmbientOcclusionMapRow,
+			'aoMap': materialAOMapRow,
 			'side': materialSideRow,
 			'shading': materialShadingRow,
 			'blending': materialBlendingRow,
@@ -862,11 +862,11 @@ Sidebar.Material = function ( editor ) {
 
 			}
 
-			if ( material.ambientOcclusionMap !== undefined ) {
+			if ( material.aoMap !== undefined ) {
 
-				materialAmbientOcclusionMapEnabled.setValue( material.ambientOcclusionMap !== null );
-				materialAmbientOcclusionMap.setValue( material.ambientOcclusionMap );
-				materialAmbientOcclusionScale.setValue( material.ambientOcclusionScale );
+				materialAOMapEnabled.setValue( material.aoMap !== null );
+				materialAOMap.setValue( material.aoMap );
+				materialAOScale.setValue( material.aoScale );
 
 			}
 

src/loaders/Loader.js

@@ -347,9 +347,9 @@ THREE.Loader.prototype = {
 
 		}
 
-		if ( m.mapAmbientOcclusion && texturePath ) {
+		if ( m.mapAO && texturePath ) {
 
-			create_texture( mpars, 'ambientOcclusionMap', m.mapAmbientOcclusion, m.mapAmbientOcclusionRepeat, m.mapAmbientOcclusionOffset, m.mapAmbientOcclusionWrap, m.mapAmbientOcclusionAnisotropy );
+			create_texture( mpars, 'aoMap', m.mapAO, m.mapAORepeat, m.mapAOOffset, m.mapAOWrap, m.mapAOAnisotropy );
 
 		}
 

src/loaders/ObjectLoader.js

@@ -280,11 +280,11 @@ THREE.ObjectLoader.prototype = {
 
 				}
 
-				if ( data.ambientOcclusionMap !== undefined ) {
+				if ( data.aoMap !== undefined ) {
 
-					material.ambientOcclusionMap = getTexture( data.ambientOcclusionMap );
-					if ( data.ambientOcclusionScale ) {
-						material.ambientOcclusionScale = data.ambientOcclusionScale;
+					material.aoMap = getTexture( data.aoMap );
+					if ( data.aoScale ) {
+						material.aoScale = data.aoScale;
 					}
 				}
 

src/materials/MeshBasicMaterial.js

@@ -8,7 +8,7 @@
  *  map: new THREE.Texture( <Image> ),
  *
  *  lightMap: new THREE.Texture( <Image> ),
- *  ambientOcclusionMap: new THREE.Texture( <Image> ),
+ *  aoMap: new THREE.Texture( <Image> ),
  *
  *  specularMap: new THREE.Texture( <Image> ),
  *
@@ -47,8 +47,8 @@ THREE.MeshBasicMaterial = function ( parameters ) {
 	this.map = null;
 
 	this.lightMap = null;
-	this.ambientOcclusionMap = null;
-	this.ambientOcclusionScale = 1.0;
+	this.aoMap = null;
+	this.aoScale = 1.0;
 
 	this.specularMap = null;
 
@@ -91,8 +91,8 @@ THREE.MeshBasicMaterial.prototype.clone = function () {
 	material.map = this.map;
 
 	material.lightMap = this.lightMap;
-	material.ambientOcclusionMap = this.ambientOcclusionMap;
-	material.ambientOcclusionScale = this.ambientOcclusionScale;
+	material.aoMap = this.aoMap;
+	material.aoScale = this.aoScale;
 
 	material.specularMap = this.specularMap;
 

src/materials/MeshLambertMaterial.js

@@ -10,7 +10,7 @@
  *  map: new THREE.Texture( <Image> ),
  *
  *  lightMap: new THREE.Texture( <Image> ),
- *  ambientOcclusionMap: new THREE.Texture( <Image> ),
+ *  aoMap: new THREE.Texture( <Image> ),
  *
  *  specularMap: new THREE.Texture( <Image> ),
  *
@@ -54,8 +54,8 @@ THREE.MeshLambertMaterial = function ( parameters ) {
 	this.map = null;
 
 	this.lightMap = null;
-	this.ambientOcclusionMap = null;
-	this.ambientOcclusionScale = 1.0;
+	this.aoMap = null;
+	this.aoScale = 1.0;
 
 	this.specularMap = null;
 
@@ -103,9 +103,9 @@ THREE.MeshLambertMaterial.prototype.clone = function () {
 	material.map = this.map;
 
 	material.lightMap = this.lightMap;
-	material.ambientOcclusionMap = this.ambientOcclusionMap;
-	material.ambientOcclusionScale = this.ambientOcclusionScale;
-	material.ambientOcclusionScale = this.ambientOcclusionScale;
+	material.aoMap = this.aoMap;
+	material.aoScale = this.aoScale;
+	material.aoScale = this.aoScale;
 
 	material.specularMap = this.specularMap;
 

src/materials/MeshPhongMaterial.js

@@ -12,7 +12,7 @@
  *  map: new THREE.Texture( <Image> ),
  *
  *  lightMap: new THREE.Texture( <Image> ),
- *  ambientOcclusionMap: new THREE.Texture( <Image> ),
+ *  aoMap: new THREE.Texture( <Image> ),
  *
  *  bumpMap: new THREE.Texture( <Image> ),
  *  bumpScale: <float>,
@@ -66,8 +66,8 @@ THREE.MeshPhongMaterial = function ( parameters ) {
 	this.map = null;
 
 	this.lightMap = null;
-	this.ambientOcclusionMap = null;
-	this.ambientOcclusionScale = 1.0;
+	this.aoMap = null;
+	this.aoScale = 1.0;
 
 	this.bumpMap = null;
 	this.bumpScale = 1;
@@ -125,8 +125,8 @@ THREE.MeshPhongMaterial.prototype.clone = function () {
 	material.map = this.map;
 
 	material.lightMap = this.lightMap;
-	material.ambientOcclusionMap = this.ambientOcclusionMap;
-	material.ambientOcclusionScale = this.ambientOcclusionScale;
+	material.aoMap = this.aoMap;
+	material.aoScale = this.aoScale;
 
 	material.bumpMap = this.bumpMap;
 	material.bumpScale = this.bumpScale;

src/renderers/WebGLRenderer.js

@@ -4153,7 +4153,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 			envMap: !! material.envMap,
 			envMapMode: material.envMap && material.envMap.mapping,
 			lightMap: !! material.lightMap,
-			ambientOcclusionMap: !! material.ambientOcclusionMap,
+			aoMap: !! material.aoMap,
 			bumpMap: !! material.bumpMap,
 			normalMap: !! material.normalMap,
 			specularMap: !! material.specularMap,
@@ -4596,8 +4596,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		uniforms.map.value = material.map;
 		uniforms.lightMap.value = material.lightMap;
-		uniforms.ambientOcclusionMap.value = material.ambientOcclusionMap;
-		uniforms.ambientOcclusionScale.value = material.ambientOcclusionScale;
+		uniforms.aoMap.value = material.aoMap;
+		uniforms.aoScale.value = material.aoScale;
 		uniforms.specularMap.value = material.specularMap;
 		uniforms.alphaMap.value = material.alphaMap;
 

src/renderers/shaders/ShaderChunk/ambientocclusionmap_fragment.glsl

@@ -1,5 +1,5 @@
-#ifdef USE_AMBIENTOCCLUSIONMAP
+#ifdef USE_AOMAP
 
-	outgoingLight *= ( texture2D( ambientOcclusionMap, vUv2 ).r - 1.0 ) * ambientOcclusionScale + 1.0;
+	outgoingLight *= ( texture2D( aoMap, vUv2 ).r - 1.0 ) * aoScale + 1.0;
 
 #endif

src/renderers/shaders/ShaderChunk/ambientocclusionmap_pars_fragment.glsl

@@ -1,6 +1,6 @@
-#ifdef USE_AMBIENTOCCLUSIONMAP
+#ifdef USE_AOMAP
 
-	uniform sampler2D ambientOcclusionMap;
-	uniform float ambientOcclusionScale;
+	uniform sampler2D aoMap;
+	uniform float aoScale;
 
 #endif

src/renderers/shaders/ShaderChunk/uv2_pars_fragment.glsl

@@ -1,4 +1,4 @@
-#if defined( USE_LIGHTMAP ) || defined( USE_AMBIENTOCCLUSIONMAP )
+#if defined( USE_LIGHTMAP ) || defined( USE_AOMAP )
 
 	varying vec2 vUv2;
 

src/renderers/shaders/ShaderChunk/uv2_pars_vertex.glsl

@@ -1,4 +1,4 @@
-#if defined( USE_LIGHTMAP ) || defined( USE_AMBIENTOCCLUSIONMAP )
+#if defined( USE_LIGHTMAP ) || defined( USE_AOMAP )
 
 	varying vec2 vUv2;
 

src/renderers/shaders/ShaderChunk/uv2_vertex.glsl

@@ -1,4 +1,4 @@
-#if defined( USE_LIGHTMAP ) || defined( USE_AMBIENTOCCLUSIONMAP )
+#if defined( USE_LIGHTMAP ) || defined( USE_AOMAP )
 
 	vUv2 = uv2;
 

src/renderers/shaders/UniformsLib.js

@@ -14,8 +14,8 @@ THREE.UniformsLib = {
 
 		"lightMap" : { type: "t", value: null },
 
-		"ambientOcclusionMap" : { type: "t", value: null },
-		"ambientOcclusionScale" : { type: "f", value: 1 },
+		"aoMap" : { type: "t", value: null },
+		"aoScale" : { type: "f", value: 1 },
 
 		"specularMap" : { type: "t", value: null },
 		"alphaMap" : { type: "t", value: null },

src/renderers/webgl/WebGLProgram.js

@@ -182,7 +182,7 @@ THREE.WebGLProgram = ( function () {
 				parameters.envMap ? '#define USE_ENVMAP' : '',
 				parameters.envMap ? '#define ' + envMapModeDefine : '',
 				parameters.lightMap ? '#define USE_LIGHTMAP' : '',
-				parameters.ambientOcclusionMap ? '#define USE_AMBIENTOCCLUSIONMAP' : '',
+				parameters.aoMap ? '#define USE_AOMAP' : '',
 				parameters.bumpMap ? '#define USE_BUMPMAP' : '',
 				parameters.normalMap ? '#define USE_NORMALMAP' : '',
 				parameters.specularMap ? '#define USE_SPECULARMAP' : '',
@@ -296,7 +296,7 @@ THREE.WebGLProgram = ( function () {
 				parameters.envMap ? '#define ' + envMapModeDefine : '',
 				parameters.envMap ? '#define ' + envMapBlendingDefine : '',
 				parameters.lightMap ? '#define USE_LIGHTMAP' : '',
-				parameters.ambientOcclusionMap ? '#define USE_AMBIENTOCCLUSIONMAP' : '',
+				parameters.aoMap ? '#define USE_AOMAP' : '',
 				parameters.bumpMap ? '#define USE_BUMPMAP' : '',
 				parameters.normalMap ? '#define USE_NORMALMAP' : '',
 				parameters.specularMap ? '#define USE_SPECULARMAP' : '',