Cleanup shader generation code (#10663)

[dragonfireclient.git] / src / client / sky.cpp

diff --git a/src/client/sky.cpp b/src/client/sky.cpp
index 0fccf067c7300eb46553227fff5114cfc500a944..3a40321dd1e758d61ec26192a2735936b567515c 100644 (file)
--- a/src/client/sky.cpp
+++ b/src/client/sky.cpp
@@ -35,7 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "config.h"
 using namespace irr::core;
 
-static video::SMaterial baseMaterial() {
+static video::SMaterial baseMaterial()
+{
        video::SMaterial mat;
        mat.Lighting = false;
 #if ENABLE_GLES
@@ -64,7 +65,7 @@ Sky::Sky(s32 id, ITextureSource *tsrc, IShaderSource *ssrc) :
        // Create materials
 
        m_materials[0] = baseMaterial();
-       m_materials[0].MaterialType = ssrc->getShaderInfo(ssrc->getShader("stars_shader", TILE_MATERIAL_ALPHA, 0)).material;
+       m_materials[0].MaterialType = ssrc->getShaderInfo(ssrc->getShader("stars_shader", TILE_MATERIAL_ALPHA)).material;
        m_materials[0].Lighting = true;
        m_materials[0].ColorMaterial = video::ECM_NONE;
 
@@ -697,7 +698,7 @@ void Sky::draw_stars(video::IVideoDriver * driver, float wicked_time_of_day)
        float tod = wicked_time_of_day < 0.5f ? wicked_time_of_day : (1.0f - wicked_time_of_day);
        float starbrightness = (0.25f - fabsf(tod)) * 20.0f;
        m_star_color = m_star_params.starcolor;
-       m_star_color.a = clamp(starbrightness * m_star_color.a, 0.0f, 1.0f);
+       m_star_color.a *= clamp(starbrightness, 0.0f, 1.0f);
        if (m_star_color.a <= 0.0f) // Stars are only drawn when not fully transparent
                return;
        m_materials[0].DiffuseColor = m_materials[0].EmissiveColor = m_star_color.toSColor();
@@ -836,7 +837,8 @@ void Sky::setStarCount(u16 star_count, bool force_update)
        }
 }
 
-void Sky::updateStars() {
+void Sky::updateStars()
+{
        m_stars.reset(new scene::SMeshBuffer());
        // Stupid IrrLicht doesn’t allow non-indexed rendering, and indexed quad
        // rendering is slow due to lack of hardware support. So as indices are