From 69423ceca2379a3ec0fd6f0a455083e29cc17502 Mon Sep 17 00:00:00 2001 From: connan Date: Tue, 17 Dec 2024 21:39:46 +0800 Subject: [PATCH] sync --- Assets/Plugins/Mac.meta | 8 + .../Mac/libGfxPluginNativeRender.dylib | Bin 0 -> 56576 bytes .../Mac/libGfxPluginNativeRender.dylib.meta | 73 +++ Assets/Plugins/iOS/libGfxPluginNativeRender.a | Bin 24664 -> 24688 bytes .../iOS/libGfxPluginNativeRender.a.meta | 4 +- Assets/Settings/Mobile/Mobile_High.asset | 4 +- .../Mobile/Mobile_High_Renderer.asset | 19 +- NativeRenderPlugin/xmake.lua | 8 +- .../Runtime/Passes/PostProcessPass.cs | 5 +- .../NatvieHelper/RenderingPlugin.cs | 8 +- .../SuperRendering/SR/Scripts/MetalFx.cs | 1 - UserSettings/Layouts/default-2022.dwlt | 418 ++++++------------ 12 files changed, 257 insertions(+), 291 deletions(-) create mode 100644 Assets/Plugins/Mac.meta create mode 100755 Assets/Plugins/Mac/libGfxPluginNativeRender.dylib create mode 100644 Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta 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 0000000000000000000000000000000000000000..44b5642692354eda071207d4057760437e34014f GIT binary patch literal 56576 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 delta 5593 zcmaJ_dvH|M9X>a^fkg6PNnrD27eTXztl1^61%g>#8e&8ce1K6x)fuopf@La988;Zl zrs^Mw#~Go6b^&J^6-SuGPR4QCrC{B5w7yU?Bb_ExYqV733~e{9kAA;%zbngDd*Gh$ ze!t)M`<=%<=bpQnNLnLFYoOZK5Q&5$et%Oa?DzW@gi!gzp-^*Uqu<}q6mA}D^~Zi~ zDK%88)Z;E2_mQtxHot>>5pf&sW#j|oFA)Dp{3G#h=G{oVidbi3OwFL-RF2)?bHoRU zPt$)h`7!b)@?v5Q8~l_V12qGC$*t7*B}%=IIKjUWrx<%oDK7=J#Jh>l5>GPVEO}Y3 zov4|(9+-|OwKdPiM~L%@&l3xXpHH=QBf?_{e2azz@hb{1%eRFO(Y}?qn)Xie?c_fv z&ZPY~`G2O^dB%vJ(q3|rQZecIt8}b|LHP6Jn)pN7A0oEWKApIa_K!Iehsoa|4%7ZA zc@McYO-(lqc5uXH)095YQmb#js9r~1Pw1$7R^nsV2kt5BLYwek58UY04{Y!zCi2|5 z6?4P&4b8HoS;8$1jg1X0O`(RwjH2hPTyv}M^wcFjE54sJai{0dc~2;@tmH?Q&j`PJ zmozpsHS1HQU7k3GDkXr`CMB+y&TRAalZjPsQ+jY_OSxkmH%g_BVBug5sZl*Pvt>q) z+@eggLG8`eyNhP)H*5Umy>$7BLzpMIP3qmVS_=Cydvn2t3zUi^UYQlh(a)5X@45pva0makk^{fgOxtZt;5wmtIX7OdM)l-^)}R75`)!$wqlo~Q$^S+P6-Id z7@W>uEF6tH-K`Ri%jsh+w8a_m9~s`OdYLcQb&}R!nt4d7*VycpjB>M;N9k{;-bPoChiGuq_ku5BM|r4m~*MHods8A`!ZHflGI|3-l|l z8M$W1={dK~(hpCWu3K)Mtq)vMuUC7#|987Y7KF6>(%U`l*w9jTu-5^-^U}7N^1g7a z;)r8K->6@|w808!tL9pd<6mRTRKMO_)8^@B6c(Q;Bl>7fTlE%NlN`$^TExiIO@&ye z`iuG!?GO0#Q(!(=hZCy;HLeOIE*(0tX*e%eZ5wx~$-K+d7voR-q9Ty5AD+Lcd@oym%|&xRfkLa>r&-CNPHKr+i?xyl9hQH*U3a~aGJ}) z#MXOr+TFUN-j~PD-=xE^mF4Q%`q}y2*xpiF#c1u<&xCyWDcaigw)(Od##pITuph=M z;2NOt50P!EQk|nVF6k%VL*7Mx6ZttzjOZt9Trxs_iabgFGPxYNqW8pU*iJ)F;%DI( za>4;V-5+D_8+d+6lZ*BA~oyRBk0j*K0B2Y+{M*2s{JIFs5Jx0>4 zf8XfaEbk#HW1_<4^yO_vIemFexI{6_?}TIioOQDhSQzl`9y#Nse2J^r z>cxwFAFR#;gVgNN{fSSST3xyFmDQkY7d|i}T`WOZZWxY~bg_PE;T4|!IB=zi8QoAv zbpE22Z>^oir__4Ac2QgPIJFbB#<7AW+mV?{RpX>6(V-f@X9PP(iq{4;pua%u1g(Br zhl=djy|d7+iS1tOFQ3knhtsc8R1N8Ui(5Q6f=!vh9B=Be#ciJ2te7)8+}c(hp*6`l zoM5ISXs_1UgN3S0sT+{3yBgah@p@|_=Zb@Uv(txMv(rO;o6_SgYBHdDuS->`W=w2p z+_gzI(&O>I>U7+7tGORIRZ>@ZUMEMP>5$!73cVD1&kHZmIUOvauH<`kPQ%6275|TJ zB}cL`eX;6&`@%*xrVsXY*)uWCPVfn4ZG2jE(q9;z3>2zK(VLlkbZPn42a6!?9hqI;cK(_Rav|(i^p%X-m=(_2z_f|S(K2sLo)>y^P^JRC$?UnY z%h12WF1CYM51D#d9}fSv#pQNS#-`e%9Gi-@^cVG(=;VG@{KR<@KV;vdYcDOUT+L7? zrGz+@G+c1CY=kZnE|`0^sAp-^UODWuEC^h(|d7Om%ew&0=>^$tm{@zPi$X) zo2#i=;TPKaykWQM@+-9~FXdKyEF2PXD>C9%XRU#paku)?C7&h9+!ZkGnR3L^o~z#1 z14X&Ir(!xV@3HnBICploe_k%Xs!&##8r5OGhLqmD%4gN-1E{<7an#%O80vm=A2;{M zOr0|IX;V*_+O3aw_^eVrhB{#GBYMu&CJ!uk8Otu?9WeFNrXDu-l(ss3);T=~wO=nq zy-ROKyJuLsIcFgZXw zaVRVSt^nc{8Y}~r0l&m+A4@LyAyD)q#FNBh#7Bv}#O*f5f?H_l1maB-Yy~a{&I7In z7699Ua&k)pcxnda#J&zZ3S0@S17e>9%YfKFK?S@LC@1(Tpq${sQ^0G0M}RBvNga&i z246YBe&AZ*4qykc+X(Op0lXSKLVp!-DR>zWZFH8}xa1t(l{lD!6F`_c&)T@;G!P3f zc#J5Yv+KZn1rtxMekUjPFeX3qm&HB8;dV~Jfh-=!krsRivhC#`y$ZX&S;Ta9A5spTkqpw3aR*G}zEf9{&IqtA>%%_91 zSAK=g$Vb9i#K3Jb#wK_UbF=& zMgLFf50ICWpQe5@c^Ccd96&$)d(jE$P$~U~jXsuCchT?$mZu1|GvGJ_2I%jie}evU zjyNU5LwSP@%Ab6sOyGgbkGfstDj%U{4U{qwT?c^Br3sfAgBGg%2v zWbr9k{I^-ddML}kCW{}sK#!e!C`&MUfdIcAvi$esxnz#;cosjMHJ~T6{EuXE{rU|l e{fB~!_+z}qN|bN-yIVhYV@=}gTkgxj8u~ABN81Dd 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