diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-15 00:21:32 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-15 00:21:32 +0100 |
| commit | a07d2024178106df99b82fe21a34402c5200e8f6 (patch) | |
| tree | 78ec748448b2a1f16823358fd750c407f9a54cc5 /gfx/gl/sceneShader.cpp | |
| parent | Rename lots of shader files (diff) | |
| download | ilt-a07d2024178106df99b82fe21a34402c5200e8f6.tar.bz2 ilt-a07d2024178106df99b82fe21a34402c5200e8f6.tar.xz ilt-a07d2024178106df99b82fe21a34402c5200e8f6.zip | |
Add the dynamicPoint shader for instancing
Same as dynamicPoint, but the model matrix is a vertex input
Diffstat (limited to 'gfx/gl/sceneShader.cpp')
| -rw-r--r-- | gfx/gl/sceneShader.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp index bcd0590..54f5737 100644 --- a/gfx/gl/sceneShader.cpp +++ b/gfx/gl/sceneShader.cpp @@ -8,6 +8,7 @@ #include <gfx/gl/shaders/gs-pointLight.h> #include <gfx/gl/shaders/gs-spotLight.h> #include <gfx/gl/shaders/vs-dynamicPoint.h> +#include <gfx/gl/shaders/vs-dynamicPointInst.h> #include <gfx/gl/shaders/vs-fixedPoint.h> #include <gfx/gl/shaders/vs-pointLight.h> #include <gfx/gl/shaders/vs-spotLight.h> @@ -18,7 +19,11 @@ #include <location.hpp> #include <maths.h> -SceneShader::SceneShader() : landmass {fixedPoint_vs, landmass_fs}, absolute {fixedPoint_vs, material_fs} { } +SceneShader::SceneShader() : + basicInst {dynamicPointInst_vs, material_fs}, landmass {fixedPoint_vs, landmass_fs}, absolute {fixedPoint_vs, + material_fs} +{ +} void SceneShader::setViewProjection(const glm::mat4 & viewProjection) const |