diff --git a/Assets/Plugins/Mac.meta b/Assets/Plugins/Mac.meta new file mode 100644 index 0000000..32ebf66 --- /dev/null +++ b/Assets/Plugins/Mac.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: W3JN4Cj8AnjAT4EnoFgVw0sGIaewWtDOmemEk0j3KPLe8qKzB87y+4o= +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib b/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib new file mode 100755 index 0000000..44b5642 Binary files /dev/null and b/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib differ diff --git a/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta b/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta new file mode 100644 index 0000000..34b6724 --- /dev/null +++ b/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta @@ -0,0 +1,73 @@ +fileFormatVersion: 2 +guid: XS4X4HupWi2gadg8zmdPT5zNR10R7w++TxzTA0SIyDZ5yDSx5FMZFyA= +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 1 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: ARM64 + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/iOS/libGfxPluginNativeRender.a b/Assets/Plugins/iOS/libGfxPluginNativeRender.a index e359f6a..ce0652a 100644 Binary files a/Assets/Plugins/iOS/libGfxPluginNativeRender.a and b/Assets/Plugins/iOS/libGfxPluginNativeRender.a differ diff --git a/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta b/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta index df5f9c6..546715d 100644 --- a/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta +++ b/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta @@ -32,9 +32,9 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU + CPU: ARM64 DefaultValueInitialized: true - OS: AnyOS + OS: OSX - first: Standalone: Linux64 second: diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index 5224959..4a51dd0 100644 --- a/Assets/Settings/Mobile/Mobile_High.asset +++ b/Assets/Settings/Mobile/Mobile_High.asset @@ -28,7 +28,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 1 - m_RenderScale: 0.6666667 + m_RenderScale: 0.8333333 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 4 + superResolution: 9 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index c833363..6c3cdba 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -81,7 +81,8 @@ MonoBehaviour: - {fileID: 1524480044783497712} - {fileID: 6334271670068977784} - {fileID: 1342351342872651138} - m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222f0f17d10860a28157820480586dae7578265b12b6ffda012 + - {fileID: 6446168921458335383} + m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222f0f17d10860a28157820480586dae7578265b12b6ffda01297deaf157b647559 m_UseNativeRenderPass: 1 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: @@ -176,7 +177,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a6b8ba513f1b1fe499924f362fdde22d, type: 3} m_Name: GSR m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 quality: 3 v1settings: EnableEdgeDirection: 1 @@ -245,3 +246,17 @@ MonoBehaviour: m_Name: FSR m_EditorClassIdentifier: m_Active: 0 +--- !u!114 &6446168921458335383 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 74dc463bb029b6b41a2fe66db031c2ae, type: 3} + m_Name: MetalFxSpatialUpScale + m_EditorClassIdentifier: + m_Active: 1 + quality: 2 diff --git a/NativeRenderPlugin/xmake.lua b/NativeRenderPlugin/xmake.lua index 2367684..a6d97aa 100644 --- a/NativeRenderPlugin/xmake.lua +++ b/NativeRenderPlugin/xmake.lua @@ -73,15 +73,19 @@ target("GfxPluginNativeRender") end end if has_config("use_metal") then - set_kind("static") add_defines("SUPPORT_METAL=1") + add_ldflags("-fPIE", "-fPIC") if is_plat("iphoneos") then + set_kind("static") add_defines("TARGET_OS_IOS=1") else + set_kind("shared") + add_cxflags("-shared") add_defines("UNITY_OSX=1") end add_files("./*.mm") - add_frameworks("MetalFX.framework") + add_frameworks("MetalKit") + add_frameworks("MetalFX") end if has_config("use_gles") then set_kind("shared") diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs index 3ec244b..f515fba 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs @@ -496,7 +496,10 @@ namespace UnityEngine.Rendering.Universal } var asset = UniversalRenderPipeline.asset; // SuperResolution - if (asset.SuperResolution == ESuperResolution.GSR1 || asset.SuperResolution == ESuperResolution.GSR2 || asset.SuperResolution == ESuperResolution.XESS13) + if (asset.SuperResolution == ESuperResolution.GSR1 + || asset.SuperResolution == ESuperResolution.GSR2 + || asset.SuperResolution == ESuperResolution.METAL_FX_SPATIAL_SR + || asset.SuperResolution == ESuperResolution.XESS13) { ref var colorDescriptor = ref cameraData.cameraTargetDescriptor; colorDescriptor.width = cameraData.camera.pixelWidth; diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs index add87df..aabc709 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs @@ -7,28 +7,28 @@ namespace X.Rendering.Feature { public static class RenderingPlugin { -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && (!UNITY_EDITOR || UNITY_EDITOR_OSX) +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] #endif public static extern void SetTimeFromUnity(float t); -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && (!UNITY_EDITOR || UNITY_EDITOR_OSX) +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] #endif public static extern IntPtr GetRenderEventAndDataFunc(); -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && (!UNITY_EDITOR || UNITY_EDITOR_OSX) +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] #endif private static extern bool GetFeatureSupport(int feature); -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && (!UNITY_EDITOR || UNITY_EDITOR_OSX) +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST || UNITY_STANDALONE_OSX ) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs index 964512d..660bf90 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs @@ -44,7 +44,6 @@ namespace X.Rendering.Feature ptr->src = source.rt.GetNativeTexturePtr(); ptr->dst = destination.rt.GetNativeTexturePtr(); cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.UpdateXESS1Config, dataPtr); - } public float GetRenderScale() diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 177d065..6c6d2c7 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,41 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 311 - y: 278 - width: 1551 - height: 1099 - m_ShowMode: 0 - m_Title: Project Settings - m_RootView: {fileID: 5} - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - 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: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 2818 - y: 201 - width: 1934 - height: 965 + x: 392 + y: 65 + width: 1328 + height: 954 m_ShowMode: 0 m_Title: Frame Debugger - m_RootView: {fileID: 7} + m_RootView: {fileID: 4} m_MinSize: {x: 1000, y: 521} m_MaxSize: {x: 4000, y: 4021} m_Maximized: 0 ---- !u!114 &3 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,67 +39,16 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 2560 - height: 1349 + y: 53 + width: 1920 + height: 954 m_ShowMode: 4 m_Title: Console - m_RootView: {fileID: 16} + m_RootView: {fileID: 13} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !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: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectSettingsWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1551 - height: 1099 - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 20} - m_Panes: - - {fileID: 20} - m_Selected: 0 - m_LastSelected: 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: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1551 - height: 1099 - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 9761 - draggingID: 0 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -140,16 +65,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1934 - height: 965 + width: 1328 + height: 954 m_MinSize: {x: 1000, y: 521} m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -162,19 +87,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1934 - height: 965 + width: 1328 + height: 954 m_MinSize: {x: 1000, y: 521} m_MaxSize: {x: 4000, y: 4021} vertical: 0 - controlID: 3485 + controlID: 2635 draggingID: 0 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -189,19 +114,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 391 + x: 293 y: 0 - width: 1472 - height: 770 + width: 1104 + height: 536 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 26} + m_ActualView: {fileID: 22} m_Panes: + - {fileID: 18} - {fileID: 22} - - {fileID: 26} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -214,20 +139,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 8} + - {fileID: 11} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1863 - height: 770 + width: 1397 + height: 536 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 41 + controlID: 57 draggingID: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -242,18 +167,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1245 + x: 809 y: 0 - width: 618 - height: 529 + width: 588 + height: 368 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 27} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 27} + - {fileID: 23} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,20 +191,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 10} + - {fileID: 12} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 - y: 770 - width: 1863 - height: 529 + y: 536 + width: 1397 + height: 368 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 127 + controlID: 160 draggingID: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,20 +217,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 19} - - {fileID: 13} + - {fileID: 16} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 2560 - height: 1299 + width: 1920 + height: 904 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 163 + controlID: 55 draggingID: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -320,18 +245,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1863 + x: 1397 y: 0 - width: 697 - height: 1299 + width: 523 + height: 904 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 24} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -348,16 +273,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 391 - height: 770 + width: 293 + height: 536 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 25} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 25} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -374,16 +299,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1245 - height: 529 + width: 809 + height: 368 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 23} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -396,22 +321,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 17} - - {fileID: 12} - - {fileID: 18} + - {fileID: 14} + - {fileID: 9} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 1349 + width: 1920 + height: 954 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 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -428,12 +353,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -449,12 +374,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1329 - width: 2560 + y: 934 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &19 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -467,81 +392,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 11} + - {fileID: 6} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1863 - height: 1299 + width: 1397 + height: 904 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 126 + controlID: 56 draggingID: 0 ---- !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: 13854, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Project Settings - m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 311 - y: 278 - width: 1551 - height: 1078 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 1080} - m_Scope: 1 - m_SplitterFlex: 0.2 - m_SearchText: input - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4dcf9b58 - m_LastClickedID: 1486606157 - m_ExpandedIDs: 53336be2000000007f0eae07 - 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: input ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -561,10 +425,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2818 - y: 201 - width: 1934 - height: 944 + x: 392 + y: 65 + width: 1328 + height: 933 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -598,7 +462,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1035,7 +899,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1056,9 +920,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 843 - width: 1244 - height: 508 + y: 619 + width: 808 + height: 347 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1080,7 +944,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes/Cockpit + - Assets/Settings/Mobile m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1088,16 +952,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scenes/Cockpit + - Assets/Settings/Mobile m_LastFoldersGridSize: 16 - m_LastProjectPath: G:\TJURP + m_LastProjectPath: /Users/jkstudio/Desktop/repo/unity_native_render m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 136} - m_SelectedIDs: 3e0f0100 - m_LastClickedID: 69438 - m_ExpandedIDs: 00000000260f0100280f01002a0f01002c0f01002e0f0100300f0100320f0100340f0100360f0100380f01003a0f01003c0f01003e0f0100400f0100420f0100440f0100460f01007e0f0100de18010000ca9a3bffffff7f + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 0a080000 + m_LastClickedID: 2058 + m_ExpandedIDs: 00000000360600008e0600009a060000ce06000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1113,7 +977,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 15} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1125,7 +989,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000260f0100280f01002a0f01002c0f01002e0f0100300f0100320f0100340f0100360f0100380f01003a0f01003c0f01003e0f0100400f0100420f0100440f0100460f0100 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1169,7 +1033,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 15} + m_ClientGUIView: {fileID: 12} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1181,7 +1045,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1201,10 +1065,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1863 - y: 73 - width: 696 - height: 1278 + x: 1397 + y: 83 + width: 522 + height: 883 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1228,7 +1092,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &25 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1249,9 +1113,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 390 - height: 749 + y: 83 + width: 292 + height: 515 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1265,9 +1129,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3633fdff + m_SelectedIDs: 12000000 m_LastClickedID: 0 - m_ExpandedIDs: ce64fdffd064fdff9abdfdff84ccfdff02b5feff9abdfeffe4bdfeff48c1fefff4ffffff7a0a01004c0b01004c240100d4240100 + m_ExpandedIDs: 8221fdff5630fdfffe93fdff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1283,7 +1147,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 11} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1291,7 +1155,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &26 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1311,10 +1175,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 391 - y: 73 - width: 1470 - height: 749 + x: 293 + y: 83 + width: 1102 + height: 515 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1331,7 +1195,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2560, y: 1440} + m_TargetSize: {x: 1102, y: 494} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1346,10 +1210,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1280 - m_HBaseRangeMax: 1280 - m_VBaseRangeMin: -720 - m_VBaseRangeMax: 720 + m_HBaseRangeMin: -551 + m_HBaseRangeMax: 551 + m_VBaseRangeMin: -247 + m_VBaseRangeMax: 247 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1367,29 +1231,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1470 - height: 728 - m_Scale: {x: 0.50555557, y: 0.50555557} - m_Translation: {x: 735, y: 364} + width: 1102 + height: 494 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 551, y: 247} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1453.8461 - y: -720 - width: 2907.6921 - height: 1440 + x: -551 + y: -247 + width: 1102 + height: 494 m_MinimalGUI: 1 - m_defaultScale: 0.50555557 - m_LastWindowPixelSize: {x: 1470, y: 749} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1102, y: 515} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &27 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1409,10 +1273,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1245 - y: 843 - width: 616 - height: 508 + x: 809 + y: 619 + width: 586 + height: 347 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0