From 2827758fae9e54301d6edc36780ce43362d53bba Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Wed, 4 May 2022 20:04:43 +0100 Subject: [PATCH] Cleanup --- app/node/keying/chromakey/chromakey.cpp | 8 ++++++-- app/shaders/chromakey.frag | 2 +- app/shaders/stub.frag | 13 ------------- 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 app/shaders/stub.frag diff --git a/app/node/keying/chromakey/chromakey.cpp b/app/node/keying/chromakey/chromakey.cpp index c05c2cb8d..5660c42a0 100644 --- a/app/node/keying/chromakey/chromakey.cpp +++ b/app/node/keying/chromakey/chromakey.cpp @@ -104,8 +104,12 @@ ShaderCode ChromaKeyNode::GetShaderCode(const QString &) const void ChromaKeyNode::GenerateProcessor() { if (manager()){ - ColorTransform transform("cie_xyz_d65_interchange"); - set_processor(ColorProcessor::Create(manager(), manager()->GetReferenceColorSpace(), transform)); + try { + ColorTransform transform("cie_xyz_d65_interchange"); + set_processor(ColorProcessor::Create(manager(), manager()->GetReferenceColorSpace(), transform)); + } catch (const OCIO::Exception &e) { + std::cerr << std::endl << e.what() << std::endl; + } } } diff --git a/app/shaders/chromakey.frag b/app/shaders/chromakey.frag index 0b3fb132f..8c707e644 100644 --- a/app/shaders/chromakey.frag +++ b/app/shaders/chromakey.frag @@ -46,7 +46,7 @@ vec4 CIExyz_to_Lab(vec4 CIE) { } float colorclose(vec4 col, vec4 key, float tola,float tolb) { - /*decides if a color is close to the specified hue*/ + // Decides if a color is close to the specified hue float temp = sqrt(((key.g-col.g)*(key.g-col.g))+((key.b-col.b)*(key.b-col.b))); if (temp < tola) {return (0.0);} if (temp < tolb) {return ((temp-tola)/(tolb-tola));} diff --git a/app/shaders/stub.frag b/app/shaders/stub.frag deleted file mode 100644 index ccc1b86dd..000000000 --- a/app/shaders/stub.frag +++ /dev/null @@ -1,13 +0,0 @@ -uniform sampler2D tex_in; -in vec2 ove_texcoord; -out vec4 frag_color; - -%1 - -void main() { - vec4 col = texture2D(tex_in, ove_texcoord); - - col = %2(col); - - frag_color = col; -}