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

Code cleanup

Browse Source
This commit is contained in:
Alex Szpakowski
2013-05-01 23:18:25 -07:00
parent 9ccf013570
commit f8c7e2cab8
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/math/MathModule.h
+8 -9
View File
@@ -27,7 +27,6 @@
#include "common/Module.h"
#include "common/math.h"
#include "common/int.h"
#include "common/StringMap.h"
// Noise
#include "libraries/noise1234/simplexnoise1234.h"
@@ -115,10 +114,10 @@ public:
*
* @return Noise value in the range of [0,1].
**/
float simplexNoise1(float x) const;
float simplexNoise2(float x, float y) const;
float simplexNoise3(float x, float y, float z) const;
float simplexNoise4(float x, float y, float z, float w) const;
float noise(float x) const;
float noise(float x, float y) const;
float noise(float x, float y, float z) const;
float noise(float x, float y, float z, float w) const;
static Math instance;
@@ -128,22 +127,22 @@ private:
}; // Math
inline float Math::simplexNoise1(float x) const
inline float Math::noise(float x) const
{
return SimplexNoise1234::noise(x);
}
inline float Math::simplexNoise2(float x, float y) const
inline float Math::noise(float x, float y) const
{
return SimplexNoise1234::noise(x, y);
}
inline float Math::simplexNoise3(float x, float y, float z) const
inline float Math::noise(float x, float y, float z) const
{
return SimplexNoise1234::noise(x, y, z);
}
inline float Math::simplexNoise4(float x, float y, float z, float w) const
inline float Math::noise(float x, float y, float z, float w) const
{
return SimplexNoise1234::noise(x, y, z, w);
}
src/modules/math/wrap_Math.cpp
+4 -4
View File
@@ -157,18 +157,18 @@ int w_noise(lua_State *L)
{
case 1:
x = luaL_checknumber(L, 1);
val = Math::instance.simplexNoise1(x);
val = Math::instance.noise(x);
break;
case 2:
x = luaL_checknumber(L, 1);
y = luaL_checknumber(L, 2);
val = Math::instance.simplexNoise2(x, y);
val = Math::instance.noise(x, y);
break;
case 3:
x = luaL_checknumber(L, 1);
y = luaL_checknumber(L, 2);
z = luaL_checknumber(L, 3);
val = Math::instance.simplexNoise3(x, y, z);
val = Math::instance.noise(x, y, z);
break;
case 4:
default:
@@ -176,7 +176,7 @@ int w_noise(lua_State *L)
y = luaL_checknumber(L, 2);
z = luaL_checknumber(L, 3);
w = luaL_checknumber(L, 4);
val = Math::instance.simplexNoise4(x, y, z, w);
val = Math::instance.noise(x, y, z, w);
break;
}