controls broked

Assets/Scenes/sr_junglism/sr_junglism_Lighting.lighting

@@ -20,7 +20,7 @@ LightingSettings:
   m_LightmapMaxSize: 1024
   m_BakeResolution: 40
   m_Padding: 2
-  m_LightmapCompression: 3
+  m_LightmapCompression: 2
   m_AO: 0
   m_AOMaxDistance: 1
   m_CompAOExponent: 1

Assets/Scenes/sr_silverstorage/sr_silverstorage.unity

@@ -934,6 +934,14 @@ PrefabInstance:
       propertyPath: timingDoc
       value: 
       objectReference: {fileID: 766862837}
+    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
+      propertyPath: controlsDoc
+      value: 
+      objectReference: {fileID: 5198188376350273125}
+    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
+      propertyPath: crosshairDoc
+      value: 
+      objectReference: {fileID: 5198188376350273126}
     - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
       propertyPath: shipControls
       value: 
@@ -1154,3 +1162,25 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
+--- !u!114 &5198188376350273125 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7583115105922956764, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
+  m_PrefabInstance: {fileID: 5198188376350273124}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &5198188376350273126 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8483217137784193517, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
+  m_PrefabInstance: {fileID: 5198188376350273124}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Scenes/sr_star_fraenkel_zermelo/New Lighting Settings.lighting

@@ -0,0 +1,66 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New Lighting Settings
+  serializedVersion: 6
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 0
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentImportanceSampling: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
+  m_RespectSceneVisibilityWhenBakingGI: 0

Assets/Scenes/sr_star_fraenkel_zermelo/New Lighting Settings.lighting.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b02c454e6d6aae0f3957d7ae3a762566
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity

@@ -98,7 +98,7 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 112000000, guid: c62be38ca4fbb9cf4926457bbc55a6de, type: 2}
-  m_LightingSettings: {fileID: 4890085278179872738, guid: bce38263096f35008841c37a1fed3767, type: 2}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: b02c454e6d6aae0f3957d7ae3a762566, type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -605,6 +605,17 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: -2115851251826702791, guid: 64b045a17d258ce37b459b444db394d4, type: 3}
+--- !u!114 &747507678 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7583115105922956764, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
+  m_PrefabInstance: {fileID: 235775465}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &766862834
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -797,6 +808,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &1522445444 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8483217137784193517, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3}
+  m_PrefabInstance: {fileID: 235775465}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1650371476
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -963,6 +985,14 @@ PrefabInstance:
       propertyPath: timingDoc
       value: 
       objectReference: {fileID: 766862837}
+    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
+      propertyPath: controlsDoc
+      value: 
+      objectReference: {fileID: 747507678}
+    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
+      propertyPath: crosshairDoc
+      value: 
+      objectReference: {fileID: 1522445444}
     - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
       propertyPath: shipControls
       value: 

Assets/Src/Laps.cs

@@ -32,17 +32,19 @@ public class TimingNotice {
 
     public Label ToLabel() {
         Label l = Category switch {
+            NoticeCategory.Initial =>   new Label($"{TimeSpan.FromSeconds(Seconds):m\\:ss\\.fff}"),
             NoticeCategory.Slower =>    new Label($"+{Seconds:0.000}"),
             NoticeCategory.Faster =>    new Label($"-{Seconds:0.000}"),
             NoticeCategory.Fastest =>   new Label($"-{Seconds:0.000}"),
-            NoticeCategory.Initial =>   new Label($"{TimeSpan.FromSeconds(Seconds):m\\:ss\\.fff}"),
+            _ =>                        new Label($"-{Seconds:0.000}"),
         };
 
         string colourClass = Category switch {
+            NoticeCategory.Initial =>   "",
             NoticeCategory.Slower =>    "yellow",
             NoticeCategory.Faster =>    "green",
             NoticeCategory.Fastest =>   "purple",
-            NoticeCategory.Initial =>   "",
+            _ => "",
         };
 
         l.AddToClassList(colourClass);

Assets/Src/UI/ControlsUI.cs

@@ -17,6 +17,7 @@ public class ControlsUI : MonoBehaviour {
     }
 
     void Init() {
+        Debug.Log("controls ui init");
         uiDocument = GetComponent<UIDocument>();
         speed = uiDocument.rootVisualElement.Q<Label>("speed");
     }

Assets/Src/UI/MenuControls.cs

@@ -8,6 +8,12 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
     [SerializeField]
     UIDocument timingDoc;
 
+    [SerializeField]
+    UIDocument crosshairDoc;
+
+    [SerializeField]
+    UIDocument controlsDoc;
+
     [SerializeField]
     ShipControls shipControls;
 
@@ -48,8 +54,11 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
         menuDoc.enabled = true;
         menuUi.AddTracks();
 
+        // TODO abstract all this cause it's shit
         // take control off the ship
         timingDoc.enabled = false;
+        crosshairDoc.enabled = false;
+        controlsDoc.enabled = false;
         timingUi.enabled = false;
         shipControls.enabled = false;
     }
@@ -61,6 +70,8 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
 
         // resume control of the ship
         timingDoc.enabled = true;
+        crosshairDoc.enabled = true;
+        controlsDoc.enabled = true;
         timingUi.enabled = true;
         shipControls.enabled = true;
     }