Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix sky objects not rendering with ogles (#7598)

Browse Source
This commit is contained in:
stujones11 2018-08-04 18:46:39 +01:00 committed by Paramat
parent 3b9d49b3c7
commit c5a137c29c
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/sky.cpp
View File

@ -44,7 +44,11 @@ Sky::Sky(s32 id, ITextureSource *tsrc):
video::SMaterial mat; video::SMaterial mat;
mat.Lighting = false; mat.Lighting = false;
#ifdef __ANDROID__
mat.ZBuffer = video::ECFN_DISABLED;
#else
mat.ZBuffer = video::ECFN_NEVER; mat.ZBuffer = video::ECFN_NEVER;
#endif
mat.ZWriteEnable = false; mat.ZWriteEnable = false;
mat.AntiAliasing = 0; mat.AntiAliasing = 0;
mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE; mat.TextureLayer[0].TextureWrapU = video::ETC_CLAMP_TO_EDGE;
@ -449,6 +453,34 @@ void Sky::render()
video::SColor starcolor(255, f * 90, f * 90, f * 90); video::SColor starcolor(255, f * 90, f * 90, f * 90);
if (starcolor.getBlue() < m_skycolor.getBlue()) if (starcolor.getBlue() < m_skycolor.getBlue())
break; break;
#ifdef __ANDROID__
u16 indices[SKY_STAR_COUNT * 3];
video::S3DVertex vertices[SKY_STAR_COUNT * 3];
for (u32 i = 0; i < SKY_STAR_COUNT; i++) {
indices[i * 3 + 0] = i * 3 + 0;
indices[i * 3 + 1] = i * 3 + 1;
indices[i * 3 + 2] = i * 3 + 2;
v3f p = m_stars[i];
core::CMatrix4<f32> a;
a.buildRotateFromTo(v3f(0, 1, 0), v3f(d, 1 + d, -d / 2));
v3f p1 = p;
a.rotateVect(p1);
a.buildRotateFromTo(v3f(0, 1, 0), v3f(d, 1 - d, d / 2));
v3f p2 = p;
a.rotateVect(p2);
p.rotateXYBy(wicked_time_of_day * 360 - 90);
p1.rotateXYBy(wicked_time_of_day * 360 - 90);
p2.rotateXYBy(wicked_time_of_day * 360 - 90);
vertices[i * 3 + 0].Pos = p;
vertices[i * 3 + 0].Color = starcolor;
vertices[i * 3 + 1].Pos = p1;
vertices[i * 3 + 1].Color = starcolor;
vertices[i * 3 + 2].Pos = p2;
vertices[i * 3 + 2].Color = starcolor;
}
driver->drawIndexedTriangleList(vertices, SKY_STAR_COUNT * 3,
indices, SKY_STAR_COUNT);
#else
u16 indices[SKY_STAR_COUNT * 4]; u16 indices[SKY_STAR_COUNT * 4];
video::S3DVertex vertices[SKY_STAR_COUNT * 4]; video::S3DVertex vertices[SKY_STAR_COUNT * 4];
for (u32 i = 0; i < SKY_STAR_COUNT; i++) { for (u32 i = 0; i < SKY_STAR_COUNT; i++) {
@ -483,6 +515,7 @@ void Sky::render()
driver->drawVertexPrimitiveList(vertices, SKY_STAR_COUNT * 4, driver->drawVertexPrimitiveList(vertices, SKY_STAR_COUNT * 4,
indices, SKY_STAR_COUNT, video::EVT_STANDARD, indices, SKY_STAR_COUNT, video::EVT_STANDARD,
scene::EPT_QUADS, video::EIT_16BIT); scene::EPT_QUADS, video::EIT_16BIT);
#endif
} while(false); } while(false);
// Draw far cloudy fog thing below east and west horizons // Draw far cloudy fog thing below east and west horizons