Merge pull request #772 from uni-bremen-agst/lsp-evaluation-fixes

Various fixes and improvements from LSP evaluation

.github/workflows/main.yml

@@ -7,11 +7,11 @@ on:
   workflow_dispatch:
     inputs:
       windows:
-        description: 'Create Windows build?'
+        description: "Create Windows build?"
         default: true
         type: boolean
       linux:
-        description: 'Create Linux build?'
+        description: "Create Linux build?"
         default: true
         type: boolean
 
@@ -82,7 +82,7 @@ jobs:
             fi
           fi
           echo "PATTERNS=none" >> $GITHUB_ENV
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         name: Check for bad patterns
         with:
           retries: 3
@@ -147,7 +147,7 @@ jobs:
             Library-SEE
       - name: Restore NuGet packages
         run: /home/see/.dotnet/tools/nugetforunity restore .
-      - uses: game-ci/unity-test-runner@v4.1.1
+      - uses: game-ci/unity-test-runner@v4
         timeout-minutes: 60
         name: Run Tests
         id: tests
@@ -158,10 +158,10 @@ jobs:
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           checkName: Test Results
-          testMode: EditMode  # PlayMode tests get stuck in batchmode
+          testMode: EditMode # PlayMode tests get stuck in batchmode
           runAsHostUser: true
           customParameters: -testCategory "!NonDeterministic"
-          coverageOptions: 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+SEE'
+          coverageOptions: "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+SEE"
       - uses: actions/upload-artifact@v4
         continue-on-error: true
         name: Upload test results
@@ -203,7 +203,6 @@ jobs:
             echo "targetPlatforms=$(jq --compact-output --null-input '$ARGS.positional' --args -- ${targetPlatforms[@]})" >> $GITHUB_OUTPUT
           fi
 
-
   build:
     name: Create build
     runs-on: ${{ needs.setup.outputs.runner }}
@@ -248,7 +247,7 @@ jobs:
         with:
           name: SEE-${{ matrix.targetPlatform }}-${{ github.sha }}.zip
           path: build-${{ matrix.targetPlatform }}.zip
-          retention-days: 7  # Due to high space usage.
+          retention-days: 7 # Due to high space usage.
 
   release:
     name: Release
@@ -266,7 +265,7 @@ jobs:
           tag: pr-${{ github.event.pull_request.number }}
           message: ${{ github.event.pull_request.title }}
       - name: Publish release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           prerelease: true
           name: ${{ github.event.pull_request.title }}
@@ -277,20 +276,19 @@ jobs:
           body: |
             This release incorporates the changes by @${{ github.event.pull_request.user.login }} from pull request #${{ github.event.pull_request.number }}.
             Builds for Windows and Linux are available below.
-            
+
             ## Details
             ${{ github.event.pull_request.body }}
-            
+
             ---
-            
-            > [See original pull request for details.](${{ github.event.pull_request.html_url }})
 
+            > [See original pull request for details.](${{ github.event.pull_request.html_url }})
 
   cleanup:
     name: Cleanup
     runs-on: ${{ needs.setup.outputs.runner }}
     if: ${{ always() }}
-    needs: [setup, test, build, release]   # "test", "build" and "release" use docker and sometimes mess up permissions.
+    needs: [setup, test, build, release] # "test", "build" and "release" use docker and sometimes mess up permissions.
     strategy:
       fail-fast: false
     steps:
@@ -302,4 +300,3 @@ jobs:
         if: always()
         shell: bash
         run: sudo /mnt/scripts/set-work-permissions.sh
-

Assets/Resources/Fonts/LiberationSans SDF - Portal Overlay.asset

@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: LiberationSans SDF Material
-  m_Shader: {fileID: 4800000, guid: 0ca862acf8d440a59dc4aea2a4965698, type: 3}
+  m_Shader: {fileID: 4800000, guid: f2d33e526047a3a45a14ed790753bb20, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -23,28 +23,64 @@ Material:
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Cube:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FaceTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 28684132378477856}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _OutlineTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
+    - _Ambient: 0.5
+    - _Bevel: 0.5
+    - _BevelClamp: 0
+    - _BevelOffset: 0
+    - _BevelRoundness: 0
+    - _BevelWidth: 0
+    - _BumpFace: 0
+    - _BumpOutline: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
+    - _Diffuse: 0.5
     - _FaceDilate: 0
+    - _FaceUVSpeedX: 0
+    - _FaceUVSpeedY: 0
+    - _GlowInner: 0.05
+    - _GlowOffset: 0
+    - _GlowOuter: 0.05
+    - _GlowPower: 0.75
     - _GradientScale: 10
+    - _LightAngle: 3.1416
     - _MaskSoftnessX: 0
     - _MaskSoftnessY: 0
     - _OutlineSoftness: 0
+    - _OutlineUVSpeedX: 0
+    - _OutlineUVSpeedY: 0
     - _OutlineWidth: 0.1
     - _PerspectiveFilter: 0.875
