Merge pull request #335 from guycalledfrank/matrefactor4

Material system refactor 2

src/graphics/programlib/chunks/normalMap.frag

@@ -1,5 +1,5 @@
 uniform sampler2D texture_normalMap;
-uniform float material_bumpMapFactor;
+uniform float material_bumpiness;
 void getNormal(inout psInternalData data) {
     vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV));
     data.normalMap = normalMap;

src/graphics/programlib/chunks/normalMapFloat.frag

@@ -1,9 +1,9 @@
 uniform sampler2D texture_normalMap;
-uniform float material_bumpMapFactor;
+uniform float material_bumpiness;
 void getNormal(inout psInternalData data) {
     vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV));
     data.normalMap = normalMap;
-    normalMap = normalize(mix(vec3(0.0, 0.0, 1.0), normalMap, material_bumpMapFactor));
+    normalMap = normalize(mix(vec3(0.0, 0.0, 1.0), normalMap, material_bumpiness));
     data.normalW = data.TBN * normalMap;
 }
 

src/graphics/programlib/chunks/normalMapFloatTBNfast.frag

@@ -1,9 +1,9 @@
 uniform sampler2D texture_normalMap;
-uniform float material_bumpMapFactor;
+uniform float material_bumpiness;
 void getNormal(inout psInternalData data) {
     vec3 normalMap = unpackNormal(texture2D(texture_normalMap, $UV));
     data.normalMap = normalMap;
-    normalMap = mix(vec3(0.0, 0.0, 1.0), normalMap, material_bumpMapFactor);
+    normalMap = mix(vec3(0.0, 0.0, 1.0), normalMap, material_bumpiness);
     data.normalW = normalize(data.TBN * normalMap);
 }
 

src/graphics/programlib/chunks/reflectionCube.frag

@@ -1,7 +1,7 @@
 uniform samplerCube texture_cubeMap;
-uniform float material_reflectionFactor;
+uniform float material_reflectivity;
 void addReflection(inout psInternalData data) {
     vec3 lookupVec = fixSeams(cubeMapProject(data.reflDirW));
     lookupVec.x *= -1.0;
-    data.reflection += vec4($textureCubeSAMPLE(texture_cubeMap, lookupVec).rgb, material_reflectionFactor);
+    data.reflection += vec4($textureCubeSAMPLE(texture_cubeMap, lookupVec).rgb, material_reflectivity);
 }

src/graphics/programlib/chunks/reflectionDpAtlas.frag

@@ -1,5 +1,5 @@
 uniform sampler2D texture_sphereMap;
