Commit a1a66467 authored by Jakob Weiss's avatar Jakob Weiss

Bugfix: EEP Generator now handles arbitrary volume transformations correctly,...

Bugfix: EEP Generator now handles arbitrary volume transformations correctly, but might have broken the mirroring feature

# Conflicts:
#	modules/vis/processors/volumeexplorer.cpp
parent 3048e738
...@@ -158,7 +158,7 @@ namespace campvis { ...@@ -158,7 +158,7 @@ namespace campvis {
FramebufferActivationGuard fag(this); FramebufferActivationGuard fag(this);
decorateRenderProlog(data, _shader); decorateRenderProlog(data, _shader);
glEnable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
// create entry points texture // create entry points texture
...@@ -169,7 +169,7 @@ namespace campvis { ...@@ -169,7 +169,7 @@ namespace campvis {
glDepthFunc(GL_LESS); glDepthFunc(GL_LESS);
glClearDepth(1.0f); glClearDepth(1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glCullFace(p_enableMirror.getValue() ? GL_FRONT : GL_BACK); //glCullFace(p_enableMirror.getValue() ? GL_FRONT : GL_BACK);
clipped.render(GL_TRIANGLE_FAN); clipped.render(GL_TRIANGLE_FAN);
RenderData* entrypoints = new RenderData(_fbo); RenderData* entrypoints = new RenderData(_fbo);
...@@ -188,7 +188,7 @@ namespace campvis { ...@@ -188,7 +188,7 @@ namespace campvis {
glDepthFunc(GL_GREATER); glDepthFunc(GL_GREATER);
glClearDepth(0.0f); glClearDepth(0.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glCullFace(p_enableMirror.getValue() ? GL_BACK : GL_FRONT); //glCullFace(p_enableMirror.getValue() ? GL_BACK : GL_FRONT);
clipped.render(GL_TRIANGLE_FAN); clipped.render(GL_TRIANGLE_FAN);
RenderData* exitpoints = new RenderData(_fbo); RenderData* exitpoints = new RenderData(_fbo);
......
...@@ -53,6 +53,7 @@ namespace campvis { ...@@ -53,6 +53,7 @@ namespace campvis {
, p_enableScribbling("EnableScribbling", "Enable Scribbling in Slice Views", false) , p_enableScribbling("EnableScribbling", "Enable Scribbling in Slice Views", false)
, p_seProperties("SliceExtractorProperties", "Slice Extractor Properties") , p_seProperties("SliceExtractorProperties", "Slice Extractor Properties")
, p_vrProperties("VolumeRendererProperties", "Volume Renderer Properties") , p_vrProperties("VolumeRendererProperties", "Volume Renderer Properties")
, p_tcpProperties("CameraProviderProperties", "Camera Properties")
, _shader(nullptr) , _shader(nullptr)
, _quad(nullptr) , _quad(nullptr)
, _tcp(viewportSizeProp) , _tcp(viewportSizeProp)
...@@ -99,6 +100,9 @@ namespace campvis { ...@@ -99,6 +100,9 @@ namespace campvis {
_raycaster.p_outputImage.setVisible(false); _raycaster.p_outputImage.setVisible(false);
addProperty(p_vrProperties, VALID); addProperty(p_vrProperties, VALID);
p_tcpProperties.addPropertyCollection(_tcp);
addProperty(p_tcpProperties);
p_inputVolume.addSharedProperty(&_tcp.p_image); p_inputVolume.addSharedProperty(&_tcp.p_image);
p_inputVolume.addSharedProperty(&_raycaster.p_inputVolume); p_inputVolume.addSharedProperty(&_raycaster.p_inputVolume);
p_inputVolume.addSharedProperty(&_sliceRenderer->p_sourceImageID); p_inputVolume.addSharedProperty(&_sliceRenderer->p_sourceImageID);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment