Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Kent - Arne Larsen
vr_gmlib
Commits
d260d97d
Commit
d260d97d
authored
Oct 10, 2018
by
Kent - Arne Larsen
Browse files
Added a bool check for initvolumeprog
parent
9c8d6af3
Changes
1
Show whitespace changes
Inline
Side-by-side
modules/opengl/src/gmopenglmanager.cpp
View file @
d260d97d
...
...
@@ -631,6 +631,7 @@ namespace GL {
" uniform bool depth_start;"
" uniform bool black_white;"
" uniform bool is_sliced;"
" uniform bool volume_toggle;"
//" uniform vec3 slice_vec;"
" uniform float sX;"
" uniform float sY;"
...
...
@@ -765,11 +766,14 @@ namespace GL {
" if( dst.a > 1.0 ) break;
\n
"
"
\n
"
"
\n
"
" position += direction * adaptive
\n
;
"
" position += direction * adaptive
;
\n
"
"
\n
"
" }
\n
"
"
\n
"
" out_Color = dst;
\n
;"
"if (volume_toggle) dst = vec4(texture(samplerDataVolume, textureCoord).rgba);"
" //dst = vec4(texture(samplerTransferFunction, textureCoord.x).r, 0, 0, 1);//"
"
\n
"
" out_Color = dst;
\n
"
"
\n
}"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment