Commit 38c5abd3 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Moved QtJobProcessor to application/tools, added RaycastingProcessor registrations in vis module.

parent 42cbc355
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include "core/datastructures/imagerepresentationconverter.h" #include "core/datastructures/imagerepresentationconverter.h"
#include "core/pipeline/visualizationprocessor.h" #include "core/pipeline/visualizationprocessor.h"
#include "qtjobprocessor.h" #include "application/tools/qtjobprocessor.h"
#include <QApplication> #include <QApplication>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "cgt/assert.h" #include "cgt/assert.h"
#include "application/campvisapplication.h" #include "application/campvisapplication.h"
#include "application/qtjobprocessor.h" #include "application/tools/qtjobprocessor.h"
#include <QLabel> #include <QLabel>
#include <QGridLayout> #include <QGridLayout>
......
...@@ -33,7 +33,10 @@ ...@@ -33,7 +33,10 @@
#include "modules/vis/pipelines/volumeexplorerdemo.h" #include "modules/vis/pipelines/volumeexplorerdemo.h"
#include "modules/vis/pipelines/volumerendererdemo.h" #include "modules/vis/pipelines/volumerendererdemo.h"
#include "modules/vis/processors/advoptimizedraycaster.h"
#include "modules/vis/processors/contextpreservingraycaster.h"
#include "modules/vis/processors/depthdarkening.h" #include "modules/vis/processors/depthdarkening.h"
#include "modules/vis/processors/drrraycaster.h"
#include "modules/vis/processors/eepgenerator.h" #include "modules/vis/processors/eepgenerator.h"
#include "modules/vis/processors/geometryrenderer.h" #include "modules/vis/processors/geometryrenderer.h"
#include "modules/vis/processors/mprrenderer.h" #include "modules/vis/processors/mprrenderer.h"
...@@ -41,6 +44,7 @@ ...@@ -41,6 +44,7 @@
#include "modules/vis/processors/proxygeometrygenerator.h" #include "modules/vis/processors/proxygeometrygenerator.h"
#include "modules/vis/processors/quadview.h" #include "modules/vis/processors/quadview.h"
#include "modules/vis/processors/rendertargetcompositor.h" #include "modules/vis/processors/rendertargetcompositor.h"
#include "modules/vis/processors/simpleraycaster.h"
#include "modules/vis/processors/sliceextractor.h" #include "modules/vis/processors/sliceextractor.h"
#include "modules/vis/processors/slicerenderer2d.h" #include "modules/vis/processors/slicerenderer2d.h"
#include "modules/vis/processors/slicerenderer3d.h" #include "modules/vis/processors/slicerenderer3d.h"
...@@ -60,7 +64,10 @@ namespace campvis { ...@@ -60,7 +64,10 @@ namespace campvis {
template class PipelineRegistrar<VolumeRendererDemo>; template class PipelineRegistrar<VolumeRendererDemo>;
template class PipelineRegistrar<VolumeExplorerDemo>; template class PipelineRegistrar<VolumeExplorerDemo>;
template class SmartProcessorRegistrar<AdvOptimizedRaycaster>;
template class SmartProcessorRegistrar<ContextPreservingRaycaster>;
template class SmartProcessorRegistrar<DepthDarkening>; template class SmartProcessorRegistrar<DepthDarkening>;
template class SmartProcessorRegistrar<DRRRaycaster>;
template class SmartProcessorRegistrar<EEPGenerator>; template class SmartProcessorRegistrar<EEPGenerator>;
template class SmartProcessorRegistrar<GeometryRenderer>; template class SmartProcessorRegistrar<GeometryRenderer>;
template class SmartProcessorRegistrar<MprRenderer>; template class SmartProcessorRegistrar<MprRenderer>;
...@@ -68,6 +75,7 @@ namespace campvis { ...@@ -68,6 +75,7 @@ namespace campvis {
template class SmartProcessorRegistrar<ProxyGeometryGenerator>; template class SmartProcessorRegistrar<ProxyGeometryGenerator>;
template class SmartProcessorRegistrar<QuadView>; template class SmartProcessorRegistrar<QuadView>;
template class SmartProcessorRegistrar<RenderTargetCompositor>; template class SmartProcessorRegistrar<RenderTargetCompositor>;
template class SmartProcessorRegistrar<SimpleRaycaster>;
template class SmartProcessorRegistrar<SliceExtractor>; template class SmartProcessorRegistrar<SliceExtractor>;
template class SmartProcessorRegistrar<SliceRenderer2D>; template class SmartProcessorRegistrar<SliceRenderer2D>;
template class SmartProcessorRegistrar<SliceRenderer3D>; template class SmartProcessorRegistrar<SliceRenderer3D>;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define SCRIPTEDPIPELINEREGISTRAR_H__ #define SCRIPTEDPIPELINEREGISTRAR_H__
#include "luapipeline.h" #include "luapipeline.h"
#include "code/pipeline/pipelinefactory.h" #include "core/pipeline/pipelinefactory.h"
namespace campvis { namespace campvis {
......
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