-uniform float material_reflectionFactor;
+uniform float material_reflectivity;
 
 vec2 getDpAtlasUv(vec2 uv, float mip) {
 
@@ -50,7 +50,7 @@ void addReflection(inout psInternalData data) {
     tex1 = mix(tex1, tex2, fract(bias));
     tex1 = processEnvironment(tex1);
 
-    data.reflection += vec4(tex1, material_reflectionFactor);
+    data.reflection += vec4(tex1, material_reflectivity);
 }
 
 

src/graphics/programlib/chunks/reflectionPrefilteredCube.frag

@@ -4,7 +4,7 @@ uniform samplerCube texture_prefilteredCubeMap32;
 uniform samplerCube texture_prefilteredCubeMap16;
 uniform samplerCube texture_prefilteredCubeMap8;
 uniform samplerCube texture_prefilteredCubeMap4;
-uniform float material_reflectionFactor;
+uniform float material_reflectivity;
 
 void addReflection(inout psInternalData data) {
 
@@ -56,6 +56,6 @@ void addReflection(inout psInternalData data) {
     vec4 cubeFinal = mix(cube[0], cube[1], fract(bias));
     vec3 refl = processEnvironment($DECODE(cubeFinal).rgb);
 
-    data.reflection += vec4(refl, material_reflectionFactor);
+    data.reflection += vec4(refl, material_reflectivity);
 }
 

src/graphics/programlib/chunks/reflectionPrefilteredCubeLod.frag

@@ -1,7 +1,7 @@
 #extension GL_EXT_shader_texture_lod : enable
 
 uniform samplerCube texture_prefilteredCubeMap128;
-uniform float material_reflectionFactor;
+uniform float material_reflectivity;
 
 void addReflection(inout psInternalData data) {
 
@@ -11,6 +11,6 @@ void addReflection(inout psInternalData data) {
 
     vec3 refl = processEnvironment($DECODE( textureCubeLodEXT(texture_prefilteredCubeMap128, fixedReflDir, bias) ).rgb);
 
-    data.reflection += vec4(refl, material_reflectionFactor);
+    data.reflection += vec4(refl, material_reflectivity);
 }
 

src/graphics/programlib/chunks/reflectionSphere.frag

@@ -1,14 +1,14 @@
 uniform mat4 matrix_view;
 uniform sampler2D texture_sphereMap;
-uniform float material_reflectionFactor;
+uniform float material_reflectivity;
 void addReflection(inout psInternalData data) {
 
     vec3 reflDirV = (mat3(matrix_view) * data.reflDirW).xyz;
 
     float m = 2.0 * sqrt( dot(reflDirV.xy, reflDirV.xy) + (reflDirV.z+1.0)*(reflDirV.z+1.0) );
     vec2 sphereMapUv = reflDirV.xy / m + 0.5;
 
-    data.reflection += vec4($texture2DSAMPLE(texture_sphereMap, sphereMapUv).rgb, material_reflectionFactor);
+    data.reflection += vec4($texture2DSAMPLE(texture_sphereMap, sphereMapUv).rgb, material_reflectivity);
 }
 
 

src/graphics/programlib/chunks/reflectionSphereLow.frag

@@ -1,10 +1,10 @@
 uniform sampler2D texture_sphereMap;
-uniform float material_reflectionFactor;
+uniform float material_reflectivity;
 void addReflection(inout psInternalData data) {
 
     vec3 reflDirV = vNormalV;
 
     vec2 sphereMapUv = reflDirV.xy * 0.5 + 0.5;
-    data.reflection += vec4($texture2DSAMPLE(texture_sphereMap, sphereMapUv).rgb, material_reflectionFactor);
+    data.reflection += vec4($texture2DSAMPLE(texture_sphereMap, sphereMapUv).rgb, material_reflectivity);
 }
 

src/graphics/programlib/chunks/refraction.frag

@@ -1,4 +1,4 @@
-uniform float material_refraction, material_refractionIor;
+uniform float material_refraction, material_refractionIndex;
 
 vec3 refract2(vec3 viewVec, vec3 Normal, float IOR) {
     float vn = dot(viewVec, Normal);
@@ -13,7 +13,7 @@ void addRefraction(inout psInternalData data) {
     vec3 tmp = data.reflDirW;
     vec4 tmp2 = data.reflection;
     data.reflection = vec4(0.0);
-    data.reflDirW = refract2(-data.viewDirW, data.normalW, material_refractionIor);
+    data.reflDirW = refract2(-data.viewDirW, data.normalW, material_refractionIndex);
 
     addReflection(data);
 

src/graphics/programlib/chunks/specularAaToksvigFloat.frag

@@ -1,6 +1,6 @@
 float antiAliasGlossiness(inout psInternalData data, float power) {
     float rlen = 1.0 / saturate(length(data.normalMap));
     float toksvig = 1.0 / (1.0 + power * (rlen - 1.0));
-    return power * mix(1.0, toksvig, material_bumpMapFactor);
+    return power * mix(1.0, toksvig, material_bumpiness);
 }
 

src/graphics/programlib/programlib_programlib.js

@@ -115,7 +115,7 @@ pc.programlib = {
                                  // V, the view vector (vertex to eye)
                     code += '    vec3 map = texture2D( texture_normalMap, uv ).xyz;\n';
                     code += '    map = map * 255./127. - 128./127.;\n';
-                    code += '    map.xy = map.xy * material_bumpMapFactor;\n';
+                    code += '    map.xy = map.xy * material_bumpiness;\n';
                     code += '    mat3 TBN = cotangent_frame( N, -V, uv );\n';
                     code += '    return normalize( TBN * map );\n';
                     code += '}\n\n';

src/scene/scene_material.js

@@ -220,7 +220,22 @@ pc.extend(pc, function () {
      * @name {number|Array|pc.Texture} data The value for the specified parameter.
      * @author Will Eastcott
      */
-    Material.prototype.setParameter = function (name, data) {
+    Material.prototype.setParameter = function (arg, data) {
+
+        var name;
+        if (data===undefined) {
+            var uniformObject = arg;
+            if (uniformObject.length) {
+                for(var i=0; i<uniformObject.length; i++) this.setParameter(uniformObject[i]);
+                    return;
+            } else {
+                name = uniformObject.name;
+                data = uniformObject.value;
+            }
+        } else {
+            name = arg;
+        }
+
         var param = this.parameters[name];
         if (param) {
             param.data = data;