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

Return shadow_sky_body_orbit_tilt setting

Browse Source 
Used as a default value when the game does not change the value via API (e.g. legacy server)
This commit is contained in:
x2048 2023-03-24 12:34:21 +01:00 committed by GitHub
parent 9af587c54e
commit f3b198e490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/settingtypes.txt
View File

@ -443,6 +443,12 @@ shadow_update_frames (Map shadows update frames) int 8 1 16
# Minimum value: 1.0; maximum value: 15.0
shadow_soft_radius (Soft shadow radius) float 5.0 1.0 15.0
# Set the default tilt of Sun/Moon orbit in degrees.
# Games may change orbit tilt via API.
# Value of 0 means no tilt / vertical orbit.
# type: float min: -60 max: 60
shadow_sky_body_orbit_tilt (Sky Body Orbit Tilt) float 0.0 -60.0 60.0
[**Post processing]
# Set the exposure compensation in EV units.

6
doc/lua_api.txt
View File

@ -7416,8 +7416,10 @@ child will follow movement and rotation of that bone.
* `sky_parameters` is a table with the following optional fields:
* `base_color`: ColorSpec, changes fog in "skybox" and "plain".
(default: `#ffffff`)
* `body_orbit_tilt`: Float, angle of sun/moon orbit in degrees, relative to Y axis.
Valid range [-60.0,60.0] (default: 0.0)
* `body_orbit_tilt`: Float, rotation angle of sun/moon orbit in degrees.
By default, orbit is controlled by a client-side setting, and this field is not set.
After a value is assigned, it can only be changed to another float value.
Valid range [-60.0,60.0] (default: not set)
* `type`: Available types:
* `"regular"`: Uses 0 textures, `base_color` ignored
* `"skybox"`: Uses 6 textures, `base_color` used as fog.

6
minetest.conf.example
View File

@ -473,6 +473,12 @@
# type: float min: 1 max: 15
# shadow_soft_radius = 5.0
# Set the default tilt of Sun/Moon orbit in degrees.
# Games may change orbit tilt via API.
# Value of 0 means no tilt / vertical orbit.
# type: float min: -60 max: 60
# shadow_sky_body_orbit_tilt = 0.0
### Post processing
# Set the exposure compensation in EV units.

1
src/client/sky.cpp
View File

@ -97,6 +97,7 @@ Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShade
}
m_directional_colored_fog = g_settings->getBool("directional_colored_fog");
m_sky_params.body_orbit_tilt = g_settings->getFloat("shadow_sky_body_orbit_tilt", -60., 60.);
setStarCount(1000);
}

3
src/client/sky.h
View File

@ -98,7 +98,8 @@ public:
}
void setBodyOrbitTilt(float body_orbit_tilt)
{
m_sky_params.body_orbit_tilt = body_orbit_tilt;
if (body_orbit_tilt != SkyboxParams::INVALID_SKYBOX_TILT)
m_sky_params.body_orbit_tilt = rangelim(body_orbit_tilt, -90.f, 90.f);
}
void overrideColors(video::SColor bgcolor, video::SColor skycolor)
{

1
src/defaultsettings.cpp
View File

@ -288,6 +288,7 @@ void set_default_settings()
settings->setDefault("shadow_poisson_filter", "true");
settings->setDefault("shadow_update_frames", "8");
settings->setDefault("shadow_soft_radius", "5.0");
settings->setDefault("shadow_sky_body_orbit_tilt", "0.0");
// Input
settings->setDefault("invert_mouse", "false");

6
src/script/lua_api/l_object.cpp
View File

@ -1919,8 +1919,10 @@ int ObjectRef::l_get_sky(lua_State *L)
lua_pushlstring(L, skybox_params.type.c_str(), skybox_params.type.size());
lua_setfield(L, -2, "type");
lua_pushnumber(L, skybox_params.body_orbit_tilt);
lua_setfield(L, -2, "body_orbit_tilt");
if (skybox_params.body_orbit_tilt != SkyboxParams::INVALID_SKYBOX_TILT) {
lua_pushnumber(L, skybox_params.body_orbit_tilt);
lua_setfield(L, -2, "body_orbit_tilt");
}
lua_newtable(L);
s16 i = 1;

6
src/skyparams.h
View File

@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
struct SkyColor
{
video::SColor day_sky;
@ -32,6 +33,8 @@ struct SkyColor
struct SkyboxParams
{
static constexpr float INVALID_SKYBOX_TILT = -1024.f;
video::SColor bgcolor;
std::string type;
std::vector<std::string> textures;
@ -40,7 +43,7 @@ struct SkyboxParams
video::SColor fog_sun_tint;
video::SColor fog_moon_tint;
std::string fog_tint_type;
float body_orbit_tilt;
float body_orbit_tilt { INVALID_SKYBOX_TILT };
};
struct SunParams
@ -96,7 +99,6 @@ public:
sky.fog_sun_tint = video::SColor(255, 244, 125, 29);
sky.fog_moon_tint = video::SColorf(0.5, 0.6, 0.8, 1).toSColor();
sky.fog_tint_type = "default";
sky.body_orbit_tilt = 0.0f;
return sky;
}