mirror of
https://github.com/minetest/irrlicht.git
synced 2025-06-28 06:20:21 +02:00
Merging r6075 through r6106 from trunk to ogl-es branch.
Burnings renderer changes. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@ -57,7 +57,7 @@ typedef f32 generate_func(s16 x, s16 y, f32 s);
|
||||
f32 eggbox(s16 x, s16 y, f32 s)
|
||||
{
|
||||
const f32 r = 4.f*sqrtf((f32)(x*x + y*y))/s;
|
||||
const f32 z = expf(-r * 2) * (cosf(0.2f * x) + cosf(0.2f * y));
|
||||
const f32 z = (f32)exp(-r * 2) * (cosf(0.2f * x) + cosf(0.2f * y));
|
||||
return 0.25f+0.25f*z;
|
||||
}
|
||||
|
||||
@ -180,7 +180,7 @@ private:
|
||||
public:
|
||||
SMesh* Mesh;
|
||||
|
||||
TMesh() : Mesh(0), Width(0), Height(0), Scale(1.f)
|
||||
TMesh() : Width(0), Height(0), Scale(1.f), Mesh(0)
|
||||
{
|
||||
Mesh = new SMesh();
|
||||
}
|
||||
|
Reference in New Issue
Block a user