forked from Mirrorlandia_minetest/minetest
Restore minimal normal texture support (for minimap shading)
This commit is contained in:
parent
531e7ef8eb
commit
44ed05ddf0
@ -426,6 +426,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
|
|||||||
CachedPixelShaderSetting<float, 3> m_camera_offset_pixel;
|
CachedPixelShaderSetting<float, 3> m_camera_offset_pixel;
|
||||||
CachedPixelShaderSetting<float, 3> m_camera_offset_vertex;
|
CachedPixelShaderSetting<float, 3> m_camera_offset_vertex;
|
||||||
CachedPixelShaderSetting<SamplerLayer_t> m_base_texture;
|
CachedPixelShaderSetting<SamplerLayer_t> m_base_texture;
|
||||||
|
CachedPixelShaderSetting<SamplerLayer_t> m_normal_texture;
|
||||||
Client *m_client;
|
Client *m_client;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@ -459,6 +460,7 @@ public:
|
|||||||
m_camera_offset_pixel("cameraOffset"),
|
m_camera_offset_pixel("cameraOffset"),
|
||||||
m_camera_offset_vertex("cameraOffset"),
|
m_camera_offset_vertex("cameraOffset"),
|
||||||
m_base_texture("baseTexture"),
|
m_base_texture("baseTexture"),
|
||||||
|
m_normal_texture("normalTexture"),
|
||||||
m_client(client)
|
m_client(client)
|
||||||
{
|
{
|
||||||
g_settings->registerChangedCallback("enable_fog", settingsCallback, this);
|
g_settings->registerChangedCallback("enable_fog", settingsCallback, this);
|
||||||
@ -546,8 +548,9 @@ public:
|
|||||||
m_camera_offset_pixel.set(camera_offset_array, services);
|
m_camera_offset_pixel.set(camera_offset_array, services);
|
||||||
m_camera_offset_vertex.set(camera_offset_array, services);
|
m_camera_offset_vertex.set(camera_offset_array, services);
|
||||||
|
|
||||||
SamplerLayer_t base_tex = 0;
|
SamplerLayer_t base_tex = 0, normal_tex = 1;
|
||||||
m_base_texture.set(&base_tex, services);
|
m_base_texture.set(&base_tex, services);
|
||||||
|
m_normal_texture.set(&normal_tex, services);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user