From 999cba08015aa3d477862c6a719b2459c3dc3b91 Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Thu, 10 Aug 2023 20:56:19 -0700 Subject: [PATCH 1/7] Delete default-2021.dwlt --- .../UserSettings/Layouts/default-2021.dwlt | 1390 ----------------- 1 file changed, 1390 deletions(-) delete mode 100644 UnityClient/UserSettings/Layouts/default-2021.dwlt diff --git a/UnityClient/UserSettings/Layouts/default-2021.dwlt b/UnityClient/UserSettings/Layouts/default-2021.dwlt deleted file mode 100644 index a0ebc217..00000000 --- a/UnityClient/UserSettings/Layouts/default-2021.dwlt +++ /dev/null @@ -1,1390 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 973 - y: 51 - width: 1507 - height: 1341 - m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 ---- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1507 - height: 1341 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1507 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 1321 - width: 1507 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 9} - - {fileID: 14} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1507 - height: 1291 - m_MinSize: {x: 400, y: 200} - m_MaxSize: {x: 32384, y: 16192} - vertical: 0 - controlID: 154 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 8} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 689 - height: 1291 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 155 ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 689 - height: 617 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - - {fileID: 17} - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 617 - width: 689 - height: 674 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 19} - - {fileID: 20} - - {fileID: 15} - m_Selected: 2 - m_LastSelected: 1 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 13} - m_Position: - serializedVersion: 2 - x: 689 - y: 0 - width: 554 - height: 1291 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 115 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 11} - - {fileID: 12} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 554 - height: 601 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 116 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 251 - height: 601 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneHierarchyWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 251 - y: 0 - width: 303 - height: 601 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 23} - m_Panes: - - {fileID: 23} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 601 - width: 554 - height: 690 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 24} - m_Panes: - - {fileID: 24} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1243 - y: 0 - width: 264 - height: 1291 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 25} - m_Panes: - - {fileID: 25} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 973 - y: 698 - width: 688 - height: 653 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2560, y: 1440} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 05000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1280 - m_HBaseRangeMax: 1280 - m_VBaseRangeMin: -720 - m_VBaseRangeMax: 720 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 688 - height: 632 - m_Scale: {x: 0.26875, y: 0.26875} - m_Translation: {x: 344, y: 315.99997} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1280 - y: -1175.8138 - width: 2560 - height: 2351.6277 - m_MinimalGUI: 1 - m_defaultScale: 0.26875 - m_LastWindowPixelSize: {x: 688, y: 653} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 973 - y: 81 - width: 688 - height: 596 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} - snapCorner: 3 - id: Tool Settings - index: 0 - layout: 1 - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-grid-and-snap-toolbar - index: 1 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-scene-view-toolbar - index: 0 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-search-toolbar - index: 1 - layout: 1 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-transform-toolbar - index: 0 - layout: 2 - - dockPosition: 0 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 67.5, y: 86} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Orientation - index: 0 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Light Settings - index: 0 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 1 - collapsed: 0 - displayed: 0 - snapOffset: {x: -167, y: -205} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 - id: Scene View/Camera - index: 1 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Constraints - index: 2 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Collisions - index: 3 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Navmesh Display - index: 4 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Agent Display - index: 5 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Obstacle Display - index: 6 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Occlusion Culling - index: 7 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Physics Debugger - index: 8 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Scene Visibility - index: 9 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Particles - index: 10 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Animation Rigging - index: 11 - layout: 4 - m_WindowGUID: d034622d6465b2641a46434df024b3bc - m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 0 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: -1.0424951, y: 11.621899, z: -0.56427526} - speed: 2 - m_Value: {x: -1.0424951, y: 11.621899, z: -0.56427526} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 - m_SceneViewState: - m_AlwaysRefresh: 0 - showFog: 1 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_FxEnabled: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - yGrid: - m_Fade: - m_Target: 1 - speed: 2 - m_Value: 1 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - zGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - m_ShowGrid: 1 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: 0.024425896, y: 0.7624291, z: -0.6459717, w: 0.02883126} - speed: 2 - m_Value: {x: 0.024425829, y: 0.76242703, z: -0.6459699, w: 0.028831182} - m_Size: - m_Target: 9.947348 - speed: 2 - m_Value: 9.951079 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 - m_SpeedMin: 0.001 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfViewHorizontalOrVertical: 60 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.11562159, y: -0.8836355, z: 0.3002874, w: 0.34018293} - m_LastSceneViewOrtho: 1 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 491.2 - y: 82.4 - width: 1103.6 - height: 399 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 83284209778702526, guid: ba0d1c3e7e6db084cb41f53b268a2592, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: ba0d1c3e7e6db084cb41f53b268a2592, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 83284209778702526, guid: ba0d1c3e7e6db084cb41f53b268a2592, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8bf5230d087064def9a2d1129c733014, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Entity Debugger - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 464 - y: 82.4 - width: 930.2 - height: 474.2 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - entityQueryListStates: [] - entityQueryListStateNames: [] - systemListStates: - - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 00000000 - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - systemListStateNames: - - Default World - entityListState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - chunkInfoListState: - state: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - mode: 1 - lastEditModeWorldSelection: ' - - - -' - lastPlayModeWorldSelection: Default World - showingPlayerLoop: 0 - ShowInactiveSystems: 0 - ShowAllWorlds: 0 ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Timeline - m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 896 - y: 646.4 - width: 704.39996 - height: 418 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_Preferences: - editType: 0 - timeReferenceMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_SequenceHierarchy: {fileID: 0} - m_SequencePath: - m_SelectionRoot: 0 - m_SubElements: [] ---- !u!114 &20 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 800.2 - y: 19 - width: 734.8 - height: 431.40002 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -27510 ---- !u!114 &21 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1662 - y: 81 - width: 249 - height: 580 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Prefabs/Cameras - m_Globs: [] - m_OriginalText: - m_ViewMode: 0 - m_StartGridSize: 64 - m_LastFolders: [] - m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\jasmineschoch\Documents\proj\Urchin\UnityClient - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec6e0000 - m_LastClickedID: 28396 - m_ExpandedIDs: 00000000348b0000368b0000388b00003a8b00003c8b00003e8b0000408b0000428b0000448b0000468b0000488b00004a8b00004c8b00004e8b0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 14} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000348b0000368b0000388b00003a8b00003c8b00003e8b0000408b0000428b0000448b0000468b0000488b00004a8b00004c8b00004e8b0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000083a0000be3a00005c570000983b0000625a0000e25c0000de5c0000bec80000d843000000000000c4430000d660000096430000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 198.2 ---- !u!114 &22 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e98b4a8982e76bc4d86c10db25cd7193, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 430, y: 250} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Addressables Groups - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1234 - y: 88 - width: 354 - height: 819 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_GroupEditor: - m_TreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: e3658843 - m_LastClickedID: 1133012451 - m_ExpandedIDs: e3658843 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_Mchs: - m_Columns: - - width: 108.88947 - sortedAscending: 0 - headerContent: - m_Text: Group Name \ Addressable Name - m_Image: {fileID: 0} - m_Tooltip: Address used to load asset at runtime - contextMenuText: - headerTextAlignment: 0 - sortingArrowAlignment: 1 - minWidth: 100 - maxWidth: 10000 - autoResize: 1 - allowToggleVisibility: 1 - canSort: 1 - userData: 0 - - width: 20 - sortedAscending: 0 - headerContent: - m_Text: - m_Image: {fileID: 3147778976006948682, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: Asset type - contextMenuText: - headerTextAlignment: 0 - sortingArrowAlignment: 1 - minWidth: 20 - maxWidth: 20 - autoResize: 1 - allowToggleVisibility: 1 - canSort: 0 - userData: 0 - - width: 105.62795 - sortedAscending: 0 - headerContent: - m_Text: Path - m_Image: {fileID: 0} - m_Tooltip: Current Path of asset - contextMenuText: - headerTextAlignment: 0 - sortingArrowAlignment: 1 - minWidth: 100 - maxWidth: 10000 - autoResize: 1 - allowToggleVisibility: 1 - canSort: 1 - userData: 0 - - width: 67.008896 - sortedAscending: 0 - headerContent: - m_Text: Labels - m_Image: {fileID: 0} - m_Tooltip: Assets can have multiple labels - contextMenuText: - headerTextAlignment: 0 - sortingArrowAlignment: 1 - minWidth: 20 - maxWidth: 1000 - autoResize: 1 - allowToggleVisibility: 1 - canSort: 1 - userData: 0 - m_VisibleColumns: 00000000010000000200000003000000 - m_SortedColumns: - window: {fileID: 22} - m_VerticalSplitterPercent: 0.8 ---- !u!114 &23 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1913 - y: 81 - width: 301 - height: 580 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: c4f7ffff - m_LastClickedID: -2108 - m_ExpandedIDs: 12f2ffffb4f7ffffc4f7ffff14fbffff6c7e0000c27e0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 12} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 1 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 65e234ef80e843247ad80afd315fbb08 ---- !u!114 &24 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1662 - y: 682 - width: 552 - height: 669 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &25 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 2216 - y: 81 - width: 263 - height: 1270 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 232 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} From 258477c2d173312ade55ca2cf7febe8ef9a54640 Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Thu, 24 Aug 2023 11:07:18 -0700 Subject: [PATCH 2/7] chore: fix missing FOVManager link --- .../Assets/Scenes/UnityMouseRenderer.unity | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/UnityClient/Assets/Scenes/UnityMouseRenderer.unity b/UnityClient/Assets/Scenes/UnityMouseRenderer.unity index f26350ba..9a75abe4 100644 --- a/UnityClient/Assets/Scenes/UnityMouseRenderer.unity +++ b/UnityClient/Assets/Scenes/UnityMouseRenderer.unity @@ -6052,6 +6052,17 @@ Transform: m_Father: {fileID: 1716532781} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1463353686 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5076698394702019361, guid: 819c72893569fa442b7683567f3569d6, type: 3} + m_PrefabInstance: {fileID: 5708727189667669680} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be8deb1d448e6fc4699aef6a399423a5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1469330506 GameObject: m_ObjectHideFlags: 0 @@ -9430,6 +9441,10 @@ PrefabInstance: propertyPath: textParent value: objectReference: {fileID: 1648926224} + - target: {fileID: 161993171994875470, guid: 8d78849a732a3e54c8a6dfcda3795ec0, type: 3} + propertyPath: _fovManager + value: + objectReference: {fileID: 1463353686} - target: {fileID: 161993171994875470, guid: 8d78849a732a3e54c8a6dfcda3795ec0, type: 3} propertyPath: probeParent value: From 340a48dd8671c3d15de84104ba9b9250d4fd0d30 Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Thu, 24 Aug 2023 11:25:35 -0700 Subject: [PATCH 3/7] fix: fixing bug that caused rotation display to be mis-match with API --- UnityClient/Assets/Scripts/SceneInfo/SceneInfoManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UnityClient/Assets/Scripts/SceneInfo/SceneInfoManager.cs b/UnityClient/Assets/Scripts/SceneInfo/SceneInfoManager.cs index f8b23adf..905ba4c7 100644 --- a/UnityClient/Assets/Scripts/SceneInfo/SceneInfoManager.cs +++ b/UnityClient/Assets/Scripts/SceneInfo/SceneInfoManager.cs @@ -19,12 +19,14 @@ void Update() Vector3 target = cameraController.GetCameraTarget(); Vector3 angles = cameraController.GetAngles(); float zoom = cameraController.GetZoom(); + + // Note angles y/x flipped so that yaw/pitch/spin is correct cameraText.text = string.Format("camera target ({0},{1},{2}); camera rotation ({3},{4},{5})\nzoom: {6}", Mathf.Round(target.x*100)/100, Mathf.Round(target.y*100)/100, Mathf.Round(target.z*100)/100, - Mathf.RoundToInt(angles.x), Mathf.RoundToInt(angles.y), + Mathf.RoundToInt(angles.x), Mathf.RoundToInt(angles.z), zoom); From 1cfaabab4b1656ab1a75d54c5b4253f5edba3895 Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Thu, 24 Aug 2023 11:33:21 -0700 Subject: [PATCH 4/7] chore: increment version# --- UnityClient/ProjectSettings/ProjectSettings.asset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UnityClient/ProjectSettings/ProjectSettings.asset b/UnityClient/ProjectSettings/ProjectSettings.asset index f8e10887..f1d834a4 100644 --- a/UnityClient/ProjectSettings/ProjectSettings.asset +++ b/UnityClient/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.4.5 + bundleVersion: 0.4.6 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -155,7 +155,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.Daniel-Birman---UW.Urchin + Standalone: com.Virtual-Brain-Lab.Urchin buildNumber: Standalone: 0 iPhone: 0 From 3657e6a59edfa940b7f0e86b248f241cefa72fe1 Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Tue, 5 Sep 2023 16:21:45 -0700 Subject: [PATCH 5/7] Update to 0.4.8, adding unit tests --- .github/workflows/test.yml | 42 ++++++++++++++++++++++++++++++++ API/oursin.egg-info/PKG-INFO | 2 +- API/oursin.egg-info/SOURCES.txt | 1 + API/pyproject.toml | 2 +- API/requirements.txt | Bin 1080 -> 0 bytes API/tests/__init__.py | 0 API/tests/test_urchin_core.py | 20 +++++++++++++++ 7 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/test.yml delete mode 100644 API/requirements.txt create mode 100644 API/tests/__init__.py create mode 100644 API/tests/test_urchin_core.py diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..036afe10 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,42 @@ +# 1. Name of workflow +name: Unit Tests + +# 2. When to run workflow +on: + pull_request: + push: + branches: + - develop + merge_group: + +# 3. Jobs to run (in parallel) +jobs: + + # 3.1. Job name (internal) + test: + + # 3.2. Job name (external) + name: Unit Tests + + # 3.3. Runner OS (can be Windows, macOS, or Linux) + runs-on: ubuntu-latest + + # 3.4. Sequential steps in job + steps: + + # 3.4.1. Checkout code + - name: 🛎 Checkout + uses: actions/checkout@v3 + + # 3.4.2. Install and setup Python + - name: 🐍 Setup Python + uses: actions/setup-python@v4 + with: + python-version-file: API/pyproject.toml + # cache: 'pip' + + # Install dependencies (if any). They will be cached with saved for next time with the cache command above + + # 3.4.3. Run tests (execute arbitrary commands in shell) + - name: 🏃Run tests + run: python -m unittest discover -s API \ No newline at end of file diff --git a/API/oursin.egg-info/PKG-INFO b/API/oursin.egg-info/PKG-INFO index e6a39173..beee1fb6 100644 --- a/API/oursin.egg-info/PKG-INFO +++ b/API/oursin.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oursin -Version: 0.4.7 +Version: 0.4.8 Summary: Urchin - Universal Renderer Creating Helpful Images for Neuroscience Python API Author-email: Daniel Birman License: GNU GENERAL PUBLIC LICENSE diff --git a/API/oursin.egg-info/SOURCES.txt b/API/oursin.egg-info/SOURCES.txt index f515c593..b7f48ddc 100644 --- a/API/oursin.egg-info/SOURCES.txt +++ b/API/oursin.egg-info/SOURCES.txt @@ -5,6 +5,7 @@ setup.cfg oursin/__init__.py oursin/camera.py oursin/client.py +oursin/fov.py oursin/lines.py oursin/neurons.py oursin/primitives.py diff --git a/API/pyproject.toml b/API/pyproject.toml index e34de1db..0493c1fb 100644 --- a/API/pyproject.toml +++ b/API/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [project] name = "oursin" -version = "0.4.7" +version = "0.4.9" authors = [ { name="Daniel Birman", email="danbirman@gmail.com" }, ] diff --git a/API/requirements.txt b/API/requirements.txt deleted file mode 100644 index e5d8be9beb10e5150ca7992a36799176a7adeb5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1080 zcmZvb>rTQ@5QO))iH}lZi=zDS9ee}RRzRdTxdip$)o*rt1dVA9q1~C;*~|I*tgNwx zl~&uc-Sf$Miivi`Fo=wg<7~h+PmZc!bmMtw}}NCCDB4y=B%} z&s)p42HuCOh&^?l@&~IYE@bIgA>`niGjqff(He(x(4d|Wxy?Pk#&-uhX+ z_>|Sh5v%H8r&mWAXl4_5sp%Qs`}`D zrc{+VLkf!#t%^_GP_>$t=9YQw9dD{!C+2+%Bc`FRuXImZ=Y9*jb5+&+7n6aE9#-%g z-lTfE0kIWZHoqpz9Hp5f!egpR8<1{R?i--_#~$v8y*Wpn$j6%}FUs7KGuF#KPQQHTxfhW58d%EAdH=P>* diff --git a/API/tests/__init__.py b/API/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/API/tests/test_urchin_core.py b/API/tests/test_urchin_core.py new file mode 100644 index 00000000..ed95da27 --- /dev/null +++ b/API/tests/test_urchin_core.py @@ -0,0 +1,20 @@ +from unittest import TestCase +from unittest.mock import Mock + +import oursin as urchin + + +class TestClass(TestCase): + """Test demo class functions""" + + # def setUp(self): + # """Setup class and mock callback function""" + # self.demo = DemoClass('Demo') + # self.mock = Mock() + + def test_sanitize_vec3(self): + self.assertEqual(urchin.utils.sanitize_vector3([1,2,3]), [1,2,3]) + + self.assertEqual(urchin.utils.sanitize_vector3((1,2,3)), [1,2,3]) + + # self.assertRaises(Exception, urchin.utils.sanitize_vector3((1,2))) \ No newline at end of file From 0157ea2421f43be45afb6dd096dc6c56c0bd451d Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Tue, 5 Sep 2023 16:32:49 -0700 Subject: [PATCH 6/7] Testing forcing the package install --- .github/workflows/test.yml | 2 ++ API/tests/test_urchin_core.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 036afe10..f2275789 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,6 +35,8 @@ jobs: python-version-file: API/pyproject.toml # cache: 'pip' + - name: Install + run: pip install API/. # Install dependencies (if any). They will be cached with saved for next time with the cache command above # 3.4.3. Run tests (execute arbitrary commands in shell) diff --git a/API/tests/test_urchin_core.py b/API/tests/test_urchin_core.py index ed95da27..8a01c276 100644 --- a/API/tests/test_urchin_core.py +++ b/API/tests/test_urchin_core.py @@ -17,4 +17,4 @@ def test_sanitize_vec3(self): self.assertEqual(urchin.utils.sanitize_vector3((1,2,3)), [1,2,3]) - # self.assertRaises(Exception, urchin.utils.sanitize_vector3((1,2))) \ No newline at end of file + self.assertRaises(Exception, urchin.utils.sanitize_vector3, (1,2)) \ No newline at end of file From f6b82688f81c3b8e9fddbac8b3ba115ea4a5e6cf Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Tue, 5 Sep 2023 16:38:49 -0700 Subject: [PATCH 7/7] minor --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f2275789..4ac6b514 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,10 +34,11 @@ jobs: with: python-version-file: API/pyproject.toml # cache: 'pip' + + # Install dependencies (if any). They will be cached with saved for next time with the cache command above - name: Install run: pip install API/. - # Install dependencies (if any). They will be cached with saved for next time with the cache command above # 3.4.3. Run tests (execute arbitrary commands in shell) - name: 🏃Run tests