mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Fix consistency of sky sun/moon texture behaviour
Also cleans up related code somewhat.
This commit is contained in:
sfan5
Hugues Ross
parent
37d80784dd
commit
f8cef52ea0
7 changed files with 79 additions and 139 deletions
|
|
@ -18,21 +18,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include <cmath>
|
||||
#include "sky.h"
|
||||
#include "ITexture.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "ISceneManager.h"
|
||||
#include "ICameraSceneNode.h"
|
||||
#include "S3DVertex.h"
|
||||
#include <ITexture.h>
|
||||
#include <IVideoDriver.h>
|
||||
#include <ISceneManager.h>
|
||||
#include <ICameraSceneNode.h>
|
||||
#include <S3DVertex.h>
|
||||
#include "client/tile.h"
|
||||
#include "noise.h" // easeCurve
|
||||
#include "profiler.h"
|
||||
#include "util/numeric.h"
|
||||
#include <cmath>
|
||||
#include "client/renderingengine.h"
|
||||
#include "settings.h"
|
||||
#include "camera.h" // CameraModes
|
||||
#include "config.h"
|
||||
|
||||
using namespace irr::core;
|
||||
|
||||
static video::SMaterial baseMaterial()
|
||||
|
|
@ -51,7 +51,14 @@ static video::SMaterial baseMaterial()
|
|||
mat.TextureLayer[0].TextureWrapV = video::ETC_CLAMP_TO_EDGE;
|
||||
mat.BackfaceCulling = false;
|
||||
return mat;
|
||||
};
|
||||
}
|
||||
|
||||
static inline void disableTextureFiltering(video::SMaterial &mat)
|
||||
{
|
||||
mat.setFlag(video::E_MATERIAL_FLAG::EMF_BILINEAR_FILTER, false);
|
||||
mat.setFlag(video::E_MATERIAL_FLAG::EMF_TRILINEAR_FILTER, false);
|
||||
mat.setFlag(video::E_MATERIAL_FLAG::EMF_ANISOTROPIC_FILTER, false);
|
||||
}
|
||||
|
||||
Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShaderSource *ssrc) :
|
||||
scene::ISceneNode(rendering_engine->get_scene_manager()->getRootSceneNode(),
|
||||
|
|
@ -65,6 +72,11 @@ Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShade
|
|||
|
||||
m_enable_shaders = g_settings->getBool("enable_shaders");
|
||||
|
||||
m_sky_params = SkyboxDefaults::getSkyDefaults();
|
||||
m_sun_params = SkyboxDefaults::getSunDefaults();
|
||||
m_moon_params = SkyboxDefaults::getMoonDefaults();
|
||||
m_star_params = SkyboxDefaults::getStarDefaults();
|
||||
|
||||
// Create materials
|
||||
|
||||
m_materials[0] = baseMaterial();
|
||||
|
|
@ -73,49 +85,15 @@ Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShade
|
|||
m_materials[0].ColorMaterial = video::ECM_NONE;
|
||||
|
||||
m_materials[1] = baseMaterial();
|
||||
//m_materials[1].MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
|
||||
m_materials[1].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
|
||||
m_materials[2] = baseMaterial();
|
||||
m_materials[2].setTexture(0, tsrc->getTextureForMesh("sunrisebg.png"));
|
||||
m_materials[2].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
//m_materials[2].MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
|
||||
|
||||
// Ensures that sun and moon textures and tonemaps are correct.
|
||||
setSkyDefaults();
|
||||
m_sun_texture = tsrc->isKnownSourceImage(m_sun_params.texture) ?
|
||||
tsrc->getTextureForMesh(m_sun_params.texture) : nullptr;
|
||||
m_moon_texture = tsrc->isKnownSourceImage(m_moon_params.texture) ?
|
||||
tsrc->getTextureForMesh(m_moon_params.texture) : nullptr;
|
||||
m_sun_tonemap = tsrc->isKnownSourceImage(m_sun_params.tonemap) ?
|
||||
tsrc->getTexture(m_sun_params.tonemap) : nullptr;
|
||||
m_moon_tonemap = tsrc->isKnownSourceImage(m_moon_params.tonemap) ?
|
||||
tsrc->getTexture(m_moon_params.tonemap) : nullptr;
|
||||
setSunTexture(m_sun_params.texture, m_sun_params.tonemap, tsrc);
|
||||
|
||||
if (m_sun_texture) {
|
||||
m_materials[3] = baseMaterial();
|
||||
m_materials[3].setTexture(0, m_sun_texture);
|
||||
m_materials[3].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
// Disables texture filtering
|
||||
m_materials[3].setFlag(video::E_MATERIAL_FLAG::EMF_BILINEAR_FILTER, false);
|
||||
m_materials[3].setFlag(video::E_MATERIAL_FLAG::EMF_TRILINEAR_FILTER, false);
|
||||
m_materials[3].setFlag(video::E_MATERIAL_FLAG::EMF_ANISOTROPIC_FILTER, false);
|
||||
// Use tonemaps if available
|
||||
if (m_sun_tonemap)
|
||||
m_materials[3].Lighting = true;
|
||||
}
|
||||
if (m_moon_texture) {
|
||||
m_materials[4] = baseMaterial();
|
||||
m_materials[4].setTexture(0, m_moon_texture);
|
||||
m_materials[4].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
// Disables texture filtering
|
||||
m_materials[4].setFlag(video::E_MATERIAL_FLAG::EMF_BILINEAR_FILTER, false);
|
||||
m_materials[4].setFlag(video::E_MATERIAL_FLAG::EMF_TRILINEAR_FILTER, false);
|
||||
m_materials[4].setFlag(video::E_MATERIAL_FLAG::EMF_ANISOTROPIC_FILTER, false);
|
||||
// Use tonemaps if available
|
||||
if (m_moon_tonemap)
|
||||
m_materials[4].Lighting = true;
|
||||
}
|
||||
setMoonTexture(m_moon_params.texture, m_moon_params.tonemap, tsrc);
|
||||
|
||||
for (int i = 5; i < 11; i++) {
|
||||
m_materials[i] = baseMaterial();
|
||||
|
|
@ -130,7 +108,7 @@ Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShade
|
|||
m_sky_body_orbit_tilt = rangelim(val, 0.0f, 60.0f);
|
||||
}
|
||||
|
||||
setStarCount(1000, true);
|
||||
setStarCount(1000);
|
||||
}
|
||||
|
||||
void Sky::OnRegisterSceneNode()
|
||||
|
|
@ -386,20 +364,6 @@ void Sky::update(float time_of_day, float time_brightness,
|
|||
|
||||
bool is_dawn = (time_brightness >= 0.20 && time_brightness < 0.35);
|
||||
|
||||
/*
|
||||
Development colours
|
||||
|
||||
video::SColorf bgcolor_bright_normal_f(170. / 255, 200. / 255, 230. / 255, 1.0);
|
||||
video::SColorf bgcolor_bright_dawn_f(0.666, 200. / 255 * 0.7, 230. / 255 * 0.5, 1.0);
|
||||
video::SColorf bgcolor_bright_dawn_f(0.666, 0.549, 0.220, 1.0);
|
||||
video::SColorf bgcolor_bright_dawn_f(0.666 * 1.2, 0.549 * 1.0, 0.220 * 1.0, 1.0);
|
||||
video::SColorf bgcolor_bright_dawn_f(0.666 * 1.2, 0.549 * 1.0, 0.220 * 1.2, 1.0);
|
||||
|
||||
video::SColorf cloudcolor_bright_dawn_f(1.0, 0.591, 0.4);
|
||||
video::SColorf cloudcolor_bright_dawn_f(1.0, 0.65, 0.44);
|
||||
video::SColorf cloudcolor_bright_dawn_f(1.0, 0.7, 0.5);
|
||||
*/
|
||||
|
||||
video::SColorf bgcolor_bright_normal_f = m_sky_params.sky_color.day_horizon;
|
||||
video::SColorf bgcolor_bright_indoor_f = m_sky_params.sky_color.indoors;
|
||||
video::SColorf bgcolor_bright_dawn_f = m_sky_params.sky_color.dawn_horizon;
|
||||
|
|
@ -754,33 +718,29 @@ void Sky::setSunTexture(const std::string &sun_texture,
|
|||
// Ignore matching textures (with modifiers) entirely,
|
||||
// but lets at least update the tonemap before hand.
|
||||
m_sun_params.tonemap = sun_tonemap;
|
||||
m_sun_tonemap = tsrc->isKnownSourceImage(m_sun_params.tonemap) ?
|
||||
tsrc->getTexture(m_sun_params.tonemap) : nullptr;
|
||||
m_sun_tonemap = tsrc->isKnownSourceImage(sun_tonemap) ?
|
||||
tsrc->getTexture(sun_tonemap) : nullptr;
|
||||
m_materials[3].Lighting = !!m_sun_tonemap;
|
||||
|
||||
if (m_sun_params.texture == sun_texture)
|
||||
if (m_sun_params.texture == sun_texture && !m_first_update)
|
||||
return;
|
||||
m_sun_params.texture = sun_texture;
|
||||
|
||||
if (sun_texture != "") {
|
||||
// We want to ensure the texture exists first.
|
||||
m_sun_texture = tsrc->getTextureForMesh(m_sun_params.texture);
|
||||
m_sun_texture = nullptr;
|
||||
if (sun_texture == "sun.png") {
|
||||
// Dumb compatibility fix: sun.png transparently falls back to no texture
|
||||
m_sun_texture = tsrc->isKnownSourceImage(sun_texture) ?
|
||||
tsrc->getTexture(sun_texture) : nullptr;
|
||||
} else if (!sun_texture.empty()) {
|
||||
m_sun_texture = tsrc->getTextureForMesh(sun_texture);
|
||||
}
|
||||
|
||||
if (m_sun_texture) {
|
||||
m_materials[3] = baseMaterial();
|
||||
m_materials[3].setTexture(0, m_sun_texture);
|
||||
m_materials[3].MaterialType = video::
|
||||
EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
// Disables texture filtering
|
||||
m_materials[3].setFlag(
|
||||
video::E_MATERIAL_FLAG::EMF_BILINEAR_FILTER, false);
|
||||
m_materials[3].setFlag(
|
||||
video::E_MATERIAL_FLAG::EMF_TRILINEAR_FILTER, false);
|
||||
m_materials[3].setFlag(
|
||||
video::E_MATERIAL_FLAG::EMF_ANISOTROPIC_FILTER, false);
|
||||
}
|
||||
} else {
|
||||
m_sun_texture = nullptr;
|
||||
if (m_sun_texture) {
|
||||
m_materials[3] = baseMaterial();
|
||||
m_materials[3].setTexture(0, m_sun_texture);
|
||||
m_materials[3].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
disableTextureFiltering(m_materials[3]);
|
||||
m_materials[3].Lighting = !!m_sun_tonemap;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -802,40 +762,36 @@ void Sky::setMoonTexture(const std::string &moon_texture,
|
|||
// Ignore matching textures (with modifiers) entirely,
|
||||
// but lets at least update the tonemap before hand.
|
||||
m_moon_params.tonemap = moon_tonemap;
|
||||
m_moon_tonemap = tsrc->isKnownSourceImage(m_moon_params.tonemap) ?
|
||||
tsrc->getTexture(m_moon_params.tonemap) : nullptr;
|
||||
m_moon_tonemap = tsrc->isKnownSourceImage(moon_tonemap) ?
|
||||
tsrc->getTexture(moon_tonemap) : nullptr;
|
||||
m_materials[4].Lighting = !!m_moon_tonemap;
|
||||
|
||||
if (m_moon_params.texture == moon_texture)
|
||||
if (m_moon_params.texture == moon_texture && !m_first_update)
|
||||
return;
|
||||
m_moon_params.texture = moon_texture;
|
||||
|
||||
if (moon_texture != "") {
|
||||
// We want to ensure the texture exists first.
|
||||
m_moon_texture = tsrc->getTextureForMesh(m_moon_params.texture);
|
||||
m_moon_texture = nullptr;
|
||||
if (moon_texture == "moon.png") {
|
||||
// Dumb compatibility fix: moon.png transparently falls back to no texture
|
||||
m_moon_texture = tsrc->isKnownSourceImage(moon_texture) ?
|
||||
tsrc->getTexture(moon_texture) : nullptr;
|
||||
} else if (!moon_texture.empty()) {
|
||||
m_moon_texture = tsrc->getTextureForMesh(moon_texture);
|
||||
}
|
||||
|
||||
if (m_moon_texture) {
|
||||
m_materials[4] = baseMaterial();
|
||||
m_materials[4].setTexture(0, m_moon_texture);
|
||||
m_materials[4].MaterialType = video::
|
||||
EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
// Disables texture filtering
|
||||
m_materials[4].setFlag(
|
||||
video::E_MATERIAL_FLAG::EMF_BILINEAR_FILTER, false);
|
||||
m_materials[4].setFlag(
|
||||
video::E_MATERIAL_FLAG::EMF_TRILINEAR_FILTER, false);
|
||||
m_materials[4].setFlag(
|
||||
video::E_MATERIAL_FLAG::EMF_ANISOTROPIC_FILTER, false);
|
||||
}
|
||||
} else {
|
||||
m_moon_texture = nullptr;
|
||||
if (m_moon_texture) {
|
||||
m_materials[4] = baseMaterial();
|
||||
m_materials[4].setTexture(0, m_moon_texture);
|
||||
m_materials[4].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
|
||||
disableTextureFiltering(m_materials[4]);
|
||||
m_materials[4].Lighting = !!m_moon_tonemap;
|
||||
}
|
||||
}
|
||||
|
||||
void Sky::setStarCount(u16 star_count, bool force_update)
|
||||
void Sky::setStarCount(u16 star_count)
|
||||
{
|
||||
// Allow force updating star count at game init.
|
||||
if (m_star_params.count != star_count || force_update) {
|
||||
if (m_star_params.count != star_count || m_first_update) {
|
||||
m_star_params.count = star_count;
|
||||
updateStars();
|
||||
}
|
||||
|
|
@ -924,16 +880,6 @@ void Sky::addTextureToSkybox(const std::string &texture, int material_id,
|
|||
m_materials[material_id+5].MaterialType = video::EMT_SOLID;
|
||||
}
|
||||
|
||||
// To be called once at game init to setup default values.
|
||||
void Sky::setSkyDefaults()
|
||||
{
|
||||
SkyboxDefaults sky_defaults;
|
||||
m_sky_params.sky_color = sky_defaults.getSkyColorDefaults();
|
||||
m_sun_params = sky_defaults.getSunDefaults();
|
||||
m_moon_params = sky_defaults.getMoonDefaults();
|
||||
m_star_params = sky_defaults.getStarDefaults();
|
||||
}
|
||||
|
||||
float getWickedTimeOfDay(float time_of_day)
|
||||
{
|
||||
float nightlength = 0.415f;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue