From 0632df6700a35ab8144647746855b9eb645ad5b4 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Thu, 26 Oct 2023 23:00:54 +0800 Subject: [PATCH] Switch to URP, Bug fix, Remove FXAA TAA due to URP --- .../Materials/Prototype Black Grid.mat | 84 ++++++++- Assets/Resources/Prefabs/Live.prefab | 137 ++++++++++++++ ... => UMAUniversalRenderPipelineAsset.asset} | 2 +- ...MAUniversalRenderPipelineAsset.asset.meta} | 0 ...iversalRenderPipelineAsset_Renderer.asset} | 47 ++++- ...alRenderPipelineAsset_Renderer.asset.meta} | 0 Assets/Scenes/Version2.unity | 168 +++++++++++++----- Assets/Scripts/CameraOrbit.cs | 12 -- Assets/Scripts/UmaViewerMain.cs | 6 + 9 files changed, 387 insertions(+), 69 deletions(-) rename Assets/Resources/{UniversalRenderPipelineAsset.asset => UMAUniversalRenderPipelineAsset.asset} (97%) rename Assets/Resources/{UniversalRenderPipelineAsset.asset.meta => UMAUniversalRenderPipelineAsset.asset.meta} (100%) rename Assets/Resources/{UniversalRenderPipelineAsset_Renderer.asset => UMAUniversalRenderPipelineAsset_Renderer.asset} (57%) rename Assets/Resources/{UniversalRenderPipelineAsset_Renderer.asset.meta => UMAUniversalRenderPipelineAsset_Renderer.asset.meta} (100%) diff --git a/Assets/Plugins/RootMotion/Shared Demo Assets/Prototyping/Materials/Prototype Black Grid.mat b/Assets/Plugins/RootMotion/Shared Demo Assets/Prototyping/Materials/Prototype Black Grid.mat index a4bcca3..499bac6 100644 --- a/Assets/Plugins/RootMotion/Shared Demo Assets/Prototyping/Materials/Prototype Black Grid.mat +++ b/Assets/Plugins/RootMotion/Shared Demo Assets/Prototyping/Materials/Prototype Black Grid.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-626534011884211321 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -8,22 +21,83 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype Black Grid - m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: c32a0b1f62ac42e4399935ffff09c099, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: c32a0b1f62ac42e4399935ffff09c099, type: 3} - m_Scale: {x: 10, y: 10} + m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Floats: [] + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _SampleGI: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Prefabs/Live.prefab b/Assets/Resources/Prefabs/Live.prefab index 0cb45b1..ad2ca94 100644 --- a/Assets/Resources/Prefabs/Live.prefab +++ b/Assets/Resources/Prefabs/Live.prefab @@ -90,6 +90,7 @@ MonoBehaviour: UI: {fileID: 0} totalTime: 0 sliderControl: {fileID: 0} + IsRecordVMD: 0 --- !u!1 &1865328019154612007 GameObject: m_ObjectHideFlags: 0 @@ -131,6 +132,7 @@ GameObject: - component: {fileID: 2450869250720268632} - component: {fileID: 6330558547629765058} - component: {fileID: 4255285708983627416} + - component: {fileID: 8546559765443149047} m_Layer: 0 m_Name: CameraTimeline3 m_TagString: Untagged @@ -213,6 +215,39 @@ MonoBehaviour: rotationAmount: 3 positionComponents: {x: 1, y: 1, z: 1} rotationComponents: {x: 1, y: 1, z: 0} +--- !u!114 &8546559765443149047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097627094367379998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &3003233695131412903 GameObject: m_ObjectHideFlags: 0 @@ -284,6 +319,7 @@ GameObject: - component: {fileID: 3542667354398119871} - component: {fileID: 8597940521609398784} - component: {fileID: 798685759687451556} + - component: {fileID: 9090805481175056037} m_Layer: 0 m_Name: CameraTimeline1 m_TagString: Untagged @@ -366,6 +402,39 @@ MonoBehaviour: rotationAmount: 3 positionComponents: {x: 1, y: 1, z: 1} rotationComponents: {x: 1, y: 1, z: 0} +--- !u!114 &9090805481175056037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4140460281425956302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &4785394279812813554 GameObject: m_ObjectHideFlags: 0 @@ -430,6 +499,7 @@ GameObject: m_Component: - component: {fileID: 377769306748577889} - component: {fileID: 2702537835415320580} + - component: {fileID: 2930975352788724111} m_Layer: 0 m_Name: MotionCamera m_TagString: Untagged @@ -494,6 +564,39 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!114 &2930975352788724111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4816052047297315680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &6380076730332281044 GameObject: m_ObjectHideFlags: 0 @@ -559,6 +662,7 @@ GameObject: - component: {fileID: 8555819741671670628} - component: {fileID: 514624559944582317} - component: {fileID: 6126872266139889760} + - component: {fileID: 7101937841020282597} m_Layer: 0 m_Name: CameraTimeline2 m_TagString: Untagged @@ -641,6 +745,39 @@ MonoBehaviour: rotationAmount: 3 positionComponents: {x: 1, y: 1, z: 1} rotationComponents: {x: 1, y: 1, z: 0} +--- !u!114 &7101937841020282597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6851394962599434009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &7905873867216034822 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UniversalRenderPipelineAsset.asset b/Assets/Resources/UMAUniversalRenderPipelineAsset.asset similarity index 97% rename from Assets/Resources/UniversalRenderPipelineAsset.asset rename to Assets/Resources/UMAUniversalRenderPipelineAsset.asset index 1bcefb0..742799a 100644 --- a/Assets/Resources/UniversalRenderPipelineAsset.asset +++ b/Assets/Resources/UMAUniversalRenderPipelineAsset.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} - m_Name: UniversalRenderPipelineAsset + m_Name: UMAUniversalRenderPipelineAsset m_EditorClassIdentifier: k_AssetVersion: 6 k_AssetPreviousVersion: 5 diff --git a/Assets/Resources/UniversalRenderPipelineAsset.asset.meta b/Assets/Resources/UMAUniversalRenderPipelineAsset.asset.meta similarity index 100% rename from Assets/Resources/UniversalRenderPipelineAsset.asset.meta rename to Assets/Resources/UMAUniversalRenderPipelineAsset.asset.meta diff --git a/Assets/Resources/UniversalRenderPipelineAsset_Renderer.asset b/Assets/Resources/UMAUniversalRenderPipelineAsset_Renderer.asset similarity index 57% rename from Assets/Resources/UniversalRenderPipelineAsset_Renderer.asset rename to Assets/Resources/UMAUniversalRenderPipelineAsset_Renderer.asset index cd7074b..8b53a55 100644 --- a/Assets/Resources/UniversalRenderPipelineAsset_Renderer.asset +++ b/Assets/Resources/UMAUniversalRenderPipelineAsset_Renderer.asset @@ -1,5 +1,45 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-53754397225917022 +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: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: UmaCharacter + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: UmaCharacter + Event: 300 + filterSettings: + RenderQueueType: 0 + LayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + PassNames: + - Outline + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10,10 +50,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} - m_Name: UniversalRenderPipelineAsset_Renderer + m_Name: UMAUniversalRenderPipelineAsset_Renderer m_EditorClassIdentifier: - m_RendererFeatures: [] - m_RendererFeatureMap: + m_RendererFeatures: + - {fileID: -53754397225917022} + m_RendererFeatureMap: a2e53b18a90641ff postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: diff --git a/Assets/Resources/UniversalRenderPipelineAsset_Renderer.asset.meta b/Assets/Resources/UMAUniversalRenderPipelineAsset_Renderer.asset.meta similarity index 100% rename from Assets/Resources/UniversalRenderPipelineAsset_Renderer.asset.meta rename to Assets/Resources/UMAUniversalRenderPipelineAsset_Renderer.asset.meta diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 443f8ce..bf430f1 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -2241,7 +2241,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &92965282 @@ -5161,17 +5161,23 @@ MonoBehaviour: m_Value: 0 m_Options: m_Options: - - m_Text: None AA - m_Image: {fileID: 0} - - m_Text: FXAA - m_Image: {fileID: 0} - - m_Text: SMAA - m_Image: {fileID: 0} - - m_Text: TAA + - m_Text: MSAA (Default) m_Image: {fileID: 0} m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1564959565} + m_TargetAssemblyTypeName: UmaViewerMain, umamusume + m_MethodName: ChangeAA + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_AlphaFadeSpeed: 0.15 --- !u!114 &212377234 MonoBehaviour: @@ -6798,7 +6804,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000305} + m_AnchoredPosition: {x: 255, y: -45.000366} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &270183827 @@ -9283,7 +9289,7 @@ PrefabInstance: - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.98999023 + value: -0.9902344 objectReference: {fileID: 0} - target: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, type: 3} @@ -22788,6 +22794,7 @@ GameObject: - component: {fileID: 790387848} - component: {fileID: 790387849} - component: {fileID: 790387850} + - component: {fileID: 790387851} m_Layer: 0 m_Name: AnimationCamera m_TagString: Untagged @@ -22912,6 +22919,39 @@ MonoBehaviour: m_BeforeTransparentBundles: [] m_BeforeStackBundles: [] m_AfterStackBundles: [] +--- !u!114 &790387851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 790387847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &793664715 GameObject: m_ObjectHideFlags: 0 @@ -23152,9 +23192,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -152.01} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &800374507 @@ -25781,7 +25821,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: None AA + m_Text: MSAA (Default) --- !u!222 &871489078 CanvasRenderer: m_ObjectHideFlags: 0 @@ -27335,7 +27375,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380, y: -45.000305} + m_AnchoredPosition: {x: 380, y: -45.000366} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &931406427 @@ -27569,7 +27609,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000305} + m_AnchoredPosition: {x: 255, y: -45.000366} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &952551665 @@ -29888,7 +29928,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1040294592 @@ -40443,7 +40483,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -29.999817} + m_AnchoredPosition: {x: 0, y: -29.999878} m_SizeDelta: {x: 300, y: -60.000233} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1453791885 @@ -41780,7 +41820,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!224 &1525688469 stripped @@ -42495,7 +42535,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1558324558 @@ -45960,7 +46000,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1678768231 @@ -46294,7 +46334,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1684693616 @@ -46664,7 +46704,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1699478760 @@ -48698,7 +48738,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000305} + m_AnchoredPosition: {x: 255, y: -45.000366} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1765749874 @@ -53737,7 +53777,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1970310175 @@ -58741,7 +58781,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2129326814 @@ -59963,7 +60003,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000305} + m_AnchoredPosition: {x: 0, y: -45.000366} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2146564492 @@ -60250,9 +60290,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -304.02} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -60759,9 +60799,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -50.67} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666109573094 @@ -63120,9 +63160,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -202.68} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -63952,9 +63992,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -101.34} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -64461,10 +64501,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CameraMode: 0 - AAMode: 0 Light: {fileID: 926505643} CameraModeDropdown: {fileID: 6878219667632297374} - AAModeDropdown: {fileID: 212377233} CameraTargetHelper: {fileID: 1174230681} TargetCenter: {x: 0, y: 0, z: 0} OrbitCamSettingsTab: {fileID: 6878219667498913899} @@ -65668,9 +65706,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -65889,9 +65927,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -253.34999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 @@ -66804,6 +66842,7 @@ GameObject: - component: {fileID: 8918259399633999299} - component: {fileID: 6878219667401439304} - component: {fileID: 8918259399633999297} + - component: {fileID: 8918259399633999300} m_Layer: 0 m_Name: Camera m_TagString: MainCamera @@ -66922,6 +66961,39 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8918259399633999296} m_Enabled: 1 +--- !u!114 &8918259399633999300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8918259399633999296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!4 &8918259399633999301 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CameraOrbit.cs b/Assets/Scripts/CameraOrbit.cs index c6674ae..dfd6bc1 100644 --- a/Assets/Scripts/CameraOrbit.cs +++ b/Assets/Scripts/CameraOrbit.cs @@ -10,15 +10,12 @@ public class CameraOrbit : MonoBehaviour { public static CameraOrbit instance; public int CameraMode = 0; - public int AAMode = 0; [Header("Light")] public GameObject Light; public Dropdown CameraModeDropdown; - public Dropdown AAModeDropdown; - public GameObject CameraTargetHelper; public Vector3 TargetCenter; @@ -84,14 +81,6 @@ public class CameraOrbit : MonoBehaviour CameraMode = CameraModeDropdown.value; } - if (AAMode != AAModeDropdown.value) - { - var postprocessLayerMain = Camera.main.GetComponent(); - var postprocessLayerPreview = UmaViewerBuilder.Instance.AnimationCamera.GetComponent(); - postprocessLayerMain.antialiasingMode = postprocessLayerPreview.antialiasingMode = (PostProcessLayer.Antialiasing)AAModeDropdown.value; - Debug.Log($"Switched AntiAliasing to {(PostProcessLayer.Antialiasing)AAModeDropdown.value}"); - AAMode = AAModeDropdown.value; - } switch (CameraModeDropdown.value) { case 0: @@ -102,7 +91,6 @@ public class CameraOrbit : MonoBehaviour } } - #region PC controls /// /// Rotate Light Source diff --git a/Assets/Scripts/UmaViewerMain.cs b/Assets/Scripts/UmaViewerMain.cs index 642abe0..cabca6c 100644 --- a/Assets/Scripts/UmaViewerMain.cs +++ b/Assets/Scripts/UmaViewerMain.cs @@ -201,6 +201,12 @@ public class UmaViewerMain : MonoBehaviour Builder.ShaderList = new List(shaders.LoadAllAssets()); } + public void ChangeAA(int val) + { + + } + + public void OpenUrl(string url) { Application.OpenURL(url);