Add clipping plane state

Author: dcwhite

src/Core/Algorithms/Base/Variable.h

@@ -124,6 +124,12 @@ namespace Algorithms {
     return vars;
   }
 
+  template <typename T>
+  Variable::List makeHomogeneousVariableListFill(const T& value, size_t num)
+  {
+    return makeHomogeneousVariableList([value](size_t) { return value; }, num);
+  }
+
   template <typename T>
   std::vector<T> toTypedVector(const Variable::List& list, std::function<T(const Variable&)> convert)
   {

src/Core/Datatypes/Feedback.h

@@ -58,6 +58,13 @@ enum WidgetMovement
   SCALE_AXIS_UNIDIRECTIONAL,
 };
 
+struct SCISHARE ClippingPlane
+{
+  static constexpr int MaxCount = 6;
+  bool visible, showFrame, reverseNormal;
+  double x, y, z, d;
+};
+
 struct EnumClassHash
 {
   template <typename T> std::size_t operator()(T t) const

src/Interface/Modules/Render/ES/RendererInterfaceCollaborators.h

@@ -54,12 +54,6 @@ namespace SCIRun
       FOG_START,
       FOG_END
     };
-
-    struct SCISHARE ClippingPlane
-    {
-      bool visible, showFrame, reverseNormal;
-      double x, y, z, d;
-    };
   }
 }
 

src/Interface/Modules/Render/ES/SRInterface.h

@@ -244,7 +244,7 @@ namespace SCIRun
 
       ESCore                              mCore               {};       // Entity system core.
 
-      std::vector<ClippingPlane>          clippingPlanes_     {};
+      std::vector<Core::Datatypes::ClippingPlane>          clippingPlanes_     {};
       int                                 clippingPlaneIndex_ {0};
 
       ren::ShaderVBOAttribs<5>            mArrowAttribs       {};       // Pre-applied shader / VBO attributes.

src/Modules/Render/ViewScene.cc

@@ -129,6 +129,12 @@ ALGORITHM_PARAMETER_DEF(Render, CameraRotation);
 ALGORITHM_PARAMETER_DEF(Render, IsExecuting);
 ALGORITHM_PARAMETER_DEF(Render, TimeExecutionFinished);
 ALGORITHM_PARAMETER_DEF(Render, HasNewGeometry);
+ALGORITHM_PARAMETER_DEF(Render, ClippingPlaneEnabled);
+ALGORITHM_PARAMETER_DEF(Render, ClippingPlaneNormalReversed);
+ALGORITHM_PARAMETER_DEF(Render, ClippingPlaneX);
+ALGORITHM_PARAMETER_DEF(Render, ClippingPlaneY);
+ALGORITHM_PARAMETER_DEF(Render, ClippingPlaneZ);
+ALGORITHM_PARAMETER_DEF(Render, ClippingPlaneD);
 
 ViewScene::ViewScene() : ModuleWithAsyncDynamicPorts(staticInfo_, true)
 {
@@ -209,6 +215,13 @@ void ViewScene::setStateDefaults()
   state->setValue(Parameters::CameraRotation, makeAnonymousVariableList(1.0, 0.0, 0.0, 0.0));
   state->setValue(Parameters::HasNewGeometry, false);
 
+  state->setValue(Parameters::ClippingPlaneEnabled, makeHomogeneousVariableListFill(false, ClippingPlane::MaxCount));
+  state->setValue(Parameters::ClippingPlaneNormalReversed, makeHomogeneousVariableListFill(false, ClippingPlane::MaxCount));
+  state->setValue(Parameters::ClippingPlaneX, makeHomogeneousVariableListFill(0.0, ClippingPlane::MaxCount));
+  state->setValue(Parameters::ClippingPlaneY, makeHomogeneousVariableListFill(0.0, ClippingPlane::MaxCount));
+  state->setValue(Parameters::ClippingPlaneZ, makeHomogeneousVariableListFill(0.0, ClippingPlane::MaxCount));
+  state->setValue(Parameters::ClippingPlaneD, makeHomogeneousVariableListFill(0.0, ClippingPlane::MaxCount));
+
   get_state()->connectSpecificStateChanged(Parameters::GeometryFeedbackInfo, [this]() { processViewSceneObjectFeedback(); });
   get_state()->connectSpecificStateChanged(Parameters::MeshComponentSelection, [this]() { processMeshComponentSelection(); });
 }

src/Modules/Render/ViewScene.h

@@ -79,6 +79,12 @@ namespace SCIRun
         ALGORITHM_PARAMETER_DECL(ScaleBarNumTicks);
         ALGORITHM_PARAMETER_DECL(ScaleBarLineWidth);
         ALGORITHM_PARAMETER_DECL(ScaleBarFontSize);
+        ALGORITHM_PARAMETER_DECL(ClippingPlaneEnabled);
+        ALGORITHM_PARAMETER_DECL(ClippingPlaneNormalReversed);
+        ALGORITHM_PARAMETER_DECL(ClippingPlaneX);
+        ALGORITHM_PARAMETER_DECL(ClippingPlaneY);
+        ALGORITHM_PARAMETER_DECL(ClippingPlaneZ);
+        ALGORITHM_PARAMETER_DECL(ClippingPlaneD);
 
 
         // save/load confirmed, uses standard widget managers.