+    - _Reflectivity: 10
     - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 1
+    - _ScaleRatioB: 0.73125
     - _ScaleRatioC: 0.73125
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
     - _Sharpness: 0
+    - _SpecularPower: 2
     - _Stencil: 0
     - _StencilComp: 8
     - _StencilOp: 0
@@ -62,10 +98,16 @@ Material:
     - _WeightNormal: 0
     m_Colors:
     - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
+    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
     - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
     - _PortalMax: {r: -0.94397986, g: -1.8898091, b: 0, a: 0}
     - _PortalMin: {r: -2.41602, g: -5.110191, b: 0, a: 0}
+    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_BuildTextureStacks: []
 --- !u!114 &11400000

Assets/Resources/Prefabs/UI/MetricRowLine.prefab

@@ -36,8 +36,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 582.867, y: 100}
+  m_AnchoredPosition: {x: 118.4, y: 0}
+  m_SizeDelta: {x: 776.1, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7221035067078308661
 CanvasRenderer:
@@ -68,7 +68,7 @@ MonoBehaviour:
   m_Spacing: 5
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
+  m_ChildControlWidth: 1
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
@@ -105,10 +105,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4417611932811040179}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 211.49, y: -50}
-  m_SizeDelta: {x: 422.98, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3220663573982420325
 CanvasRenderer:
@@ -218,6 +218,7 @@ GameObject:
   - component: {fileID: 2256359333229225443}
   - component: {fileID: 5575769617067488252}
   - component: {fileID: 5791917304804281608}
+  - component: {fileID: 1081146575147054472}
   m_Layer: 5
   m_Name: ValueLine
   m_TagString: Untagged
@@ -239,10 +240,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 4417611932811040179}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 643.99, y: -50}
-  m_SizeDelta: {x: 432.02002, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5575769617067488252
 CanvasRenderer:
@@ -341,3 +342,23 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &1081146575147054472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6677135121746064833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 400
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1

Assets/Resources/Shaders/TMP_SDF-Mobile Portal.shader

@@ -261,7 +261,8 @@ SubShader {
 				input.v.x > _PortalMax.x || input.v.z > _PortalMax.y
 				)
 			{
-				c = fixed4(0.0f, 0.0f, 0.0f, 0.0f);
+				// Text should not actually be cut off outside the portal.
+				// c = fixed4(0.0f, 0.0f, 0.0f, 0.0f);
 			}
 
 			return c;

Assets/SEE/Controls/Actions/ActionStateTypes.cs

@@ -324,27 +324,27 @@ static ActionStateTypes()
         public static readonly ActionStateType LoadBoard;
         public static readonly ActionStateType SaveBoard;
 
-        public readonly static ActionStateTypeGroup Drawable;
-        public readonly static ActionStateType DrawFreehand;
-        public readonly static ActionStateType DrawShapes;
-        public readonly static ActionStateType WriteText;
-        public readonly static ActionStateType AddImage;
-        public readonly static ActionStateType MindMap;
-        public readonly static ActionStateType StickyNote;
-        public readonly static ActionStateType ColorPicker;
-        public readonly static ActionStateType Edit;
-        public readonly static ActionStateType MoveRotator;
-        public readonly static ActionStateType LayerChanger;
-        public readonly static ActionStateType CutCopyPaste;
-        public readonly static ActionStateType Scale;
-        public readonly static ActionStateType MovePoint;
-        public readonly static ActionStateType LineSplit;
-        public readonly static ActionStateType LinePointErase;
-        public readonly static ActionStateType LineConnectionErase;
-        public readonly static ActionStateType Erase;
-        public readonly static ActionStateType Clear;
-        public readonly static ActionStateType Save;
-        public readonly static ActionStateType Load;
+        public static readonly ActionStateTypeGroup Drawable;
+        public static readonly ActionStateType DrawFreehand;
+        public static readonly ActionStateType DrawShapes;
+        public static readonly ActionStateType WriteText;
+        public static readonly ActionStateType AddImage;
+        public static readonly ActionStateType MindMap;
+        public static readonly ActionStateType StickyNote;
+        public static readonly ActionStateType ColorPicker;
+        public static readonly ActionStateType Edit;
+        public static readonly ActionStateType MoveRotator;
+        public static readonly ActionStateType LayerChanger;
+        public static readonly ActionStateType CutCopyPaste;
+        public static readonly ActionStateType Scale;
+        public static readonly ActionStateType MovePoint;
+        public static readonly ActionStateType LineSplit;
+        public static readonly ActionStateType LinePointErase;
+        public static readonly ActionStateType LineConnectionErase;
+        public static readonly ActionStateType Erase;
+        public static readonly ActionStateType Clear;
+        public static readonly ActionStateType Save;
+        public static readonly ActionStateType Load;
 
         #endregion