Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
VTK
VTK
Commits
85240e2f
Commit
85240e2f
authored
Nov 14, 2014
by
Aashish Chaudhary
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed variable not found
Change-Id: I8657d2e2e1ec581a692c456ae214e7ec573e213b
parent
7a40c5e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
+4
-6
Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
+2
-1
No files found.
Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx
View file @
85240e2f
...
...
@@ -1995,8 +1995,8 @@ void vtkOpenGLGPUVolumeRayCastMapper::GPURender(vtkRenderer* ren,
std
::
cerr
<<
"Data changed "
<<
input
->
GetMTime
()
<<
std
::
endl
;
// Update the volume if needed
//
if (input != this->Impl->PrevInput)
//
{
if
(
input
!=
this
->
Impl
->
PrevInput
)
{
input
->
GetDimensions
(
this
->
Impl
->
Dimensions
);
// Update bounds, data, and geometry
...
...
@@ -2004,7 +2004,7 @@ void vtkOpenGLGPUVolumeRayCastMapper::GPURender(vtkRenderer* ren,
this
->
Impl
->
LoadVolume
(
input
,
scalars
);
this
->
Impl
->
LoadMask
(
input
,
this
->
MaskInput
,
this
->
Impl
->
Extents
,
vol
);
//
}
}
// Mask
vtkVolumeMask
*
mask
=
0
;
...
...
@@ -2042,9 +2042,7 @@ void vtkOpenGLGPUVolumeRayCastMapper::GPURender(vtkRenderer* ren,
this
->
Impl
->
ShaderBuildTime
.
GetMTime
()
||
this
->
GetMTime
()
>
this
->
Impl
->
ShaderBuildTime
.
GetMTime
()
||
ren
->
GetActiveCamera
()
->
GetParallelProjection
()
!=
this
->
Impl
->
LastProjectionParallel
||
ren
->
GetMTime
()
>
this
->
Impl
->
ShaderBuildTime
.
GetMTime
()
)
this
->
Impl
->
LastProjectionParallel
)
{
this
->
Impl
->
LastProjectionParallel
=
ren
->
GetActiveCamera
()
->
GetParallelProjection
();
...
...
Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h
View file @
85240e2f
...
...
@@ -122,6 +122,7 @@ namespace vtkvolume
uniform mat4 m_inverse_modelview_matrix;
\n
\
uniform mat4 m_texture_dataset_matrix;
\n
\
uniform mat4 m_inverse_texture_dataset_matrix;
\n
\
uniform mat4 m_texture_to_eye_it;
\n
\
\n
\
// Ray step size
\n
\
uniform vec3 m_cell_step;
\n
\
...
...
@@ -408,7 +409,7 @@ namespace vtkvolume
{
\n
\
final_color += m_specular * pow(n_dot_h, m_shininess);
\n
\
}
\n
\
final_color = clamp(final_col
vtkOpenGLGPUVolumeRayCastMapper
or, vec3(0.0), vec3(1.0));
\n
\
final_color = clamp(final_color, vec3(0.0), vec3(1.0));
\n
\
if (grad.w >= 0.0)
\n
\
{
\n
\
color.a = color.a * computeGradientOpacity(grad);
\n
\
...
...
Write
Preview
Markdown
is supported
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