BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix lighting of the wield mesh (#12341)

Browse Source 
* Assign node light to player before final color blend.
  Fixes day/night lightbank ratio for wield meshes
* Update wield mesh light when changing mesh
This commit is contained in:
x2048 2022-05-20 22:33:52 +02:00 committed by GitHub
parent 273bfee9a1
commit 604fb2b738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/camera.cpp
View File

@ -47,7 +47,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
Camera::Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine): Camera::Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine):
m_draw_control(draw_control), m_draw_control(draw_control),
m_client(client) m_client(client),
m_player_light_color(0xFFFFFFFF)
{ {
auto smgr = rendering_engine->get_scene_manager(); auto smgr = rendering_engine->get_scene_manager();
// note: making the camera node a child of the player node // note: making the camera node a child of the player node
@ -153,8 +154,10 @@ void Camera::step(f32 dtime)
bool was_under_zero = m_wield_change_timer < 0; bool was_under_zero = m_wield_change_timer < 0;
m_wield_change_timer = MYMIN(m_wield_change_timer + dtime, 0.125); m_wield_change_timer = MYMIN(m_wield_change_timer + dtime, 0.125);
if (m_wield_change_timer >= 0 && was_under_zero) if (m_wield_change_timer >= 0 && was_under_zero) {
m_wieldnode->setItem(m_wield_item_next, m_client); m_wieldnode->setItem(m_wield_item_next, m_client);
m_wieldnode->setNodeLightColor(m_player_light_color);
}
if (m_view_bobbing_state != 0) if (m_view_bobbing_state != 0)
{ {
@ -555,7 +558,8 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
m_wieldnode->setPosition(wield_position); m_wieldnode->setPosition(wield_position);
m_wieldnode->setRotation(wield_rotation); m_wieldnode->setRotation(wield_rotation);
m_wieldnode->setNodeLightColor(player->light_color); m_player_light_color = player->light_color;
m_wieldnode->setNodeLightColor(m_player_light_color);
// Set render distance // Set render distance
updateViewingRange(); updateViewingRange();

3
src/client/camera.h
View File

@ -264,4 +264,7 @@ private:
std::list<Nametag *> m_nametags; std::list<Nametag *> m_nametags;
bool m_show_nametag_backgrounds; bool m_show_nametag_backgrounds;
// Last known light color of the player
video::SColor m_player_light_color;
}; };

1
src/client/clientenvironment.cpp
View File

@ -305,6 +305,7 @@ void ClientEnvironment::step(float dtime)
node_at_lplayer = m_map->getNode(p); node_at_lplayer = m_map->getNode(p);
u16 light = getInteriorLight(node_at_lplayer, 0, m_client->ndef()); u16 light = getInteriorLight(node_at_lplayer, 0, m_client->ndef());
lplayer->light_color = encode_light(light, 0); // this transfers light.alpha
final_color_blend(&lplayer->light_color, light, day_night_ratio); final_color_blend(&lplayer->light_color, light, day_night_ratio);
} }