]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Restore minimal normal texture support (for minimap shading)
authorVitaliy <numzer0@yandex.ru>
Sun, 21 Mar 2021 22:22:22 +0000 (01:22 +0300)
committerGitHub <noreply@github.com>
Sun, 21 Mar 2021 22:22:22 +0000 (23:22 +0100)
src/client/game.cpp

index 9cc35984334dd8c3611447cc46dcd58f1f61524f..31c782c51cc14702c6d0ea9987f0029fe14b78ce 100644 (file)
@@ -426,6 +426,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
        CachedPixelShaderSetting<float, 3> m_camera_offset_pixel;
        CachedPixelShaderSetting<float, 3> m_camera_offset_vertex;
        CachedPixelShaderSetting<SamplerLayer_t> m_base_texture;
+       CachedPixelShaderSetting<SamplerLayer_t> m_normal_texture;
        Client *m_client;
 
 public:
@@ -459,6 +460,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
                m_camera_offset_pixel("cameraOffset"),
                m_camera_offset_vertex("cameraOffset"),
                m_base_texture("baseTexture"),
+               m_normal_texture("normalTexture"),
                m_client(client)
        {
                g_settings->registerChangedCallback("enable_fog", settingsCallback, this);
@@ -546,8 +548,9 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
                m_camera_offset_pixel.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_normal_texture.set(&normal_tex, services);
        }
 };