From c5f3d3269bf97eab8b79a57388a17e8b81ce724d Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 4 Dec 2022 13:57:29 +0000 Subject: Don't actually need to define an empty fragment shader --- gfx/gl/shaders/shadowCast.fs | 6 ------ gfx/gl/shadowMapper.cpp | 9 ++------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 gfx/gl/shaders/shadowCast.fs diff --git a/gfx/gl/shaders/shadowCast.fs b/gfx/gl/shaders/shadowCast.fs deleted file mode 100644 index d427da2..0000000 --- a/gfx/gl/shaders/shadowCast.fs +++ /dev/null @@ -1,6 +0,0 @@ -#version 330 core - -void -main() -{ -} diff --git a/gfx/gl/shadowMapper.cpp b/gfx/gl/shadowMapper.cpp index 4cc2e24..a74f3dd 100644 --- a/gfx/gl/shadowMapper.cpp +++ b/gfx/gl/shadowMapper.cpp @@ -1,5 +1,4 @@ #include "shadowMapper.h" -#include "gfx/gl/shaders/fs-shadowCast.h" #include "gfx/gl/shaders/vs-shadowDynamicPoint.h" #include "gfx/gl/shaders/vs-shadowFixedPoint.h" #include "gfx/models/texture.h" @@ -56,10 +55,7 @@ ShadowMapper::update(const SceneProvider & scene, const glm::vec3 & dir) const return lightViewProjection; } -ShadowMapper::FixedPoint::FixedPoint() : - Program {shadowFixedPoint_vs, shadowCast_fs}, viewProjectionLoc {*this, "viewProjection"} -{ -} +ShadowMapper::FixedPoint::FixedPoint() : Program {shadowFixedPoint_vs}, viewProjectionLoc {*this, "viewProjection"} { } void ShadowMapper::FixedPoint::setViewProjection(const glm::mat4 & viewProjection) const { @@ -73,8 +69,7 @@ ShadowMapper::FixedPoint::use() const } ShadowMapper::DynamicPoint::DynamicPoint() : - Program {shadowDynamicPoint_vs, shadowCast_fs}, viewProjectionLoc {*this, "viewProjection"}, modelLoc { - *this, "model"} + Program {shadowDynamicPoint_vs}, viewProjectionLoc {*this, "viewProjection"}, modelLoc {*this, "model"} { } void -- cgit v1.2.3