Merge pull request #21 from cmf028/master

Fix glsl DEFORM_BULGE calculation
This commit is contained in:
James Canete 2013-12-01 19:33:51 -08:00
commit c02528cf1d
4 changed files with 4 additions and 4 deletions

View file

@ -32,7 +32,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{

View file

@ -41,7 +41,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{

View file

@ -73,7 +73,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{

View file

@ -38,7 +38,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{