Merge pull request #242 from inviwo/feature/coregl-changes

MolVisGL,TensorVisBase: GLSL color conversions core changes
inviwo · Nov 29, 2024 · bf7f066 · bf7f066
2 parents b472e16 + b9a5575
commit bf7f066
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml
@@ -429,10 +429,11 @@ jobs:
       shell: pwsh
       run: |
         $ver = (Get-ChildItem -Name C:/"Program Files"/Inviwo/*)
-        Invoke-expression "C:/'Program Files'/Inviwo/$ver/bin/inviwo-cli.exe --logconsole --quit"
-        if($LASTEXITCODE -ne 0) {
-          Invoke-expression "C:\'Program Files (x86)'\'Windows Kits'\10\Debuggers\x64\gflags.exe /i C:/'Program Files'/Inviwo/$ver/bin/inviwo-cli.exe +sls"
-          Invoke-Expression "C:\'Program Files (x86)'\'Windows Kits'\10\Debuggers\x64\cdb.exe -g -c q C:/'Program Files'/Inviwo/$ver/bin/inviwo-cli.exe"
+        cd C:/'Program Files'/Inviwo/$ver/bin/
+        ./inviwo-cli.exe --logconsole --quit
+        if ($LASTEXITCODE -ne 0) {
+          C:\'Program Files (x86)'\'Windows Kits'\10\Debuggers\x64\gflags.exe /i inviwo-cli.exe +sls
+          C:\'Program Files (x86)'\'Windows Kits'\10\Debuggers\x64\cdb.exe -g -c q inviwo-cli.exe
         }
     
     # Macos

diff --git 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
@@ -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;