Merge remote-tracking branch 'origin/master' into 436-display-video-o…

…n-avatar
uni-bremen-agst · Sep 30, 2024 · 013baf8 · 013baf8
2 parents 12a4594 + 1abf4b0
commit 013baf8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/Assets/Plugins/HighlightPlus/Scripts/HighlightEffect.cs b/Assets/Plugins/HighlightPlus/Scripts/HighlightEffect.cs
diff --git a/Assets/Plugins/HighlightPlus/Scripts/VRCheck.cs b/Assets/Plugins/HighlightPlus/Scripts/VRCheck.cs
diff --git a/Assets/SEE/Game/Drawable/GameHighlighter.cs b/Assets/SEE/Game/Drawable/GameHighlighter.cs
@@ -23,7 +23,7 @@ public static HighlightEffect EnableGlowOutline(GameObject obj)
             effect.outline = 1;
             effect.outlineQuality = HighlightPlus.QualityLevel.Highest;
             effect.outlineColor = Color.yellow;
-            effect.glowQuality = HighlightPlus.QualityLevel.Highest;
+            effect.glowQuality = Highlighter.DefaultGlowQuality;
             effect.glow = 1.0f;
             effect.glowHQColor = Color.yellow;
             return effect;
@@ -40,7 +40,7 @@ public static HighlightEffect EnableGlowOverlay(GameObject obj)
             effect.highlighted = true;
             effect.previewInEditor = false;
             effect.outline = 0;
-            effect.glowQuality = HighlightPlus.QualityLevel.Highest;
+            effect.glowQuality = Highlighter.DefaultGlowQuality;
             effect.glow = 1.0f;
             effect.glowHQColor = Color.yellow;
             effect.overlay = 1.0f;

diff --git a/Assets/SEE/Game/Highlighter.cs b/Assets/SEE/Game/Highlighter.cs
@@ -9,6 +9,13 @@ namespace SEE.Game
     /// </summary>
     internal static class Highlighter
     {
+        /// <summary>
+        /// The default quality level for the glow effect (<see cref="HighlightEffect.glowQuality"/>.
+        /// </summary>
+        /// <remarks>The value <see cref="HighlightPlus.QualityLevel.Highest"/> does not work
+        /// in Highlight Plus version 21.0 anymore.</remarks>
+        public const HighlightPlus.QualityLevel DefaultGlowQuality = HighlightPlus.QualityLevel.Highest;
+
         /// <summary>
         /// Whether or not the <paramref name="gameObject"/> should be highlighted.
         /// </summary>
@@ -38,7 +45,7 @@ public static HighlightEffect GetHighlightEffect(GameObject gameObject)
                 highlight.outlineColor = inverted;
                 highlight.SetGlowColor(Color.yellow);
                 highlight.glow = 2;
-                highlight.glowQuality = HighlightPlus.QualityLevel.Highest;
+                highlight.glowQuality = DefaultGlowQuality;
                 highlight.effectGroup = TargetOptions.OnlyThisObject;
                 highlight.glowDownsampling = 1;
                 highlight.hitFxColor = inverted;