Startsida Utforska Hjälp
Logga in
javascript
/
three.js
spegling av https://github.com/tazdij/three.js.git
2
0
Fork 0
Filer Ärenden 0 Wiki
Bläddra i källkod

MeshLambertMaterial: Added support for lightMap, aoMap, emissiveMap

WestLangley 9 år sedan
förälder
752a91a32f
incheckning
ca9f0ba3cc
4 ändrade filer med 83 tillägg och 6 borttagningar
Delad Vy Visa Diff Statistik
  1. 13 1
      docs/api/materials/MeshLambertMaterial.html
  2. 24 0
      src/materials/MeshLambertMaterial.js
  3. 21 0
      src/renderers/WebGLRenderer.js
  4. 25 5
      src/renderers/shaders/ShaderLib.js

+ 13 - 1
docs/api/materials/MeshLambertMaterial.html
Visa fil 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 	<head>
 
-		<meta charset="utf-8" />

+		<meta charset="utf-8" />
 
 		<base href="../../" />
 
 		<script src="list.js"></script>
 
 		<script src="page.js"></script>
 
@@ -26,6 +26,9 @@
 
 		<div>
 
 		color — Line color in hexadecimal. Default is 0xffffff.<br />
 
 		map — Sets the texture map. Default is null <br />
 
+		lightMap — Set light map. Default is null.<br />
 
+		aoMap — Set ao map. Default is null.<br />
 
+		emissiveMap — Set emissive map. Default is null.<br />
 
 		specularMap — Set specular map. Default is null.<br />
 
 		alphaMap — Set alpha map. Default is null.<br />
 
 		envMap — Set env map. Default is null.<br />
 
@@ -56,6 +59,15 @@
 
 		<h3>[property:Texture map]</h3>
 
 		<div>Set color texture map. Default is null.</div>
 
 
+		<h3>[property:Texture lightMap]</h3>
 
+		<div>Set light map. Default is null. The lightMap requires a second set of UVs.</div>
 
+
 
+		<h3>[property:Texture aoMap]</h3>
 
+		<div>Set ambient occlusion map. Default is null. The aoMap requires a second set of UVs.</div>
 
+
 
+		<h3>[property:Texture emissiveMap]</h3>
 
+		<div>Set emisssive (glow) map. Default is null. The emissive map color is modulated by the emissive color. If you have an emissive map, be sure to set the emissive color to something other than black.</div>
 
+
 
 		<h3>[property:Texture specularMap]</h3>
 
 		<div>Since this material does not have a specular component, the specular value affects only how much of the environment map affects the surface. Default is null.</div>

+ 24 - 0
src/materials/MeshLambertMaterial.js
Visa fil 

@@ -9,6 +9,14 @@
 
  *
 
  *  map: new THREE.Texture( <Image> ),
 
  *
 
+ *  lightMap: new THREE.Texture( <Image> ),
 
+ *  lightMapIntensity: <float>
 
+ *
 
+ *  aoMap: new THREE.Texture( <Image> ),
 
+ *  aoMapIntensity: <float>
 
+ *
 
+ *  emissiveMap: new THREE.Texture( <Image> ),
 
+ *
 
  *  specularMap: new THREE.Texture( <Image> ),
 
  *
 
  *  alphaMap: new THREE.Texture( <Image> ),
 
