Browse Source

Removing functions already defined in LegacyPBRMaterial (declared in HelperFunctions.fx)

Julien Moreau-Mathis 8 years ago
parent
commit
8779842c1c

+ 0 - 14
materialsLibrary/src/legacyPBR/legacyPbr.fragment.fx

@@ -129,20 +129,6 @@ varying vec3 vDirectionW;
 
 
 #include<legacyPbrLightFunctions>
 #include<legacyPbrLightFunctions>
 
 
-mat3 transposeMat3(mat3 inMatrix) {
-	vec3 i0 = inMatrix[0];
-	vec3 i1 = inMatrix[1];
-	vec3 i2 = inMatrix[2];
-
-	mat3 outMatrix = mat3(
-		vec3(i0.x, i1.x, i2.x),
-		vec3(i0.y, i1.y, i2.y),
-		vec3(i0.z, i1.z, i2.z)
-		);
-
-	return outMatrix;
-}
-
 #include<bumpFragmentFunctions>
 #include<bumpFragmentFunctions>
 #include<clipPlaneFragmentDeclaration>
 #include<clipPlaneFragmentDeclaration>
 #include<logDepthDeclaration>
 #include<logDepthDeclaration>

+ 0 - 15
materialsLibrary/src/legacyPBR/legacyPbrFunctions.fx

@@ -12,11 +12,6 @@ float Square(float value)
     return value * value;
     return value * value;
 }
 }
 
 
-float getLuminance(vec3 color)
-{
-    return clamp(dot(color, vec3(0.2126, 0.7152, 0.0722)), 0., 1.);
-}
-
 float convertRoughnessToAverageSlope(float roughness)
 float convertRoughnessToAverageSlope(float roughness)
 {
 {
     // Calculate AlphaG as square of roughness; add epsilon to avoid numerical issues
     // Calculate AlphaG as square of roughness; add epsilon to avoid numerical issues
@@ -140,16 +135,6 @@ float computeDefaultMicroSurface(float microSurface, vec3 reflectivityColor)
     return microSurface;
     return microSurface;
 }
 }
 
 
-vec3 toLinearSpace(vec3 color)
-{
-    return vec3(pow(color.r, 2.2), pow(color.g, 2.2), pow(color.b, 2.2));
-}
-
-vec3 toGammaSpace(vec3 color)
-{
-    return vec3(pow(color.r, 1.0 / 2.2), pow(color.g, 1.0 / 2.2), pow(color.b, 1.0 / 2.2));
-}
-
 #ifdef CAMERATONEMAP
 #ifdef CAMERATONEMAP
     vec3 toneMaps(vec3 color)
     vec3 toneMaps(vec3 color)
     {
     {