Browse Source

UniformsLib: Renamed points.psColor to points.diffuse.

Mr.doob 9 years ago
parent
commit
3fd20d9809

+ 1 - 1
src/renderers/WebGLRenderer.js

@@ -1982,7 +1982,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 	function refreshUniformsPoints ( uniforms, material ) {
 
-		uniforms.psColor.value = material.color;
+		uniforms.diffuse.value = material.color;
 		uniforms.opacity.value = material.opacity;
 		uniforms.size.value = material.size * getTargetPixelRatio();
 		uniforms.scale.value = _canvas.height / 2.0; // TODO: Cache this.

+ 2 - 2
src/renderers/shaders/ShaderLib.js

@@ -617,7 +617,7 @@ THREE.ShaderLib = {
 
 		fragmentShader: [
 
-			"uniform vec3 psColor;",
+			"uniform vec3 diffuse;",
 			"uniform float opacity;",
 
 			THREE.ShaderChunk[ "common" ],
@@ -630,7 +630,7 @@ THREE.ShaderLib = {
 			"void main() {",
 
 			"	vec3 outgoingLight = vec3( 0.0 );",
-			"	vec4 diffuseColor = vec4( psColor, opacity );",
+			"	vec4 diffuseColor = vec4( diffuse, opacity );",
 
 				THREE.ShaderChunk[ "logdepthbuf_fragment" ],
 				THREE.ShaderChunk[ "map_particle_fragment" ],

+ 1 - 1
src/renderers/shaders/UniformsLib.js

@@ -125,7 +125,7 @@ THREE.UniformsLib = {
 
 	points: {
 
-		"psColor" : { type: "c", value: new THREE.Color( 0xeeeeee ) },
+		"diffuse" : { type: "c", value: new THREE.Color( 0xeeeeee ) },
 		"opacity" : { type: "f", value: 1.0 },
 		"size" : { type: "f", value: 1.0 },
 		"scale" : { type: "f", value: 1.0 },