LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-20 04:31:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Using latest love-android branch (e263d91d136d)

Browse Source
This commit is contained in:
fysx
2014-04-04 11:37:36 +02:00
parent 8acfb8d91a
commit e96eef4435
87 changed files with 1070 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/src/modules/math/MathModule.cpp
+13 -13
View File
@@ -198,14 +198,14 @@ bool Math::isConvex(const std::vector<Vertex> &polygon)
**/
float Math::gammaToLinear(float c) const
{
if (c > 1.0)
return 1.0;
else if (c < 0.0)
return 0.0;
if (c > 1.0f)
return 1.0f;
else if (c < 0.0f)
return 0.0f;
else if (c <= 0.04045)
return c / 12.92;
return c / 12.92f;
else
return powf((c + 0.055) / 1.055, 2.4);
return powf((c + 0.055f) / 1.055f, 2.4f);
}
/**
@@ -213,14 +213,14 @@ float Math::gammaToLinear(float c) const
**/
float Math::linearToGamma(float c) const
{
if (c > 1.0)
return 1.0;
else if (c < 0.0)
return 0.0;
else if (c < 0.0031308)
return c * 12.92;
if (c > 1.0f)
return 1.0f;
else if (c < 0.0f)
return 0.0f;
else if (c < 0.0031308f)
return c * 12.92f;
else
return 1.055 * powf(c, 0.41666) - 0.055;
return 1.055f * powf(c, 0.41666f) - 0.055f;
}
} // math
jni/love/src/modules/math/wrap_Math.cpp
+2 -2
View File
@@ -259,7 +259,7 @@ static int getGammaArgs(lua_State *L, float color[4])
for (int i = 1; i <= n && i <= 4; i++)
{
lua_rawgeti(L, 1, i);
color[i - 1] = (float) luaL_checknumber(L, -1) / 255.0;
color[i - 1] = (float) luaL_checknumber(L, -1) / 255.0f;
numcomponents++;
}
@@ -270,7 +270,7 @@ static int getGammaArgs(lua_State *L, float color[4])
int n = lua_gettop(L);
for (int i = 1; i <= n && i <= 4; i++)
{
color[i - 1] = (float) luaL_checknumber(L, i) / 255.0;
color[i - 1] = (float) luaL_checknumber(L, i) / 255.0f;
numcomponents++;
}
}