@@ -46,6 +54,14 @@ THREE.MeshLambertMaterial = function ( parameters ) {
 
 
 	this.map = null;
 
 
+	this.lightMap = null;
 
+	this.lightMapIntensity = 1.0;
 
+
 
+	this.aoMap = null;
 
+	this.aoMapIntensity = 1.0;
 
+
 
+	this.emissiveMap = null;
 
+
 
 	this.specularMap = null;
 
 
 	this.alphaMap = null;
 
@@ -84,6 +100,14 @@ THREE.MeshLambertMaterial.prototype.copy = function ( source ) {
 
 
 	this.map = source.map;
 
 
+	this.lightMap = source.lightMap;
 
+	this.lightMapIntensity = source.lightMapIntensity;
 
+
 
+	this.aoMap = source.aoMap;
 
+	this.aoMapIntensity = source.aoMapIntensity;
 
+
 
+	this.emissiveMap = source.emissiveMap;
 
+
 
 	this.specularMap = source.specularMap;
 
 
 	this.alphaMap = source.alphaMap;

+ 21 - 0
src/renderers/WebGLRenderer.js
Visa fil 

@@ -1799,6 +1799,10 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				refreshUniformsPoints( m_uniforms, material );
 
 
+			} else if ( material instanceof THREE.MeshLambertMaterial ) {
 
+
 
+				refreshUniformsLambert( m_uniforms, material );
 
+
 
 			} else if ( material instanceof THREE.MeshPhongMaterial ) {
 
 
 				refreshUniformsPhong( m_uniforms, material );
 
@@ -2023,6 +2027,23 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 	}
 
 
+	function refreshUniformsLambert ( uniforms, material ) {
 
+
 
+		if ( material.lightMap ) {
 
+
 
+			uniforms.lightMap.value = material.lightMap;
 
+			uniforms.lightMapIntensity.value = material.lightMapIntensity;
 
+
 
+		}
 
+
 
+		if ( material.emissiveMap ) {
 
+
 
+			uniforms.emissiveMap.value = material.emissiveMap;
 
+
 
+		}
 
+
 
+	}
 
+
 
 	function refreshUniformsPhong ( uniforms, material ) {
 
 
 		uniforms.specular.value = material.specular;

+ 25 - 5
src/renderers/shaders/ShaderLib.js
Visa fil 

@@ -127,6 +127,9 @@ THREE.ShaderLib = {
 
 		uniforms: THREE.UniformsUtils.merge( [
 
 
 			THREE.UniformsLib[ "common" ],
 
+			THREE.UniformsLib[ "aomap" ],
 
+			THREE.UniformsLib[ "lightmap" ],
 
+			THREE.UniformsLib[ "emissivemap" ],
 
 			THREE.UniformsLib[ "fog" ],
 
 			THREE.UniformsLib[ "ambient" ],
 
 			THREE.UniformsLib[ "lights" ],
 
@@ -209,6 +212,9 @@ THREE.ShaderLib = {
 
 			THREE.ShaderChunk[ "uv2_pars_fragment" ],
 
 			THREE.ShaderChunk[ "map_pars_fragment" ],
 
 			THREE.ShaderChunk[ "alphamap_pars_fragment" ],
 
+			THREE.ShaderChunk[ "aomap_pars_fragment" ],
 
+			THREE.ShaderChunk[ "lightmap_pars_fragment" ],
 
+			THREE.ShaderChunk[ "emissivemap_pars_fragment" ],
 
 			THREE.ShaderChunk[ "envmap_pars_fragment" ],
 
 			THREE.ShaderChunk[ "ambient_pars" ],
 
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 
@@ -221,6 +227,7 @@ THREE.ShaderLib = {
 
 			"	vec3 outgoingLight = vec3( 0.0 );",
 
 			"	vec4 diffuseColor = vec4( diffuse, opacity );",
 
 			"	vec3 totalAmbientLight = getAmbientLightIrradiance( ambientLightColor );",
 
+			"	vec3 totalEmissiveLight = emissive;",
 
 
 				THREE.ShaderChunk[ "logdepthbuf_fragment" ],
 
 				THREE.ShaderChunk[ "map_fragment" ],
 
@@ -228,18 +235,33 @@ THREE.ShaderLib = {
 
 				THREE.ShaderChunk[ "alphamap_fragment" ],
 
 				THREE.ShaderChunk[ "alphatest_fragment" ],
 
 				THREE.ShaderChunk[ "specularmap_fragment" ],
 
+				THREE.ShaderChunk[ "emissivemap_fragment" ],
 
 				THREE.ShaderChunk[ "shadowmap_fragment" ],
 
 
+				// former lightmap_fragment.glsl
 
+			"	#ifdef USE_LIGHTMAP",
 
+
 
+			"		totalAmbientLight += PI * texture2D( lightMap, vUv2 ).xyz * lightMapIntensity;", // factor of PI should not be present; included here to prevent breakage
 
+
 
+			"	#endif",
 
+
 
+				// former aomap_fragment.glsl
 
+			"	#ifdef USE_AOMAP",
 
+
 
+			"		totalAmbientLight *= ( texture2D( aoMap, vUv2 ).r - 1.0 ) * aoMapIntensity + 1.0;",
 
+
 
+			"	#endif",
 
+
 
 			"	#ifdef DOUBLE_SIDED",
 
 
 			"		if ( gl_FrontFacing )",
 
-			"			outgoingLight += RECIPROCAL_PI * diffuseColor.rgb * ( vLightFront * shadowMask + totalAmbientLight ) + emissive;",
 
+			"			outgoingLight += RECIPROCAL_PI * diffuseColor.rgb * ( vLightFront * shadowMask + totalAmbientLight ) + totalEmissiveLight;",
 
 			"		else",
 
-			"			outgoingLight += RECIPROCAL_PI * diffuseColor.rgb * ( vLightBack * shadowMask + totalAmbientLight ) + emissive;",
 
+			"			outgoingLight += RECIPROCAL_PI * diffuseColor.rgb * ( vLightBack * shadowMask + totalAmbientLight ) + totalEmissiveLight;",
 
 
 			"	#else",
 
 
-			"		outgoingLight += RECIPROCAL_PI * diffuseColor.rgb * ( vLightFront * shadowMask + totalAmbientLight ) + emissive;",
 
+			"		outgoingLight += RECIPROCAL_PI * diffuseColor.rgb * ( vLightFront * shadowMask + totalAmbientLight ) + totalEmissiveLight;",
 
 
 			"	#endif",
 
 
@@ -392,7 +414,6 @@ THREE.ShaderLib = {
 
 				// accumulation
 
 				THREE.ShaderChunk[ "lights_phong_fragment" ],
 
 				THREE.ShaderChunk[ "lights_template" ],
 
-				THREE.ShaderChunk[ "lightmap_fragment" ],
 
 
 				// modulation
 
 				THREE.ShaderChunk[ "aomap_fragment" ],
 
@@ -562,7 +583,6 @@ THREE.ShaderLib = {
 
 				// accumulation
 
 				THREE.ShaderChunk[ "lights_standard_fragment" ],
 
 				THREE.ShaderChunk[ "lights_template" ],
 
-				THREE.ShaderChunk[ "lightmap_fragment" ],
 
 
 				// modulation
 
 				THREE.ShaderChunk[ "aomap_fragment" ],