From 790a4839c58d8b1ad4a6d3584f25e3678a6ab76f Mon Sep 17 00:00:00 2001 From: Martin Falk Date: Fri, 15 Nov 2024 11:26:39 +0100 Subject: [PATCH] MolVisGL,TensorVisBase: GLSL color conversions core changes --- molvis/molvisgl/glsl/licorice.vert | 2 +- tensorvis/tensorvisbase/glsl/tensorglyphpicking.frag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/molvis/molvisgl/glsl/licorice.vert b/molvis/molvisgl/glsl/licorice.vert index 341c483a..f957d34a 100644 --- a/molvis/molvisgl/glsl/licorice.vert +++ b/molvis/molvisgl/glsl/licorice.vert @@ -34,7 +34,7 @@ */ #include "utils/structs.glsl" -#include "colortools.glsl" +#include "utils/colorconversion.glsl" #include "utils/selectioncolor.glsl" #include "utils/vertexflags.glsl" diff --git a/tensorvis/tensorvisbase/glsl/tensorglyphpicking.frag b/tensorvis/tensorvisbase/glsl/tensorglyphpicking.frag index d017e7f1..c3c82169 100644 --- a/tensorvis/tensorvisbase/glsl/tensorglyphpicking.frag +++ b/tensorvis/tensorvisbase/glsl/tensorglyphpicking.frag @@ -28,7 +28,7 @@ *********************************************************************************/ #include "utils/shading.glsl" -#include "colortools.glsl" +#include "utils/colorconversion.glsl" // Same as geometryrendering.frag with the exception of picking uniform vec3 pickingColor;