diff --git a/TSE-RTS/Resources/DCMVizPresets/Preset1.json b/TSE-RTS/Resources/DCMVizPresets/Preset1.json index 19b0213..3c5adc8 100644 --- a/TSE-RTS/Resources/DCMVizPresets/Preset1.json +++ b/TSE-RTS/Resources/DCMVizPresets/Preset1.json @@ -1,49 +1,132 @@ { - "transparencyCount": 4, + "transparencyCount": 9, "transparency": [ { - "index": 0.3114, - "transpValue": 0.0 + "index": 0, + "transpValue": 0 }, { - "index": 0.3233, - "transpValue": 1.0 + "index": 0.485526, + "transpValue": 0 }, { - "index": 0.5431, - "transpValue": 1.0 + "index": 0.497948, + "transpValue": 0 }, { - "index": 0.5675, - "transpValue": 0.0 + "index": 0.499458, + "transpValue": 0 + }, + { + "index": 0.500618, + "transpValue": 0.0035 + }, + { + "index": 0.505180, + "transpValue": 0.459089 + }, + { + "index": 0.509820, + "transpValue": 0.970381 + }, + { + "index": 0.519570, + "transpValue": 0.966309 + }, + { + "index": 0.531805, + "transpValue": 0.833358 + }, + { + "index": 0.544899, + "transpValue": 0.821918 + }, + { + "index": 1.0, + "transpValue": 0.821918 } ], - - "colorCount": 6, + "colorCount": 20, "colors": [ { - "index": 0.0000, - "color": { "x": 0.00, "y": 0.00, "z": 0.00 } + "index": 0.000000, + "color": { "x": 1.000000, "y": 1.000000, "z": 1.000000 } }, { - "index": 0.2256, - "color": { "x": 0.10, "y": 0.08, "z": 0.08 } + "index": 0.454520, + "color": { "x": 1.000000, "y": 1.000000, "z": 1.000000 } }, { - "index": 0.2598, - "color": { "x": 0.30, "y": 0.22, "z": 0.20 } + "index": 0.466438, + "color": { "x": 0.000000, "y": 0.000000, "z": 0.000000 } }, { - "index": 0.3233, - "color": { "x": 0.92, "y": 0.88, "z": 0.78 } + "index": 0.486854, + "color": { "x": 0.407843, "y": 0.388235, "z": 0.968627 } }, { - "index": 0.4454, - "color": { "x": 0.96, "y": 0.92, "z": 0.84 } + "index": 0.487724, + "color": { "x": 0.980392, "y": 0.976471, "z": 0.980392 } }, { - "index": 0.5431, - "color": { "x": 1.00, "y": 0.98, "z": 0.92 } + "index": 0.488182, + "color": { "x": 0.796078, "y": 0.682353, "z": 0.611765 } + }, + { + "index": 0.495598, + "color": { "x": 0.980392, "y": 0.976471, "z": 0.980392 } + }, + { + "index": 0.497215, + "color": { "x": 0.709804, "y": 0.505882, "z": 0.380392 } + }, + { + "index": 0.498283, + "color": { "x": 0.874510, "y": 0.254902, "z": 0.000000 } + }, + { + "index": 0.498833, + "color": { "x": 1.000000, "y": 0.800000, "z": 0.164706 } + }, + { + "index": 0.500633, + "color": { "x": 0.835294, "y": 0.117647, "z": 0.000000 } + }, + { + "index": 0.500755, + "color": { "x": 1.000000, "y": 0.478431, "z": 0.313725 } + }, + { + "index": 0.502113, + "color": { "x": 1.000000, "y": 1.000000, "z": 1.000000 } + }, + { + "index": 0.502846, + "color": { "x": 0.874510, "y": 0.254902, "z": 0.000000 } + }, + { + "index": 0.503441, + "color": { "x": 1.000000, "y": 0.866667, "z": 0.400000 } + }, + { + "index": 0.503670, + "color": { "x": 0.988235, "y": 0.988235, "z": 0.988235 } + }, + { + "index": 0.527932, + "color": { "x": 0.972549, "y": 0.972549, "z": 0.976471 } + }, + { + "index": 0.544366, + "color": { "x": 1.000000, "y": 0.819608, "z": 0.188235 } + }, + { + "index": 0.549660, + "color": { "x": 1.000000, "y": 1.000000, "z": 1.000000 } + }, + { + "index": 1.000000, + "color": { "x": 1.000000, "y": 1.000000, "z": 1.000000 } } ] } \ No newline at end of file diff --git a/TSE-RTS/src/shaders/DICOMShaderGLSL.hpp b/TSE-RTS/src/shaders/DICOMShaderGLSL.hpp index 3c4547a..7ac7ab5 100644 --- a/TSE-RTS/src/shaders/DICOMShaderGLSL.hpp +++ b/TSE-RTS/src/shaders/DICOMShaderGLSL.hpp @@ -266,6 +266,7 @@ inline const char* fragDICOM = R"( } } + //return vec4(colorAcum.w, colorAcum.w, colorAcum.w, 1.0); return vec4(colorAcum.x, colorAcum.y, colorAcum.z, 1.0); }