rename oaMapScale -> aoMapIntensity

editor/js/Sidebar.Material.js

@@ -625,7 +625,7 @@ Sidebar.Material = function ( editor ) {
 				if ( objectHasUvs ) {
 
 					material.aoMap = aoMapEnabled ? materialAOMap.getValue() : null;
-					material.oaMapScale = materialAOScale.getValue();
+					material.aoMapIntensity = materialAOScale.getValue();
 					material.needsUpdate = true;
 
 				} else {
@@ -866,7 +866,7 @@ Sidebar.Material = function ( editor ) {
 
 				materialAOMapEnabled.setValue( material.aoMap !== null );
 				materialAOMap.setValue( material.aoMap );
-				materialAOScale.setValue( material.oaMapScale );
+				materialAOScale.setValue( material.aoMapIntensity );
 
 			}
 

src/loaders/ObjectLoader.js

@@ -287,8 +287,8 @@ THREE.ObjectLoader.prototype = {
 				if ( data.aoMap !== undefined ) {
 
 					material.aoMap = getTexture( data.aoMap );
-					if ( data.aoMapScale !== undefined ) {
-						material.aoMapScale = data.aoMapScale;
+					if ( data.aoMapIntensity !== undefined ) {
+						material.aoMapIntensity = data.aoMapIntensity;
 					}
 				}
 

src/materials/MeshPhongMaterial.js

@@ -15,7 +15,7 @@
  *  lightMapIntensity: <float>
  *
  *  aoMap: new THREE.Texture( <Image> ),
- *  oaMapScale: <float>
+ *  aoMapIntensity: <float>
  *
  *  bumpMap: new THREE.Texture( <Image> ),
  *  bumpScale: <float>,
@@ -72,7 +72,7 @@ THREE.MeshPhongMaterial = function ( parameters ) {
 	this.lightMapIntensity = null;
 
 	this.aoMap = null;
-	this.oaMapScale = 1.0;
+	this.aoMapIntensity = 1.0;
 
 	this.bumpMap = null;
 	this.bumpScale = 1;
@@ -133,7 +133,7 @@ THREE.MeshPhongMaterial.prototype.clone = function () {
 	material.lightMapIntensity = this.lightMapIntensity;
 
 	material.aoMap = this.aoMap;
-	material.oaMapScale = this.oaMapScale;
+	material.aoMapIntensity = this.aoMapIntensity;
 
 	material.bumpMap = this.bumpMap;
 	material.bumpScale = this.bumpScale;

src/renderers/WebGLRenderer.js

@@ -4583,7 +4583,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 		uniforms.lightMap.value = material.lightMap;
 		uniforms.lightMapIntensity.value = material.lightMapIntensity;
 		uniforms.aoMap.value = material.aoMap;
-		uniforms.oaMapScale.value = material.oaMapScale;
+		uniforms.aoMapIntensity.value = material.aoMapIntensity;
 		uniforms.specularMap.value = material.specularMap;
 		uniforms.alphaMap.value = material.alphaMap;
 

src/renderers/shaders/ShaderChunk/aomap_fragment.glsl

@@ -1,5 +1,5 @@
 #ifdef USE_AOMAP
 
-	outgoingLight *= ( texture2D( aoMap, vUv2 ).r - 1.0 ) * oaMapScale + 1.0;
+	outgoingLight *= ( texture2D( aoMap, vUv2 ).r - 1.0 ) * aoMapIntensity + 1.0;
 
 #endif

src/renderers/shaders/ShaderChunk/aomap_pars_fragment.glsl

@@ -1,6 +1,6 @@
 #ifdef USE_AOMAP
 
 	uniform sampler2D aoMap;
-	uniform float oaMapScale;
+	uniform float aoMapIntensity;
 
 #endif

src/renderers/shaders/UniformsLib.js

@@ -16,7 +16,7 @@ THREE.UniformsLib = {
 		"lightMapIntensity" : { type: "f", value: 1 },
 
 		"aoMap" : { type: "t", value: null },
-		"oaMapScale" : { type: "f", value: 1 },
+		"aoMapIntensity" : { type: "f", value: 1 },
 
 		"specularMap" : { type: "t", value: null },
 		"alphaMap" : { type: "t", value: null },