vrr 无法集成
This commit is contained in:
parent
c2e1fd6197
commit
da375017e1
Binary file not shown.
@ -28,7 +28,7 @@ MonoBehaviour:
|
||||
m_SupportsHDR: 1
|
||||
m_HDRColorBufferPrecision: 0
|
||||
m_MSAA: 1
|
||||
m_RenderScale: 0.58823526
|
||||
m_RenderScale: 1
|
||||
m_UpscalingFilter: 0
|
||||
m_FsrOverrideSharpness: 1
|
||||
m_FsrSharpness: 1
|
||||
@ -114,5 +114,5 @@ MonoBehaviour:
|
||||
m_PrefilterNativeRenderPass: 1
|
||||
m_ShaderVariantLogLevel: 0
|
||||
m_ShadowCascades: 0
|
||||
superResolution: 9
|
||||
vrsRate: 0
|
||||
superResolution: 0
|
||||
vrsRate: 4
|
||||
|
||||
@ -83,7 +83,7 @@ MonoBehaviour:
|
||||
- {fileID: 1342351342872651138}
|
||||
- {fileID: 6446168921458335383}
|
||||
m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222f0f17d10860a28157820480586dae7578265b12b6ffda01297deaf157b647559
|
||||
m_UseNativeRenderPass: 1
|
||||
m_UseNativeRenderPass: 0
|
||||
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
|
||||
shaders:
|
||||
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
|
||||
@ -258,5 +258,5 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 74dc463bb029b6b41a2fe66db031c2ae, type: 3}
|
||||
m_Name: MetalFxSpatialUpScale
|
||||
m_EditorClassIdentifier:
|
||||
m_Active: 1
|
||||
m_Active: 0
|
||||
quality: 4
|
||||
|
||||
@ -12,6 +12,7 @@ enum GraphicsFeature
|
||||
VRS_PRIMITIVE,
|
||||
VRS_ATTACHMENT,
|
||||
HW_SPATIAL_SR,
|
||||
METAL_VRR,
|
||||
HW_AISR,
|
||||
HW_ADAPTIVE_VRS,
|
||||
HW_FG_INTERPOLATE,
|
||||
@ -78,7 +79,7 @@ public:
|
||||
virtual unsigned int getBackbufferWidth() { return 0; }
|
||||
virtual unsigned int getBackbufferHeight() { return 0; }
|
||||
|
||||
virtual void enableVRS(int vrsEnum) {}
|
||||
virtual void enableVRS(void* data) {}
|
||||
virtual void disableVRS() {}
|
||||
|
||||
virtual void enableFGExtrapolation(void* data) {}
|
||||
|
||||
@ -71,6 +71,7 @@ void RenderAPI_D3D11::processDeviceEvent(UnityGfxDeviceEventType type, IUnityInt
|
||||
{
|
||||
IUnityGraphicsD3D11* d3d = interfaces->Get<IUnityGraphicsD3D11>();
|
||||
m_Device = d3d->GetDevice();
|
||||
initSupportFeature();
|
||||
break;
|
||||
}
|
||||
case kUnityGfxDeviceEventShutdown:
|
||||
|
||||
@ -94,7 +94,7 @@ public:
|
||||
virtual unsigned int getBackbufferHeight() override;
|
||||
|
||||
|
||||
virtual void enableVRS(int vrsEnum) override;
|
||||
virtual void enableVRS(void* data) override;
|
||||
virtual void disableVRS() override;
|
||||
|
||||
virtual void initSupportFeature() override;
|
||||
@ -207,15 +207,16 @@ static D3D12_SHADING_RATE vrs_argment_size_table[] = {
|
||||
D3D12_SHADING_RATE_4X4
|
||||
};
|
||||
|
||||
void RenderAPI_D3D12::enableVRS(int vrsEnum)
|
||||
void RenderAPI_D3D12::enableVRS(void* data)
|
||||
{
|
||||
int vrs_enum = *(int*) data;
|
||||
UnityGraphicsD3D12RecordingState recordingState;
|
||||
if (!s_d3d12->CommandRecordingState(&recordingState))
|
||||
{
|
||||
return;
|
||||
}
|
||||
ID3D12GraphicsCommandList* cmdLst = recordingState.commandList;
|
||||
reinterpret_cast<ID3D12GraphicsCommandList5*>(cmdLst)->RSSetShadingRate(vrs_argment_size_table[vrsEnum], nullptr);
|
||||
reinterpret_cast<ID3D12GraphicsCommandList5*>(cmdLst)->RSSetShadingRate(vrs_argment_size_table[vrs_enum], nullptr);
|
||||
}
|
||||
|
||||
void RenderAPI_D3D12::disableVRS()
|
||||
|
||||
@ -27,7 +27,11 @@ public:
|
||||
|
||||
virtual void initSupportFeature();
|
||||
|
||||
virtual void spatialUpScale(void*data);
|
||||
virtual void spatialUpScale(void*data) override;
|
||||
|
||||
virtual void enableVRS(void* data) override;
|
||||
virtual void disableVRS() override;
|
||||
|
||||
private:
|
||||
id <MTLFXSpatialScaler> mfx_spatial_scaler;
|
||||
id <MTLCommandQueue> commandQueue;
|
||||
@ -50,6 +54,7 @@ void RenderAPI_Metal::processDeviceEvent(UnityGfxDeviceEventType type, IUnityInt
|
||||
if (type == kUnityGfxDeviceEventInitialize)
|
||||
{
|
||||
metal_graphics = interfaces->Get<IUnityGraphicsMetal>();
|
||||
initSupportFeature();
|
||||
}
|
||||
else if (type == kUnityGfxDeviceEventShutdown)
|
||||
{
|
||||
@ -62,6 +67,11 @@ void RenderAPI_Metal::initSupportFeature()
|
||||
{
|
||||
support_features[GraphicsFeature::METAL_FX_SPATIAL_SR] = true;
|
||||
support_features[GraphicsFeature::METAL_FX_TEMPORAL_SR] = true;
|
||||
id<MTLDevice> device = metal_graphics->MetalDevice();
|
||||
if(device)
|
||||
{
|
||||
support_features[GraphicsFeature::METAL_VRR] = [device supportsRasterizationRateMapWithLayerCount:1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,7 +90,7 @@ void RenderAPI_Metal::spatialUpScale(void* data)
|
||||
id<MTLTexture> srctex = (__bridge id<MTLTexture>)data_pack->src;
|
||||
id<MTLTexture> dsttex = (__bridge id<MTLTexture>)data_pack->dst;
|
||||
|
||||
id<MTLDevice> _device = metal_graphics->MetalDevice();
|
||||
id<MTLDevice> device = metal_graphics->MetalDevice();
|
||||
id<MTLCommandBuffer> cmd = (id<MTLCommandBuffer>)metal_graphics->CurrentCommandBuffer();
|
||||
// metal_graphics->EndCurrentCommandEncoder();
|
||||
cmd.label = @"Upscale Command Buffer";
|
||||
@ -97,8 +107,8 @@ void RenderAPI_Metal::spatialUpScale(void* data)
|
||||
desc.outputTextureFormat = [dsttex pixelFormat];
|
||||
desc.colorProcessingMode = MTLFXSpatialScalerColorProcessingModeLinear;
|
||||
|
||||
mfx_spatial_scaler = [desc newSpatialScalerWithDevice:_device];
|
||||
commandQueue = [_device newCommandQueue];
|
||||
mfx_spatial_scaler = [desc newSpatialScalerWithDevice:device];
|
||||
commandQueue = [device newCommandQueue];
|
||||
}
|
||||
|
||||
if (mfx_spatial_scaler == nil || commandQueue == nil)
|
||||
@ -123,5 +133,42 @@ void RenderAPI_Metal::spatialUpScale(void* data)
|
||||
|
||||
}
|
||||
}
|
||||
void RenderAPI_Metal::enableVRS(void* data)
|
||||
{
|
||||
struct DataPack
|
||||
{
|
||||
float width;
|
||||
float height;
|
||||
float ratex;
|
||||
float ratey;
|
||||
bool cfgChange;
|
||||
};
|
||||
|
||||
id<MTLDevice> device = metal_graphics->MetalDevice();
|
||||
DataPack* data_pack = static_cast<DataPack*>(data);
|
||||
|
||||
MTLRasterizationRateMapDescriptor *descriptor = [[MTLRasterizationRateMapDescriptor alloc] init];
|
||||
descriptor.label = @"raster rate map";
|
||||
descriptor.screenSize = MTLSizeMake(data_pack->width, data_pack->height, 1);
|
||||
MTLSize zone_counts = MTLSizeMake(8, 4, 1);
|
||||
MTLRasterizationRateLayerDescriptor *layer_descriptor = [[MTLRasterizationRateLayerDescriptor alloc] initWithSampleCount:zone_counts];
|
||||
for (int row = 0; row < zone_counts.height; row++)
|
||||
{
|
||||
layer_descriptor.verticalSampleStorage[row] = data_pack->ratey;
|
||||
}
|
||||
for (int column = 0; column < zone_counts.width; column++)
|
||||
{
|
||||
layer_descriptor.horizontalSampleStorage[column] = data_pack->ratex;
|
||||
}
|
||||
|
||||
[descriptor setLayer:layer_descriptor atIndex:0];
|
||||
id<MTLRasterizationRateMap> rate_map = [device newRasterizationRateMapWithDescriptor: descriptor];
|
||||
MTLRenderPassDescriptor* current_pass_descriptor= metal_graphics->CurrentRenderPassDescriptor();
|
||||
current_pass_descriptor.rasterizationRateMap = rate_map;
|
||||
}
|
||||
|
||||
void RenderAPI_Metal::disableVRS()
|
||||
{
|
||||
|
||||
}
|
||||
#endif // #if SUPPORT_METAL
|
||||
|
||||
@ -65,7 +65,7 @@ public:
|
||||
|
||||
virtual bool getUsesReverseZ() override { return false; }
|
||||
|
||||
virtual void enableVRS(int vrsEnum) override;
|
||||
virtual void enableVRS(void* data) override;
|
||||
virtual void disableVRS() override;
|
||||
|
||||
virtual void enableFGExtrapolation(void* data) override;
|
||||
@ -229,8 +229,9 @@ void RenderAPI_OpenGLCoreES::initSupportFeature()
|
||||
|
||||
}
|
||||
|
||||
void RenderAPI_OpenGLCoreES::enableVRS(int vrs_enum)
|
||||
void RenderAPI_OpenGLCoreES::enableVRS(void* data)
|
||||
{
|
||||
int vrs_enum = *(int*) data;
|
||||
gl_shadingrate_fn(vrs_argment_size_table[vrs_enum]);
|
||||
}
|
||||
|
||||
|
||||
@ -270,7 +270,7 @@ public:
|
||||
virtual void processDeviceEvent(UnityGfxDeviceEventType type, IUnityInterfaces *interfaces) override;
|
||||
virtual bool getUsesReverseZ() override { return true; }
|
||||
|
||||
virtual void enableVRS(int vrsEnum) override;
|
||||
virtual void enableVRS(void* data) override;
|
||||
virtual void disableVRS() override;
|
||||
|
||||
virtual void enableFGExtrapolation(void* data) override;
|
||||
@ -510,10 +510,11 @@ void RenderAPI_Vulkan::initSupportFeature()
|
||||
// unityLog(buf);
|
||||
}
|
||||
|
||||
void RenderAPI_Vulkan::enableVRS(int vrsEnum)
|
||||
void RenderAPI_Vulkan::enableVRS(void* data)
|
||||
{
|
||||
curVrsIndex = vrsEnum;
|
||||
vrs_fragment_size = vrs_argment_size_table[vrsEnum];
|
||||
int vrs_enum = *(int*) data;
|
||||
curVrsIndex = vrs_enum;
|
||||
vrs_fragment_size = vrs_argment_size_table[vrs_enum];
|
||||
vrs_enable = true;
|
||||
}
|
||||
|
||||
|
||||
@ -122,7 +122,7 @@ static void UNITY_INTERFACE_API OnRenderEventAndData(int eventID, void *data)
|
||||
{
|
||||
case NativeRenderingEvent::EnableVRS:
|
||||
{
|
||||
s_current_api->enableVRS(*(int *)data);
|
||||
s_current_api->enableVRS(data);
|
||||
break;
|
||||
}
|
||||
case NativeRenderingEvent::DisableVRS:
|
||||
|
||||
@ -72,6 +72,8 @@ target("GfxPluginNativeRender")
|
||||
add_shflags("--target=" .. target)
|
||||
end
|
||||
end
|
||||
-- xmake config -p macosx --use_gles=false --use_vulkan=false -a arm64 --use_metal=true --toolchain=xcode
|
||||
-- xmake config -p iphoneos --use_gles=false --use_vulkan=false -a arm64 --use_metal=true
|
||||
if has_config("use_metal") then
|
||||
add_defines("SUPPORT_METAL=1")
|
||||
add_ldflags("-fPIE", "-fPIC")
|
||||
@ -84,6 +86,7 @@ target("GfxPluginNativeRender")
|
||||
add_defines("UNITY_OSX=1")
|
||||
end
|
||||
add_files("./*.mm")
|
||||
add_frameworks("Metal")
|
||||
add_frameworks("MetalKit")
|
||||
add_frameworks("MetalFX")
|
||||
end
|
||||
|
||||
@ -172,7 +172,16 @@ namespace UnityEngine.Rendering.Universal.Internal
|
||||
}
|
||||
}
|
||||
|
||||
static IntPtr p = Marshal.AllocHGlobal(Marshal.SizeOf<int>());
|
||||
static IntPtr vrsEnumPtr = Marshal.AllocHGlobal(Marshal.SizeOf<int>());
|
||||
static IntPtr vrsDataPackPtr = Marshal.AllocHGlobal(Marshal.SizeOf<DataPack>());
|
||||
struct DataPack
|
||||
{
|
||||
public float width;
|
||||
public float height;
|
||||
public float ratex;
|
||||
public float ratey;
|
||||
public bool cfgChange;
|
||||
};
|
||||
|
||||
private static unsafe void ExecutePass(ScriptableRenderContext context, PassData data, ref RenderingData renderingData, bool yFlip)
|
||||
{
|
||||
@ -244,18 +253,61 @@ namespace UnityEngine.Rendering.Universal.Internal
|
||||
var asset = UniversalRenderPipeline.asset;
|
||||
if(asset.VRSRate != RenderingPlugin.VRSPluginShadingRate.X1_PER_PIXEL)
|
||||
{
|
||||
*(int*)p.ToPointer() = (int)asset.VRSRate;
|
||||
cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.EnableVRS, p);
|
||||
#if PLATFORM_IOS || UNITY_STANDALONE_OSX
|
||||
DataPack* ptr = (DataPack*)vrsDataPackPtr.ToPointer();
|
||||
ptr->width = renderingData.cameraData.cameraTargetDescriptor.width;
|
||||
ptr->height = renderingData.cameraData.cameraTargetDescriptor.height;
|
||||
ptr->cfgChange = true;
|
||||
switch (asset.VRSRate)
|
||||
{
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_PIXEL:
|
||||
ptr->ratex = 1.0f;
|
||||
ptr->ratey = 1.0f;
|
||||
break;
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_2X1_PIXELS:
|
||||
ptr->ratex = 0.5f;
|
||||
ptr->ratey = 1.0f;
|
||||
break;
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_1X2_PIXELS:
|
||||
ptr->ratex = 0.5f;
|
||||
ptr->ratey = 1.0f;
|
||||
break;
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_2X2_PIXELS:
|
||||
ptr->ratex = 0.5f;
|
||||
ptr->ratey = 0.5f;
|
||||
break;
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_4X2_PIXELS:
|
||||
ptr->ratex = 0.25f;
|
||||
ptr->ratey = 0.5f;
|
||||
break;
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_2X4_PIXELS:
|
||||
ptr->ratex = 0.5f;
|
||||
ptr->ratey = 0.25f;
|
||||
break;
|
||||
case RenderingPlugin.VRSPluginShadingRate.X1_PER_4X4_PIXELS:
|
||||
ptr->ratex = 0.25f;
|
||||
ptr->ratey = 0.25f;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
cmd.BeginSample("EnableVrs");
|
||||
cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.EnableVRS, vrsDataPackPtr);
|
||||
#else
|
||||
*(int*)vrsEnumPtr.ToPointer() = (int)asset.VRSRate;
|
||||
cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.EnableVRS, vrsEnumPtr);
|
||||
context.ExecuteCommandBuffer(cmd);
|
||||
cmd.Clear();
|
||||
|
||||
#if DX12
|
||||
#endif
|
||||
cmd.EndSample("EnableVrs");
|
||||
|
||||
#if DX12
|
||||
// DX12 下会 context.DrawRenderers 重新设置 view port 和 scissor rect
|
||||
cmd.SetViewport(camera.pixelRect);
|
||||
cmd.EnableScissorRect(camera.pixelRect);
|
||||
#endif
|
||||
}
|
||||
#if DX12
|
||||
#if DX12 || UNITY_STANDALONE_OSX
|
||||
RendererUtils.RendererListDesc rendererListDesc = new (data.m_ShaderTagIdList.ToArray(), renderingData.cullResults,camera);
|
||||
rendererListDesc.layerMask = camera.cullingMask;
|
||||
rendererListDesc.sortingCriteria = sortFlags;
|
||||
@ -271,7 +323,9 @@ namespace UnityEngine.Rendering.Universal.Internal
|
||||
|
||||
if (asset.VRSRate != RenderingPlugin.VRSPluginShadingRate.X1_PER_PIXEL)
|
||||
{
|
||||
cmd.BeginSample("DisableVrs");
|
||||
cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.DisableVRS, IntPtr.Zero);
|
||||
cmd.EndSample("DisableVrs");
|
||||
}
|
||||
|
||||
// Render objects that did not match any shader pass with error shader
|
||||
|
||||
@ -75,6 +75,7 @@ namespace X.Rendering.Feature
|
||||
VRS_PRIMITIVE,
|
||||
VRS_ATTACHMENT,
|
||||
HW_SPATIAL_SR,
|
||||
METAL_VRR,
|
||||
HW_AISR,
|
||||
HW_ADAPTIVE_VRS,
|
||||
HW_FG_INTERPOLATE,
|
||||
@ -92,7 +93,7 @@ namespace X.Rendering.Feature
|
||||
public static void InitSupportFeatures()
|
||||
{
|
||||
featureSupports = new();
|
||||
UnityEngine.Debug.Log(UnityEngine.SystemInfo.graphicsDeviceType);
|
||||
UnityEngine.Debug.Log(SystemInfo.graphicsDeviceType);
|
||||
for (int i = 0; i < (int)GraphicsFeature.MAX_CNT; ++i)
|
||||
{
|
||||
featureSupports[(GraphicsFeature)i] = GetFeatureSupport(i);
|
||||
|
||||
@ -91,6 +91,19 @@ namespace X.Rendering.Feature
|
||||
|
||||
public void SetSR(ESuperResolution resolution)
|
||||
{
|
||||
switch (resolution)
|
||||
{
|
||||
case ESuperResolution.METAL_FX_SPATIAL_SR:
|
||||
{
|
||||
SetActive(true);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
{
|
||||
SetActive(false);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,30 +1,6 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:yousandi.cn,2023:
|
||||
--- !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: 0
|
||||
m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
x: 392
|
||||
y: 65
|
||||
width: 1328
|
||||
height: 954
|
||||
m_ShowMode: 0
|
||||
m_Title: Frame Debugger
|
||||
m_RootView: {fileID: 4}
|
||||
m_MinSize: {x: 1000, y: 521}
|
||||
m_MaxSize: {x: 4000, y: 4021}
|
||||
m_Maximized: 0
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -43,63 +19,12 @@ MonoBehaviour:
|
||||
width: 1920
|
||||
height: 954
|
||||
m_ShowMode: 4
|
||||
m_Title: Console
|
||||
m_RootView: {fileID: 13}
|
||||
m_Title: Inspector
|
||||
m_RootView: {fileID: 10}
|
||||
m_MinSize: {x: 875, y: 321}
|
||||
m_MaxSize: {x: 10000, y: 10000}
|
||||
m_Maximized: 1
|
||||
--- !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: 0
|
||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name: FrameDebuggerWindow
|
||||
m_EditorClassIdentifier:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1328
|
||||
height: 954
|
||||
m_MinSize: {x: 1000, y: 521}
|
||||
m_MaxSize: {x: 4000, y: 4021}
|
||||
m_ActualView: {fileID: 17}
|
||||
m_Panes:
|
||||
- {fileID: 17}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !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: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 3}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1328
|
||||
height: 954
|
||||
m_MinSize: {x: 1000, y: 521}
|
||||
m_MaxSize: {x: 4000, y: 4021}
|
||||
vertical: 0
|
||||
controlID: 2635
|
||||
draggingID: 0
|
||||
--- !u!114 &5
|
||||
--- !u!114 &2
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -120,13 +45,13 @@ MonoBehaviour:
|
||||
height: 536
|
||||
m_MinSize: {x: 202, y: 221}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 22}
|
||||
m_ActualView: {fileID: 18}
|
||||
m_Panes:
|
||||
- {fileID: 14}
|
||||
- {fileID: 18}
|
||||
- {fileID: 22}
|
||||
m_Selected: 1
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &6
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -139,8 +64,8 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 11}
|
||||
- {fileID: 5}
|
||||
- {fileID: 8}
|
||||
- {fileID: 2}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -150,9 +75,9 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 200, y: 50}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 57
|
||||
controlID: 18
|
||||
draggingID: 0
|
||||
--- !u!114 &7
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -173,12 +98,12 @@ MonoBehaviour:
|
||||
height: 368
|
||||
m_MinSize: {x: 102, y: 121}
|
||||
m_MaxSize: {x: 4002, y: 4021}
|
||||
m_ActualView: {fileID: 23}
|
||||
m_ActualView: {fileID: 19}
|
||||
m_Panes:
|
||||
- {fileID: 23}
|
||||
- {fileID: 19}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &8
|
||||
--- !u!114 &5
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -191,8 +116,8 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 12}
|
||||
- {fileID: 7}
|
||||
- {fileID: 9}
|
||||
- {fileID: 4}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -202,9 +127,9 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 200, y: 50}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 160
|
||||
controlID: 65
|
||||
draggingID: 0
|
||||
--- !u!114 &9
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -217,8 +142,8 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 16}
|
||||
- {fileID: 10}
|
||||
- {fileID: 13}
|
||||
- {fileID: 7}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -228,9 +153,9 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 55
|
||||
controlID: 16
|
||||
draggingID: 0
|
||||
--- !u!114 &10
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -249,14 +174,14 @@ MonoBehaviour:
|
||||
y: 0
|
||||
width: 523
|
||||
height: 904
|
||||
m_MinSize: {x: 276, y: 71}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 20}
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 16}
|
||||
m_Panes:
|
||||
- {fileID: 20}
|
||||
- {fileID: 16}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &11
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -275,14 +200,14 @@ MonoBehaviour:
|
||||
y: 0
|
||||
width: 293
|
||||
height: 536
|
||||
m_MinSize: {x: 201, y: 221}
|
||||
m_MaxSize: {x: 4001, y: 4021}
|
||||
m_ActualView: {fileID: 21}
|
||||
m_MinSize: {x: 200, y: 200}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 17}
|
||||
m_Panes:
|
||||
- {fileID: 21}
|
||||
- {fileID: 17}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &12
|
||||
--- !u!114 &9
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -303,12 +228,12 @@ MonoBehaviour:
|
||||
height: 368
|
||||
m_MinSize: {x: 231, y: 271}
|
||||
m_MaxSize: {x: 10001, y: 10021}
|
||||
m_ActualView: {fileID: 19}
|
||||
m_ActualView: {fileID: 15}
|
||||
m_Panes:
|
||||
- {fileID: 19}
|
||||
- {fileID: 15}
|
||||
m_Selected: 0
|
||||
m_LastSelected: 0
|
||||
--- !u!114 &13
|
||||
--- !u!114 &10
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -321,9 +246,9 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 14}
|
||||
- {fileID: 9}
|
||||
- {fileID: 15}
|
||||
- {fileID: 11}
|
||||
- {fileID: 6}
|
||||
- {fileID: 12}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -336,7 +261,7 @@ MonoBehaviour:
|
||||
m_TopViewHeight: 30
|
||||
m_UseBottomView: 1
|
||||
m_BottomViewHeight: 20
|
||||
--- !u!114 &14
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -358,7 +283,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
m_LastLoadedLayoutName:
|
||||
--- !u!114 &15
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -379,7 +304,7 @@ MonoBehaviour:
|
||||
height: 20
|
||||
m_MinSize: {x: 0, y: 0}
|
||||
m_MaxSize: {x: 0, y: 0}
|
||||
--- !u!114 &16
|
||||
--- !u!114 &13
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -392,8 +317,8 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Children:
|
||||
- {fileID: 6}
|
||||
- {fileID: 8}
|
||||
- {fileID: 3}
|
||||
- {fileID: 5}
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -403,66 +328,9 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 56
|
||||
controlID: 17
|
||||
draggingID: 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: 13202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_MinSize: {x: 1000, y: 500}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_TitleContent:
|
||||
m_Text: Frame Debugger
|
||||
m_Image: {fileID: 0}
|
||||
m_Tooltip:
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 392
|
||||
y: 65
|
||||
width: 1328
|
||||
height: 933
|
||||
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_TreeWidth: 337.92
|
||||
m_TreeViewState:
|
||||
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:
|
||||
--- !u!114 &18
|
||||
--- !u!114 &14
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -482,10 +350,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
|
||||
@ -501,7 +369,7 @@ MonoBehaviour:
|
||||
collapsed: 0
|
||||
displayed: 1
|
||||
snapOffset: {x: 0, y: 0}
|
||||
snapOffsetDelta: {x: -179, y: -26}
|
||||
snapOffsetDelta: {x: -174, y: -26}
|
||||
snapCorner: 3
|
||||
id: Tool Settings
|
||||
index: 0
|
||||
@ -818,9 +686,9 @@ MonoBehaviour:
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_Position:
|
||||
m_Target: {x: -33.845665, y: -11.687641, z: -27.991777}
|
||||
m_Target: {x: 5.276779, y: 3.233207, z: -160.97272}
|
||||
speed: 2
|
||||
m_Value: {x: -33.845665, y: -11.687641, z: -27.991777}
|
||||
m_Value: {x: 5.276779, y: 3.233207, z: -160.97272}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@ -870,9 +738,9 @@ MonoBehaviour:
|
||||
speed: 2
|
||||
m_Value: {x: -0.06818082, y: 0.9243392, z: -0.19731495, w: -0.3193987}
|
||||
m_Size:
|
||||
m_Target: 28.653723
|
||||
m_Target: 46.612152
|
||||
speed: 2
|
||||
m_Value: 28.653723
|
||||
m_Value: 46.612152
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
@ -899,7 +767,7 @@ MonoBehaviour:
|
||||
m_SceneVisActive: 1
|
||||
m_LastLockedObject: {fileID: 0}
|
||||
m_ViewIsLockedToObject: 0
|
||||
--- !u!114 &19
|
||||
--- !u!114 &15
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -958,10 +826,10 @@ MonoBehaviour:
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 79}
|
||||
m_SelectedIDs: 0a080000
|
||||
m_LastClickedID: 2058
|
||||
m_ExpandedIDs: 00000000360600008e0600009a060000ce06000000ca9a3bffffff7f
|
||||
scrollPos: {x: 0, y: 37}
|
||||
m_SelectedIDs: e0ba0000
|
||||
m_LastClickedID: 47840
|
||||
m_ExpandedIDs: 000000006eb700006aba00006eba000000ca9a3bffffff7f
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -977,7 +845,7 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 12}
|
||||
m_ClientGUIView: {fileID: 9}
|
||||
m_SearchString:
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
@ -989,7 +857,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs:
|
||||
m_ExpandedIDs: 000000006eb70000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1033,7 +901,7 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_ClientGUIView: {fileID: 12}
|
||||
m_ClientGUIView: {fileID: 9}
|
||||
m_CreateAssetUtility:
|
||||
m_EndAction: {fileID: 0}
|
||||
m_InstanceID: 0
|
||||
@ -1045,7 +913,7 @@ MonoBehaviour:
|
||||
m_GridSize: 16
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 207
|
||||
--- !u!114 &20
|
||||
--- !u!114 &16
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1092,7 +960,7 @@ MonoBehaviour:
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_PreviewWindow: {fileID: 0}
|
||||
--- !u!114 &21
|
||||
--- !u!114 &17
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1129,9 +997,9 @@ MonoBehaviour:
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 12000000
|
||||
m_SelectedIDs: 46030000
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 8221fdff5630fdfffe93fdff
|
||||
m_ExpandedIDs: 40faffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1147,7 +1015,7 @@ MonoBehaviour:
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 0
|
||||
m_ClientGUIView: {fileID: 11}
|
||||
m_ClientGUIView: {fileID: 8}
|
||||
m_SearchString:
|
||||
m_ExpandedScenes: []
|
||||
m_CurrenRootInstanceID: 0
|
||||
@ -1155,7 +1023,7 @@ MonoBehaviour:
|
||||
m_IsLocked: 0
|
||||
m_CurrentSortingName: TransformSorting
|
||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||
--- !u!114 &22
|
||||
--- !u!114 &18
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -1195,7 +1063,7 @@ MonoBehaviour:
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 1102, y: 494}
|
||||
m_TargetSize: {x: 2560, y: 1440}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@ -1210,10 +1078,10 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -551
|
||||
m_HBaseRangeMax: 551
|
||||
m_VBaseRangeMin: -247
|
||||
m_VBaseRangeMax: 247
|
||||
m_HBaseRangeMin: -1280
|
||||
m_HBaseRangeMax: 1280
|
||||
m_VBaseRangeMin: -720
|
||||
m_VBaseRangeMax: 720
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
m_HAllowExceedBaseRangeMax: 1
|
||||
m_VAllowExceedBaseRangeMin: 1
|
||||
@ -1233,7 +1101,7 @@ MonoBehaviour:
|
||||
y: 21
|
||||
width: 1102
|
||||
height: 494
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Scale: {x: 0.34305555, y: 0.34305555}
|
||||
m_Translation: {x: 551, y: 247}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
@ -1241,19 +1109,19 @@ MonoBehaviour:
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -551
|
||||
y: -247
|
||||
width: 1102
|
||||
height: 494
|
||||
x: -1606.1539
|
||||
y: -720
|
||||
width: 3212.3079
|
||||
height: 1440
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_defaultScale: 0.34305555
|
||||
m_LastWindowPixelSize: {x: 1102, y: 515}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000001000000000000
|
||||
m_XRRenderMode: 0
|
||||
m_RenderTexture: {fileID: 0}
|
||||
--- !u!114 &23
|
||||
--- !u!114 &19
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user