From 22cbc9644b79df60b3f6336f9563debd47fb3ea1 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 28 Jun 2012 11:44:15 -0700 Subject: Added capability to split a mesh into multiiple parts to avoid buffer overflow situations. --- assets/shaders/test_fshader_full.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'assets/shaders/test_fshader_full.glsl') diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl index ef721b39..0ea3cf1b 100755 --- a/assets/shaders/test_fshader_full.glsl +++ b/assets/shaders/test_fshader_full.glsl @@ -38,7 +38,7 @@ varying vec3 vEyePos; void main() { - vec4 colMapTexel = vec4(texture2D(colMap, vec2(vNormal.w, vECPos.w)).rgb, 1.0); + vec4 colMapTexel = vec4(texture2D(colMap, vec2(vNormal.w, 1.0 - vECPos.w)).rgb, 1.0); // normal mapping vec3 normal = normalize(vNormal.xyz); -- cgit v1.2.3 From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- assets/shaders/test_fshader_full.glsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'assets/shaders/test_fshader_full.glsl') diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl index ae7d45b2..5fcc280b 100755 --- a/assets/shaders/test_fshader_full.glsl +++ b/assets/shaders/test_fshader_full.glsl @@ -41,7 +41,7 @@ uniform vec4 u_lightAmb; // diffuse map uniform sampler2D colMap; -// environment map +// environment map uniform sampler2D envMap; // normal map @@ -90,15 +90,15 @@ void main() float pf; if(diffuseIntensity == 0.0) - pf = 0.0; + pf = 0.0; else - pf = pow(specularModifier, 76.0); + pf = pow(specularModifier, 76.0); vec4 ambient = u_matAmbient * u_lightAmb; vec4 diffuse = u_matDiffuse * (colMapTexel + envMapTexel); if (u_renderGlow <= 0.5) - diffuse *= u_lightDiff * diffuseIntensity * attenuation; + diffuse *= u_lightDiff * diffuseIntensity * attenuation; vec4 specular = 2.0 * pf * envMapTexel; -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- assets/shaders/test_fshader_full.glsl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'assets/shaders/test_fshader_full.glsl') diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl index 5fcc280b..c381c6bf 100755 --- a/assets/shaders/test_fshader_full.glsl +++ b/assets/shaders/test_fshader_full.glsl @@ -41,7 +41,7 @@ uniform vec4 u_lightAmb; // diffuse map uniform sampler2D colMap; -// environment map +// environment map uniform sampler2D envMap; // normal map @@ -68,39 +68,39 @@ void main() vec3 normal = normalize(vNormal.xyz); vec3 mapNormal = texture2D(normalMap, vec2(vNormal.w, vECPos.w)).xyz * 2.0 - 1.0; mapNormal = normalize(mapNormal.x*vec3(normal.z, 0.0, -normal.x) + vec3(0.0, mapNormal.y, 0.0) + mapNormal.z*normal); - + // create envmap coordinates vec3 r = reflect( normalize(vec3(vECPos.xyz - vEyePos.xyz)), mapNormal); float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + r.z*r.z ); - + // calculate environment map texel vec4 envMapTexel = vec4(texture2D(envMap, vec2(r.x/m + 0.5, r.y/m + 0.5)).rgb, 0.0); - + // lighting vec3 lightDirection = u_lightPos - vECPos.xyz; float lightDist = length(lightDirection); lightDirection /= lightDist; - + float attenuation = clamp(1.0 - lightDist * 0.01, 0.0, 1.0); - + vec3 halfVec = normalize(lightDirection + vEyePos); - + float diffuseIntensity = max(0.0, dot(mapNormal, lightDirection)); float specularModifier = max(0.0, dot(mapNormal, halfVec)); - + float pf; if(diffuseIntensity == 0.0) pf = 0.0; else pf = pow(specularModifier, 76.0); - + vec4 ambient = u_matAmbient * u_lightAmb; vec4 diffuse = u_matDiffuse * (colMapTexel + envMapTexel); if (u_renderGlow <= 0.5) diffuse *= u_lightDiff * diffuseIntensity * attenuation; - + vec4 specular = 2.0 * pf * envMapTexel; - + gl_FragColor = (colMapTexel*(ambient + diffuse)) + specular + vec4(0.0,0.0,0.0,1.0); } -- cgit v1.2.3 From fdbec324dad4ab33d97282ab021d2c1661bc097c Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Mon, 9 Jul 2012 16:27:52 -0700 Subject: BSD License --- assets/shaders/test_fshader_full.glsl | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'assets/shaders/test_fshader_full.glsl') diff --git a/assets/shaders/test_fshader_full.glsl b/assets/shaders/test_fshader_full.glsl index b2fc60e9..ab1bee7a 100755 --- a/assets/shaders/test_fshader_full.glsl +++ b/assets/shaders/test_fshader_full.glsl @@ -1,24 +1,25 @@ /* -Copyright (c) 2012, Motorola Mobility, Inc +Copyright (c) 2012, Motorola Mobility LLC. All Rights Reserved. -BSD License. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - Neither the name of Motorola Mobility nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of Motorola Mobility LLC nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- cgit v1.2.3