Commit 0737f058 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Refactored DataNameProperty: Got rid of issueWrite() and connect(). Automatic...

Refactored DataNameProperty: Got rid of issueWrite() and connect(). Automatic invalidation of connected (shared) DataNameProperties is now delegated to AutoEvaluationPipeline.
ATTENTION: needs TBB 4.2 (not yet in repository, will be changed later)
parent 5c739225
...@@ -107,7 +107,6 @@ namespace campvis { ...@@ -107,7 +107,6 @@ namespace campvis {
LGL_ERROR; LGL_ERROR;
data.addData(p_targetImageId.getValue(), new RenderData(_fbo)); data.addData(p_targetImageId.getValue(), new RenderData(_fbo));
p_targetImageId.issueWrite();
} }
else { else {
LERROR("No suitable input images found."); LERROR("No suitable input images found.");
......
...@@ -48,7 +48,7 @@ namespace campvis { ...@@ -48,7 +48,7 @@ namespace campvis {
, p_clipX("clipX", "X Axis Clip Coordinates", tgt::ivec2(0), tgt::ivec2(0), tgt::ivec2(0)) , p_clipX("clipX", "X Axis Clip Coordinates", tgt::ivec2(0), tgt::ivec2(0), tgt::ivec2(0))
, p_clipY("clipY", "Y Axis Clip Coordinates", tgt::ivec2(0), tgt::ivec2(0), tgt::ivec2(0)) , p_clipY("clipY", "Y Axis Clip Coordinates", tgt::ivec2(0), tgt::ivec2(0), tgt::ivec2(0))
, p_clipZ("clipZ", "Z Axis Clip Coordinates", tgt::ivec2(0), tgt::ivec2(0), tgt::ivec2(0)) , p_clipZ("clipZ", "Z Axis Clip Coordinates", tgt::ivec2(0), tgt::ivec2(0), tgt::ivec2(0))
, _sourceTimestamp(0) , _sourceTimestamp(0)
{ {
addProperty(&p_sourceImageID); addProperty(&p_sourceImageID);
addProperty(&p_geometryID); addProperty(&p_geometryID);
...@@ -87,7 +87,6 @@ namespace campvis { ...@@ -87,7 +87,6 @@ namespace campvis {
MeshGeometry* cube = MeshGeometry::createCube(volumeExtent, tgt::Bounds(texLLF, texURB)).clone(); MeshGeometry* cube = MeshGeometry::createCube(volumeExtent, tgt::Bounds(texLLF, texURB)).clone();
data.addData(p_geometryID.getValue(), cube); data.addData(p_geometryID.getValue(), cube);
p_geometryID.issueWrite();
} }
else { else {
LERROR("Input image must have dimensionality of 3."); LERROR("Input image must have dimensionality of 3.");
......
...@@ -120,7 +120,6 @@ namespace campvis { ...@@ -120,7 +120,6 @@ namespace campvis {
LGL_ERROR; LGL_ERROR;
data.addData(p_outputImage.getValue(), new RenderData(_fbo)); data.addData(p_outputImage.getValue(), new RenderData(_fbo));
p_outputImage.issueWrite();
validate(INVALID_RESULT); validate(INVALID_RESULT);
} }
......
...@@ -113,7 +113,6 @@ namespace campvis { ...@@ -113,7 +113,6 @@ namespace campvis {
LGL_ERROR; LGL_ERROR;
data.addData(p_targetImageId.getValue(), new RenderData(_fbo)); data.addData(p_targetImageId.getValue(), new RenderData(_fbo));
p_targetImageId.issueWrite();
} }
else { else {
LERROR("No suitable input images found."); LERROR("No suitable input images found.");
......
...@@ -76,7 +76,6 @@ namespace campvis { ...@@ -76,7 +76,6 @@ namespace campvis {
LGL_ERROR; LGL_ERROR;
data.addData(p_targetImageID.getValue(), new RenderData(_fbo)); data.addData(p_targetImageID.getValue(), new RenderData(_fbo));
p_targetImageID.issueWrite();
} }
std::string SimpleRaycaster::generateHeader() const { std::string SimpleRaycaster::generateHeader() const {
......
...@@ -245,7 +245,6 @@ namespace campvis { ...@@ -245,7 +245,6 @@ namespace campvis {
tgt::TextureUnit::setZeroUnit(); tgt::TextureUnit::setZeroUnit();
data.addData(p_targetImageID.getValue(), new RenderData(_fbo)); data.addData(p_targetImageID.getValue(), new RenderData(_fbo));
p_targetImageID.issueWrite();
} }
else { else {
LERROR("Input image must have dimensionality of 3."); LERROR("Input image must have dimensionality of 3.");
......
...@@ -126,7 +126,6 @@ namespace campvis { ...@@ -126,7 +126,6 @@ namespace campvis {
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
data.addData(p_targetImageID.getValue(), new RenderData(_fbo)); data.addData(p_targetImageID.getValue(), new RenderData(_fbo));
p_targetImageID.issueWrite();
} }
else { else {
LERROR("Input image must have dimensionality of 3."); LERROR("Input image must have dimensionality of 3.");
......
...@@ -107,7 +107,6 @@ namespace campvis { ...@@ -107,7 +107,6 @@ namespace campvis {
LGL_ERROR; LGL_ERROR;
data.addData(p_targetImageID.getValue(), new RenderData(_fbo)); data.addData(p_targetImageID.getValue(), new RenderData(_fbo));
p_targetImageID.issueWrite();
} }
else { else {
LERROR("No suitable input images found."); LERROR("No suitable input images found.");
......
...@@ -97,8 +97,6 @@ namespace campvis { ...@@ -97,8 +97,6 @@ namespace campvis {
FaceGeometry* mirror = new FaceGeometry(vertices); FaceGeometry* mirror = new FaceGeometry(vertices);
data.addData(p_mirrorID.getValue(), mirror); data.addData(p_mirrorID.getValue(), mirror);
p_mirrorID.issueWrite();
validate(INVALID_RESULT); validate(INVALID_RESULT);
} }
......
...@@ -222,7 +222,6 @@ namespace campvis { ...@@ -222,7 +222,6 @@ namespace campvis {
LGL_ERROR; LGL_ERROR;
data.addData(p_outputImage.getValue(), new RenderData(_fbo)); data.addData(p_outputImage.getValue(), new RenderData(_fbo));
p_outputImage.issueWrite();
} }
void VolumeExplorer::onProcessorInvalidated(AbstractProcessor* processor) { void VolumeExplorer::onProcessorInvalidated(AbstractProcessor* processor) {
......
...@@ -115,7 +115,6 @@ namespace campvis { ...@@ -115,7 +115,6 @@ namespace campvis {
} }
else if (getInvalidationLevel() & RAYCASTER_INVALID) { else if (getInvalidationLevel() & RAYCASTER_INVALID) {
_raycaster.process(data); _raycaster.process(data);
p_outputImage.issueWrite();
} }
validate(INVALID_RESULT | PG_INVALID | EEP_INVALID | RAYCASTER_INVALID); validate(INVALID_RESULT | PG_INVALID | EEP_INVALID | RAYCASTER_INVALID);
......
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