Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
fb61a770
Commit
fb61a770
authored
Feb 13, 2015
by
Hossain Mahmud
Browse files
copy the properties from raycastingprocessor
parent
4d134fe3
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/devil/devil.cmake
View file @
fb61a770
...
...
@@ -9,8 +9,8 @@ IF(${ModuleEnabled})
FIND_PACKAGE
(
DevIL REQUIRED
)
LIST
(
APPEND CampvisGlobalIncludeDirs
${
IL_INCLUDE_DIR
}
)
LIST
(
APPEND CampvisGlobalExternalLibs
${
IL_LIBRARIES
}
${
ILU_LIBRARIES
}
)
IF
(
IL_
FOUND
)
MESSAGE
(
STATUS
"** Found DevIL library"
)
IF
(
IL_
LIBRARIES AND ILU_LIBRARIES
)
MESSAGE
(
STATUS
"** Found DevIL
(IL and ILU)
library"
)
ELSE
()
MESSAGE
(
WARNING
"Could not find DevIL library. Check your package manager to make sure DevIL is installed on your system."
)
ENDIF
()
...
...
modules/vis/processors/volumerenderer.cpp
View file @
fb61a770
...
...
@@ -222,8 +222,6 @@ namespace campvis {
p_camera
.
removeSharedProperty
(
&
currentRaycaster
->
p_camera
);
p_outputImage
.
removeSharedProperty
(
&
currentRaycaster
->
p_targetImageID
);
p_raycasterProps
.
clearProperties
();
//p_raycasterProps.deinitAllProperties();
//removeProperty(p_raycasterProps);
currentRaycaster
->
s_invalidated
.
disconnect
(
this
);
_raycaster
=
RaycasterFactory
::
getRef
().
createRaycaster
(
p_raycastingProcSelector
.
getOptionId
(),
_viewportSizeProperty
);
...
...
@@ -234,7 +232,6 @@ namespace campvis {
//_raycaster->p_entryImageID.setVisible(false);
//_raycaster->p_exitImageID.setVisible(false);
//_raycaster->p_targetImageID.setVisible(false);
//addProperty(p_raycasterProps, AbstractProcessor::VALID);
p_lqMode
.
addSharedProperty
(
&
_raycaster
->
p_lqMode
);
p_inputVolume
.
addSharedProperty
(
&
_raycaster
->
p_sourceImageID
);
...
...
@@ -243,8 +240,17 @@ namespace campvis {
_raycaster
->
s_invalidated
.
connect
(
this
,
&
VolumeRenderer
::
onProcessorInvalidated
);
cgt
::
OpenGLJobProcessor
::
ScopedSynchronousGlJobExecution
jobGuard
;
currentRaycaster
->
deinit
();
_raycaster
->
init
();
_raycaster
->
p_sourceImageID
.
setValue
(
currentRaycaster
->
p_sourceImageID
.
getValue
());
_raycaster
->
p_entryImageID
.
setValue
(
currentRaycaster
->
p_entryImageID
.
getValue
());
_raycaster
->
p_exitImageID
.
setValue
(
currentRaycaster
->
p_exitImageID
.
getValue
());
_raycaster
->
p_targetImageID
.
setValue
(
currentRaycaster
->
p_targetImageID
.
getValue
());
_raycaster
->
p_camera
.
setValue
(
currentRaycaster
->
p_camera
.
getValue
());
//_raycaster->p_transferFunction.replaceTF(currentRaycaster->p_transferFunction.getTF());
_raycaster
->
p_jitterStepSizeMultiplier
.
setValue
(
currentRaycaster
->
p_jitterStepSizeMultiplier
.
getValue
());
_raycaster
->
p_samplingRate
.
setValue
(
currentRaycaster
->
p_samplingRate
.
getValue
());
currentRaycaster
->
deinit
();
invalidate
(
RAYCASTER_INVALID
);
// queue the deletion of currentRaycaster as signal, to ensure that the deletion does
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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