From 24a56211f402e1e64b6add449689dda24f0b53e7 Mon Sep 17 00:00:00 2001 From: notargs Date: Fri, 17 Mar 2023 17:46:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=81=ABURP=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Packages/manifest.json | 1 + Packages/packages-lock.json | 39 ++++++++++++++++++++++++ ProjectSettings/URPProjectSettings.asset | 15 +++++++++ 3 files changed, 55 insertions(+) create mode 100644 ProjectSettings/URPProjectSettings.asset diff --git a/Packages/manifest.json b/Packages/manifest.json index 8e3fb7a0d..0ad01f6dc 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,7 @@ "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.5", "com.unity.postprocessing": "3.1.1", + "com.unity.render-pipelines.universal": "10.9.0", "com.unity.test-framework": "1.1.31", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 33d40e82b..ab2816b47 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -57,6 +57,45 @@ }, "url": "https://packages.unity.com" }, + "com.unity.render-pipelines.core": { + "version": "10.9.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.render-pipelines.universal": { + "version": "10.9.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.1.0", + "com.unity.render-pipelines.core": "10.9.0", + "com.unity.shadergraph": "10.9.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.searcher": { + "version": "4.3.2", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.shadergraph": { + "version": "10.9.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.render-pipelines.core": "10.9.0", + "com.unity.searcher": "4.3.2" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset new file mode 100644 index 000000000..3077404f3 --- /dev/null +++ b/ProjectSettings/URPProjectSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: 247994e1f5a72c2419c26a37e9334c01, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LastMaterialVersion: 4 From 19515bae8af6f86935b5704d4e127586e2b325e9 Mon Sep 17 00:00:00 2001 From: notargs Date: Wed, 22 Mar 2023 13:04:25 +0900 Subject: [PATCH 2/4] =?UTF-8?q?URPAsset=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UniversalRenderPipelineAsset.asset | 59 +++++++++++++++++++ .../UniversalRenderPipelineAsset.asset.meta | 8 +++ ...niversalRenderPipelineAsset_Renderer.asset | 44 ++++++++++++++ ...salRenderPipelineAsset_Renderer.asset.meta | 8 +++ 4 files changed, 119 insertions(+) create mode 100644 Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset create mode 100644 Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset.meta create mode 100644 Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset create mode 100644 Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset.meta diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset new file mode 100644 index 000000000..4d44b3b54 --- /dev/null +++ b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: UniversalRenderPipelineAsset + m_EditorClassIdentifier: + k_AssetVersion: 5 + k_AssetPreviousVersion: 5 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: 403eb7f2c102516478383780c53db417, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 1 + m_StoreActionsOptimization: 0 + m_SupportsHDR: 1 + m_MSAA: 1 + m_RenderScale: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_ShadowDistance: 50 + m_ShadowCascadeCount: 1 + m_Cascade2Split: 0.25 + m_Cascade3Split: {x: 0.1, y: 0.3} + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 0 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_DebugLevel: 0 + m_UseAdaptivePerformance: 1 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 + m_ShadowCascades: 0 diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset.meta b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset.meta new file mode 100644 index 000000000..ccfcd4673 --- /dev/null +++ b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2085713678b68cd49b566095490d580c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset new file mode 100644 index 000000000..2c42cdfbe --- /dev/null +++ b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: UniversalRenderPipelineAsset_Renderer + m_EditorClassIdentifier: + m_RendererFeatures: [] + m_RendererFeatureMap: + postProcessData: {fileID: 0} + xrSystemData: {fileID: 0} + shaders: + blitPS: {fileID: 0} + copyDepthPS: {fileID: 0} + screenSpaceShadowPS: {fileID: 0} + samplingPS: {fileID: 0} + tileDepthInfoPS: {fileID: 0} + tileDeferredPS: {fileID: 0} + stencilDeferredPS: {fileID: 0} + fallbackErrorPS: {fileID: 0} + materialErrorPS: {fileID: 0} + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 2 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_AccurateGbufferNormals: 0 diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset.meta b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset.meta new file mode 100644 index 000000000..feb6a6e02 --- /dev/null +++ b/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 403eb7f2c102516478383780c53db417 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From b84771364a0af5d50804bf9ae8a9beb9a5dc0e84 Mon Sep 17 00:00:00 2001 From: notargs Date: Wed, 22 Mar 2023 13:17:02 +0900 Subject: [PATCH 3/4] =?UTF-8?q?URPSample=E3=83=87=E3=82=A3=E3=83=AC?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=AA=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM10_Samples/URPSample.meta | 8 ++++++++ .../UniversalRenderPipelineAsset.asset | 6 +++--- .../UniversalRenderPipelineAsset.asset.meta | 0 ...niversalRenderPipelineAsset_Renderer.asset | 19 ++++++++++--------- ...salRenderPipelineAsset_Renderer.asset.meta | 0 5 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 Assets/VRM10_Samples/URPSample.meta rename Assets/VRM10_Samples/{VRM10Viewer => URPSample}/UniversalRenderPipelineAsset.asset (95%) rename Assets/VRM10_Samples/{VRM10Viewer => URPSample}/UniversalRenderPipelineAsset.asset.meta (100%) rename Assets/VRM10_Samples/{VRM10Viewer => URPSample}/UniversalRenderPipelineAsset_Renderer.asset (54%) rename Assets/VRM10_Samples/{VRM10Viewer => URPSample}/UniversalRenderPipelineAsset_Renderer.asset.meta (100%) diff --git a/Assets/VRM10_Samples/URPSample.meta b/Assets/VRM10_Samples/URPSample.meta new file mode 100644 index 000000000..877067d5f --- /dev/null +++ b/Assets/VRM10_Samples/URPSample.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53df9bc5b6f2a534d9a6ab8ed73d617b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset b/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset similarity index 95% rename from Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset rename to Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset index 4d44b3b54..a983984c8 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset +++ b/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 5 + k_AssetVersion: 6 k_AssetPreviousVersion: 5 m_RendererType: 1 m_RendererData: {fileID: 0} @@ -35,13 +35,13 @@ MonoBehaviour: m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 m_ShadowDistance: 50 - m_ShadowCascadeCount: 1 + m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 - m_SoftShadowsSupported: 0 + m_SoftShadowsSupported: 1 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset.meta b/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset.meta similarity index 100% rename from Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset.asset.meta rename to Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset.meta diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset b/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset similarity index 54% rename from Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset rename to Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset index 2c42cdfbe..cd7074b5f 100644 --- a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset +++ b/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset @@ -14,18 +14,19 @@ MonoBehaviour: m_EditorClassIdentifier: m_RendererFeatures: [] m_RendererFeatureMap: - postProcessData: {fileID: 0} - xrSystemData: {fileID: 0} + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: - blitPS: {fileID: 0} - copyDepthPS: {fileID: 0} - screenSpaceShadowPS: {fileID: 0} - samplingPS: {fileID: 0} + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, + type: 3} + samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} tileDepthInfoPS: {fileID: 0} tileDeferredPS: {fileID: 0} - stencilDeferredPS: {fileID: 0} - fallbackErrorPS: {fileID: 0} - materialErrorPS: {fileID: 0} + stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset.meta b/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset.meta similarity index 100% rename from Assets/VRM10_Samples/VRM10Viewer/UniversalRenderPipelineAsset_Renderer.asset.meta rename to Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset.meta From 027ef289be0c9c10df768686c3de598517ecceba Mon Sep 17 00:00:00 2001 From: notargs Date: Wed, 22 Mar 2023 13:53:09 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Settings=E3=83=87=E3=82=A3=E3=83=AC?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=AA=E3=81=B8=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM10_Samples/URPSample/Settings.meta | 8 ++++++++ .../{ => Settings}/UniversalRenderPipelineAsset.asset | 0 .../UniversalRenderPipelineAsset.asset.meta | 0 .../UniversalRenderPipelineAsset_Renderer.asset | 0 .../UniversalRenderPipelineAsset_Renderer.asset.meta | 0 5 files changed, 8 insertions(+) create mode 100644 Assets/VRM10_Samples/URPSample/Settings.meta rename Assets/VRM10_Samples/URPSample/{ => Settings}/UniversalRenderPipelineAsset.asset (100%) rename Assets/VRM10_Samples/URPSample/{ => Settings}/UniversalRenderPipelineAsset.asset.meta (100%) rename Assets/VRM10_Samples/URPSample/{ => Settings}/UniversalRenderPipelineAsset_Renderer.asset (100%) rename Assets/VRM10_Samples/URPSample/{ => Settings}/UniversalRenderPipelineAsset_Renderer.asset.meta (100%) diff --git a/Assets/VRM10_Samples/URPSample/Settings.meta b/Assets/VRM10_Samples/URPSample/Settings.meta new file mode 100644 index 000000000..4fc5d1ec8 --- /dev/null +++ b/Assets/VRM10_Samples/URPSample/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 111d87cb2dbd003498a8e05b69633e8a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset b/Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset.asset similarity index 100% rename from Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset rename to Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset.asset diff --git a/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset.meta b/Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset.asset.meta similarity index 100% rename from Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset.asset.meta rename to Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset.asset.meta diff --git a/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset b/Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset_Renderer.asset similarity index 100% rename from Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset rename to Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset_Renderer.asset diff --git a/Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset.meta b/Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset_Renderer.asset.meta similarity index 100% rename from Assets/VRM10_Samples/URPSample/UniversalRenderPipelineAsset_Renderer.asset.meta rename to Assets/VRM10_Samples/URPSample/Settings/UniversalRenderPipelineAsset_Renderer.asset.meta