GPU Display: Move GL animation config to general GPU configuration as leightweight GL config

davidrohr · davidrohr · commit 586bcc90133d · 2020-11-20T09:08:36.000+01:00
diff --git a/GPU/GPUTracking/Base/GPUSettingsList.h b/GPU/GPUTracking/Base/GPUSettingsList.h
@@ -145,6 +145,35 @@ AddOption(clustersOnly, bool, false, "", 0, "Visualize clusters only")
 AddHelp("help", 'h')
 EndConfig()
 
+// Light settings concerning the event display (can be changed without rebuilding vertices)
+BeginSubConfig(GPUSettingsDisplayLight, GLlight, configStandalone, "GL", 'g', "OpenGL display settings")
+AddOption(animationMode, int, 0, "", 0, "")
+AddOption(smoothPoints, bool, true, "", 0, "Apply smoothing to points")
+AddOption(smoothLines, bool, false, "", 0, "Apply smoothing to lines")
+AddOption(depthBuffer, bool, false, "", 0, "Enable Z-buffer")
+AddOption(drawClusters, bool, true, "", 0, "Highlight clusters")
+AddOption(drawLinks, bool, false, "", 0, "Highlight links")
+AddOption(drawInitLinks, bool, false, "", 0, "Highlight cleaned-up links")
+AddOption(drawSeeds, bool, false, "", 0, "Highlight seeds")
+AddOption(drawTracklets, bool, false, "", 0, "Highlight tracklets")
+AddOption(drawTracks, bool, false, "", 0, "Highlight sector tracks")
+AddOption(drawGlobalTracks, bool, false, "", 0, "Highlight global sector tracks prolonged into adjacent sector")
+AddOption(drawFinal, bool, false, "", 0, "Highlight final tracks")
+AddOption(excludeClusters, int, 0, "", 0, "Exclude clusters from selected draw objects from display")
+AddOption(propagateTracks, int, 0, "", 0, "Propagate final tracks further (inward / outward / show MC tracks)")
+AddOption(colorClusters, int, 1, "", 0, "Color clusters belonging to track objects")
+AddOption(drawSlice, int,  -1, "", 0, "Show individual slice")
+AddOption(drawRelatedSlices, int, 0, "", 0, "Show related slices (if drawSlice != -1)")
+AddOption(drawGrid, int, 0, "", 0, "Highlight grid")
+AddOption(colorCollisions, int, 0, "", 0, "Distinguish collisions in timeframe by color")
+AddOption(showCollision, int, -1, "", 0, "Show only individual collision")
+AddOption(pointSize, float, 2.0f, "", 0, "Set point size")
+AddOption(lineWidth, float, 1.4f, "", 0, "Set line width")
+AddOption(drawTPC, bool, true, "", 0, "Enable drawing TPC data")
+AddOption(drawTRD, bool, true, "", 0, "Enabale drawing TRD data")
+AddHelp("help", 'h')
+EndConfig()
+
 // Settings concerning the standalone QA
 BeginSubConfig(GPUSettingsQA, QA, configStandalone, "QA", 'q', "QA settings")
 AddOptionVec(compareInputs, const char*, "QAinput", 0, "Read histogram from these input files and include them in the output plots")
@@ -269,6 +298,7 @@ AddSubConfig(GPUSettingsProcessing, proc)
 AddSubConfig(GPUSettingsTF, TF)
 AddSubConfig(GPUSettingsQA, QA)
 AddSubConfig(GPUSettingsDisplay, GL)
+AddSubConfig(GPUSettingsDisplayLight, GLlight)
 AddSubConfig(GPUSettingsEG, EG)
 EndConfig()
 #elif defined(GPUCA_O2_LIB) || defined(GPUCA_O2_INTERFACE) // GPUCA_STANDALONE
diff --git a/GPU/GPUTracking/Standalone/display/GPUDisplay.h b/GPU/GPUTracking/Standalone/display/GPUDisplay.h
@@ -138,38 +138,6 @@ class GPUDisplay
     GLvertex(GLfloat a, GLfloat b, GLfloat c) : x(a), y(b), z(c) {}
   };
 
-  struct OpenGLConfig {
-    int animationMode = 0;
-
-    bool smoothPoints = true;
-    bool smoothLines = false;
-    bool depthBuffer = false;
-
-    bool drawClusters = true;
-    bool drawLinks = false;
-    bool drawSeeds = false;
-    bool drawInitLinks = false;
-    bool drawTracklets = false;
-    bool drawTracks = false;
-    bool drawGlobalTracks = false;
-    bool drawFinal = false;
-    int excludeClusters = 0;
-    int propagateTracks = 0;
-
-    int colorClusters = 1;
-    int drawSlice = -1;
-    int drawRelatedSlices = 0;
-    int drawGrid = 0;
-    int colorCollisions = 0;
-    int showCollision = -1;
-
-    float pointSize = 2.0;
-    float lineWidth = 1.4;
-
-    bool drawTPC = true;
-    bool drawTRD = true;
-  };
-
   struct DrawArraysIndirectCommand {
     DrawArraysIndirectCommand(unsigned int a = 0, unsigned int b = 0, unsigned int c = 0, unsigned int d = 0) : count(a), instanceCount(b), first(c), baseInstance(d) {}
     unsigned int count;
@@ -294,7 +262,7 @@ class GPUDisplay
   GPUDisplayBackend* mBackend;
   GPUChainTracking* mChain;
   const GPUSettingsDisplay& mConfig;
-  OpenGLConfig mCfg;
+  GPUSettingsDisplayLight mCfg;
   GPUQA* mQA;
   const GPUTPCGMMerger& mMerger;
   qSem mSemLockDisplay;
@@ -385,7 +353,7 @@ class GPUDisplay
   bool mAnimationChangeConfig = true;
   float mAnimationDelay = 2.f;
   vecpod<float> mAnimateVectors[9];
-  vecpod<OpenGLConfig> mAnimateConfig;
+  vecpod<GPUSettingsDisplayLight> mAnimateConfig;
   opengl_spline mAnimationSplines[8];
 
   volatile int mResetScene = 0;
