Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 (https://www.gitkraken.com/blog/weak-ssh-key-fix). If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

21.10.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 275121a4 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

fixed RenderTargetCompositor using anonymous enum as field

parent 82b8a7d8
......@@ -43,12 +43,12 @@
namespace campvis {
static const GenericOption<CompositingMode> compositingOptions[5] = {
GenericOption<CompositingMode>("first", "Only First", CompositingModeFirst),
GenericOption<CompositingMode>("second", "Only Second", CompositingModeSecond),
GenericOption<CompositingMode>("alpha", "Alpha Blending", CompositingModeAlpha),
GenericOption<CompositingMode>("diff", "Difference", CompositingModeDifference),
GenericOption<CompositingMode>("depth", "Depth Test", CompositingModeDepth)
static const GenericOption<RenderTargetCompositor::CompositingMode> compositingOptions[5] = {
GenericOption<RenderTargetCompositor::CompositingMode>("first", "Only First", RenderTargetCompositor::CompositingModeFirst),
GenericOption<RenderTargetCompositor::CompositingMode>("second", "Only Second", RenderTargetCompositor::CompositingModeSecond),
GenericOption<RenderTargetCompositor::CompositingMode>("alpha", "Alpha Blending", RenderTargetCompositor::CompositingModeAlpha),
GenericOption<RenderTargetCompositor::CompositingMode>("diff", "Difference", RenderTargetCompositor::CompositingModeDifference),
GenericOption<RenderTargetCompositor::CompositingMode>("depth", "Depth Test", RenderTargetCompositor::CompositingModeDepth)
};
const std::string RenderTargetCompositor::loggerCat_ = "CAMPVis.modules.vis.RenderTargetCompositor";
......
......@@ -45,7 +45,11 @@ namespace tgt {
namespace campvis {
class ImageData;
namespace {
/**
* Performs the composition of a multiple render targets
*/
class RenderTargetCompositor : public VisualizationProcessor, public HasProcessorDecorators {
public:
enum CompositingMode {
CompositingModeFirst = 0,
CompositingModeSecond = 1,
......@@ -53,13 +57,7 @@ namespace campvis {
CompositingModeDifference = 3,
CompositingModeDepth = 4
};
}
/**
* Performs the composition of a multiple render targets
*/
class RenderTargetCompositor : public VisualizationProcessor, public HasProcessorDecorators {
public:
/**
* Constructs a new RenderTargetCompositor Processor
**/
......
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