From 3b642416af2e00a0992c05b5002656e20775abb5 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 10 May 2026 02:25:13 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20:=20=20SSCC=20=EB=A7=88=EC=8A=A4=ED=82=B9?= =?UTF-8?q?=20=EB=B0=8F=20=EC=97=90=EC=85=8B=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OptiTrack/Editor/OptitrackSetupWindow.cs | 1 - .../Screen Space Cavity Curvature/Demo.meta | 8 - .../Demo/Demo.unity | 3 - .../Demo/Demo.unity.meta | 14 - .../Demo/Demo_Readme.txt | 3 - .../Demo/Demo_Readme.txt.meta | 14 - .../Demo/Grey.mat | 333 ------------ .../Demo/Grey.mat.meta | 15 - .../Screen Space Cavity Curvature/README.txt | 4 +- .../README.txt.meta | 6 +- .../Runtime.meta | 8 - .../Runtime/SSCC.Runtime.asmdef | 15 - .../Runtime/SSCC.Runtime.asmdef.meta | 14 - .../Runtime/SSCC.cs | 484 ----------------- .../Runtime/SSCC.cs.meta | 19 - .../SRP/HDRP.unitypackage | 3 - .../SRP/HDRP.unitypackage.meta | 14 - .../SRP/README HDRP & URP.txt | 4 +- .../SRP/README HDRP & URP.txt.meta | 6 +- .../SRP/URP.unitypackage | 4 +- .../SRP/URP.unitypackage.meta | 6 +- .../SRP/URP/Demo_URP/Grey_URP.mat | 1 + .../SRP/URP/Runtime/SSCC.cs | 7 +- .../SRP/URP/Runtime/SSCCRendererFeature.cs | 508 +++++++++--------- .../SRP/URP/Shaders/Shared.cginc | 48 +- .../SRP/URP/Shaders/URP_SSCC.shader | 4 +- .../Shaders.meta | 8 - .../Shaders/Builtin_SSCC.shader | 253 --------- .../Shaders/Builtin_SSCC.shader.meta | 16 - .../Shaders/Shared.cginc | 332 ------------ .../Shaders/Shared.cginc.meta | 16 - .../_SSCCTexture Examples.meta | 8 - .../Builtin _SSCCTexture Example.unitypackage | 3 - ...tin _SSCCTexture Example.unitypackage.meta | 15 - .../_SSCCTexture Examples/Readme.txt | 3 - .../_SSCCTexture Examples/Readme.txt.meta | 14 - .../URP2020 _SSCCTexture Example.unitypackage | 3 - ...020 _SSCCTexture Example.unitypackage.meta | 15 - ...URP2021+ _SSCCTexture Example.unitypackage | 3 - ...21+ _SSCCTexture Example.unitypackage.meta | 15 - ...ingle Render Pipeline Asset_Renderer.asset | 4 +- .../Glb/New Lighting Settings.lighting | 2 +- .../[공용]댄스 연습실.Materials/Door__Door_C_jpg.mat | 25 +- .../Glb/[공용]댄스 연습실.Materials/Glass.mat | 23 + .../Glossy__Reflexion_jpg.mat | 25 +- .../Glossy__Reflexion_jpg_0.mat | 25 +- .../Glossy__Reflexion_jpg_1.mat | 25 +- .../Glb/[공용]댄스 연습실.Materials/Material.001.mat | 25 +- .../Glb/[공용]댄스 연습실.Materials/Material.002.mat | 25 +- .../Glb/[공용]댄스 연습실.Materials/Material.003.mat | 23 +- .../T_hanging_lights_1001.mat | 25 +- .../Glb/[공용]댄스 연습실.Materials/defaultMat_0.mat | 25 +- .../[공용]댄스 연습실.Materials/embossed-plaster.mat | 23 + .../Scene/[공용]댄스 연습실.unity | 4 +- .../[공용]댄스 연습실/Global Volume Profile.asset | 4 +- .../Scene/[공용]댄스 연습실/LightingData.asset | 4 +- .../Scene/[공용]댄스 연습실/Lightmap-0_comp_dir.png | 4 +- .../[공용]댄스 연습실/Lightmap-0_comp_light.exr | 4 +- .../Scene/[공용]댄스 연습실/Lightmap-1_comp_dir.png | 4 +- .../[공용]댄스 연습실/Lightmap-1_comp_light.exr | 4 +- .../Scene/[공용]댄스 연습실/Lightmap-2_comp_dir.png | 4 +- .../[공용]댄스 연습실/Lightmap-2_comp_light.exr | 4 +- .../Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png | 3 - .../[공용]댄스 연습실/Lightmap-3_comp_dir.png.meta | 117 ---- .../[공용]댄스 연습실/Lightmap-3_comp_light.exr | 3 - .../[공용]댄스 연습실/Lightmap-3_comp_light.exr.meta | 117 ---- .../Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png | 3 - .../[공용]댄스 연습실/Lightmap-4_comp_dir.png.meta | 117 ---- .../[공용]댄스 연습실/Lightmap-4_comp_light.exr | 3 - .../[공용]댄스 연습실/Lightmap-4_comp_light.exr.meta | 117 ---- .../Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png | 3 - .../[공용]댄스 연습실/Lightmap-5_comp_dir.png.meta | 117 ---- .../[공용]댄스 연습실/Lightmap-5_comp_light.exr | 3 - .../[공용]댄스 연습실/Lightmap-5_comp_light.exr.meta | 117 ---- .../Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png | 3 - .../[공용]댄스 연습실/Lightmap-6_comp_dir.png.meta | 117 ---- .../[공용]댄스 연습실/Lightmap-6_comp_light.exr | 3 - .../[공용]댄스 연습실/Lightmap-6_comp_light.exr.meta | 117 ---- .../Scene/[공용]댄스 연습실/ReflectionProbe-0.exr | 4 +- .../[공용]댄스 연습실 Baking Set-Default.CellData.bytes | 2 +- ...용]댄스 연습실 Baking Set-Default.CellOptionalData.bytes | 2 +- .../Contents/BossRaid/Editor/BossRaidSetup.cs | 1 - .../BossRaid/Editor/ParticleCreator.cs | 2 +- .../StreamingleAvatarExport.cs | 2 +- .../StreamingleControllerSetupToolAdvanced.cs | 38 +- .../SpoutOutputScript/Spout&Ndi.prefab | 2 +- .../Editor/BackgroundSceneLoaderWindow.cs | 2 +- .../Editor/BackgroundThumbnailCapture.cs | 2 +- .../Editor/WebsiteBackgroundExporter.cs | 2 +- .../Prop/Editor/PropBrowserWindow.cs | 2 +- .../Prop/Editor/WebsitePropExporter.cs | 2 +- Packages/manifest.json | 4 +- Packages/packages-lock.json | 4 +- ProjectSettings/GraphicsSettings.asset | 4 +- ProjectSettings/PackageManagerSettings.asset | 4 +- 95 files changed, 642 insertions(+), 2958 deletions(-) delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat delete mode 100644 Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Runtime.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef delete mode 100644 Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs delete mode 100644 Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage delete mode 100644 Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Shaders.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader delete mode 100644 Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc delete mode 100644 Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage delete mode 100644 Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png.meta delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr delete mode 100644 Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr.meta diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Editor/OptitrackSetupWindow.cs b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Editor/OptitrackSetupWindow.cs index c11d76366..8ebf69828 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Editor/OptitrackSetupWindow.cs +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Editor/OptitrackSetupWindow.cs @@ -16,7 +16,6 @@ public class OptitrackSetupWindow : EditorWindow // ── 진입점 ──────────────────────────────────────────────────────────────── - [MenuItem("OptiTrack/Animator 설정 창")] public static void OpenFromMenu() => GetWindow("OptiTrack 설정").Show(); public static void Open(OptitrackSkeletonAnimator_Mingle target) diff --git a/Assets/External/Screen Space Cavity Curvature/Demo.meta b/Assets/External/Screen Space Cavity Curvature/Demo.meta deleted file mode 100644 index 9c0d01fd7..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c7f647a83c6674f4a9c40ebd43aec85d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity b/Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity deleted file mode 100644 index cc03a1fd0..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:056a5bc59617cd672fa4e2c07d07033d818a7bd93476f1a377e25758aa16439f -size 34592 diff --git a/Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity.meta b/Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity.meta deleted file mode 100644 index 1a1044be6..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo/Demo.unity.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 57d9676b747e04a54943269ac00aa478 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Demo/Demo.unity - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt b/Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt deleted file mode 100644 index ee2388f92..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:498278a9bd40923604cbc816417d8045a1bfaece8aa42bd3440e77b71c5137b5 -size 196 diff --git a/Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt.meta b/Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt.meta deleted file mode 100644 index 69107e65f..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo/Demo_Readme.txt.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: ade6b4cfebd3fb848a02000f8e236d59 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Demo/Demo_Readme.txt - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat b/Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat deleted file mode 100644 index 4fb6fb375..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat +++ /dev/null @@ -1,333 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-9139891969420624701 -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: 1 ---- !u!114 &-6363685895679108359 -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: da692e001514ec24dbc4cca1949ff7e8, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 2 ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Grey - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: - - DistortionVectors - - MOTIONVECTORS - - TransparentDepthPrepass - - TransparentDepthPostpass - - TransparentBackface - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _AnisotropyMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BentNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BentNormalMapOS: - m_Texture: {fileID: 0} - 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} - - _CoatMaskMap: - 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} - - _DetailMap: - 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} - - _DistortionVectorMap: - 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} - - _EmissiveColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _HeightMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescenceMaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescenceThicknessMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMapOS: - 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} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecularColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SubsurfaceMaskMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TangentMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TangentMapOS: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ThicknessMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _TransmittanceColorMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _AORemapMax: 1 - - _AORemapMin: 0 - - _ATDistance: 1 - - _AddPrecomputedVelocity: 0 - - _AlbedoAffectEmissive: 0 - - _AlphaClip: 0 - - _AlphaCutoff: 0.5 - - _AlphaCutoffEnable: 0 - - _AlphaCutoffPostpass: 0.5 - - _AlphaCutoffPrepass: 0.5 - - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 - - _AlphaSrcBlend: 1 - - _Anisotropy: 0 - - _Blend: 0 - - _BlendMode: 0 - - _BumpScale: 1 - - _CoatMask: 0 - - _Cull: 2 - - _CullMode: 2 - - _CullModeForward: 2 - - _Cutoff: 0.5 - - _DepthOffsetEnable: 0 - - _DetailAlbedoScale: 1 - - _DetailNormalMapScale: 1 - - _DetailNormalScale: 1 - - _DetailSmoothnessScale: 1 - - _DiffusionProfile: 0 - - _DiffusionProfileHash: 0 - - _DisplacementLockObjectScale: 1 - - _DisplacementLockTilingScale: 1 - - _DisplacementMode: 0 - - _DistortionBlendMode: 0 - - _DistortionBlurBlendMode: 0 - - _DistortionBlurDstBlend: 1 - - _DistortionBlurRemapMax: 1 - - _DistortionBlurRemapMin: 0 - - _DistortionBlurScale: 1 - - _DistortionBlurSrcBlend: 1 - - _DistortionDepthTest: 1 - - _DistortionDstBlend: 1 - - _DistortionEnable: 0 - - _DistortionScale: 1 - - _DistortionSrcBlend: 1 - - _DistortionVectorBias: -1 - - _DistortionVectorScale: 2 - - _DoubleSidedEnable: 0 - - _DoubleSidedNormalMode: 1 - - _DstBlend: 0 - - _EmissiveColorMode: 1 - - _EmissiveExposureWeight: 1 - - _EmissiveIntensity: 1 - - _EmissiveIntensityUnit: 0 - - _EnableBlendModePreserveSpecularLighting: 1 - - _EnableFogOnTransparent: 1 - - _EnableGeometricSpecularAA: 0 - - _EnergyConservingSpecularColor: 1 - - _EnvironmentReflections: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.261 - - _GlossyReflections: 1 - - _HeightAmplitude: 0.02 - - _HeightCenter: 0.5 - - _HeightMapParametrization: 0 - - _HeightMax: 1 - - _HeightMin: -1 - - _HeightOffset: 0 - - _HeightPoMAmplitude: 2 - - _HeightTessAmplitude: 2 - - _HeightTessCenter: 0.5 - - _InvTilingScale: 1 - - _Ior: 1.5 - - _IridescenceMask: 1 - - _IridescenceThickness: 1 - - _LinkDetailsWithBase: 1 - - _MaterialID: 1 - - _Metallic: 0 - - _Mode: 0 - - _NormalMapSpace: 0 - - _NormalScale: 1 - - _OcclusionStrength: 1 - - _PPDLodThreshold: 5 - - _PPDMaxSamples: 15 - - _PPDMinSamples: 5 - - _PPDPrimitiveLength: 1 - - _PPDPrimitiveWidth: 1 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _ReceivesSSR: 1 - - _RefractionModel: 0 - - _SSRefractionProjectionModel: 0 - - _Smoothness: 0.261 - - _SmoothnessRemapMax: 1 - - _SmoothnessRemapMin: 0 - - _SmoothnessTextureChannel: 0 - - _SpecularAAScreenSpaceVariance: 0.1 - - _SpecularAAThreshold: 0.2 - - _SpecularHighlights: 1 - - _SpecularOcclusionMode: 1 - - _SrcBlend: 1 - - _StencilRef: 0 - - _StencilRefDepth: 8 - - _StencilRefDistortionVec: 4 - - _StencilRefGBuffer: 10 - - _StencilRefMV: 40 - - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 8 - - _StencilWriteMaskDistortionVec: 4 - - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 - - _SubsurfaceMask: 1 - - _SupportDecals: 1 - - _Surface: 0 - - _SurfaceType: 0 - - _TexWorldScale: 1 - - _TexWorldScaleEmissive: 1 - - _Thickness: 1 - - _TransmissionEnable: 1 - - _TransparentBackfaceEnable: 0 - - _TransparentCullMode: 2 - - _TransparentDepthPostpassEnable: 0 - - _TransparentDepthPrepassEnable: 0 - - _TransparentSortPriority: 0 - - _TransparentWritingMotionVec: 0 - - _TransparentZWrite: 0 - - _UVBase: 0 - - _UVDetail: 0 - - _UVEmissive: 0 - - _UVSec: 0 - - _UseEmissiveIntensity: 0 - - _UseShadowThreshold: 0 - - _WorkflowMode: 1 - - _ZTestDepthEqualForOpaque: 3 - - _ZTestGBuffer: 4 - - _ZTestModeDistortion: 4 - - _ZTestTransparent: 4 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 0.7519999, g: 0.7519999, b: 0.7519999, a: 1} - - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.496, g: 0.496, b: 0.496, a: 1} - - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1} - - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0} - - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0} - - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1} - - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0} - - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} diff --git a/Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat.meta b/Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat.meta deleted file mode 100644 index 6d7fa4abd..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Demo/Grey.mat.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 8b69337571b906e4fa155f23ea29714f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Demo/Grey.mat - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/README.txt b/Assets/External/Screen Space Cavity Curvature/README.txt index c4b42a170..7cbe7b3a7 100644 --- a/Assets/External/Screen Space Cavity Curvature/README.txt +++ b/Assets/External/Screen Space Cavity Curvature/README.txt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27025639ef119c1493354101266d06f9dd859f30012ccf215e16669f6a0d2988 -size 1765 +oid sha256:8ef270a742cf12270bad0904ccc1be7cb15b447eb07eaf9bfa2c65d8619f7836 +size 1757 diff --git a/Assets/External/Screen Space Cavity Curvature/README.txt.meta b/Assets/External/Screen Space Cavity Curvature/README.txt.meta index b38eca174..a4afd2307 100644 --- a/Assets/External/Screen Space Cavity Curvature/README.txt.meta +++ b/Assets/External/Screen Space Cavity Curvature/README.txt.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 216995 packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/README.txt - uploadId: 664239 + packageVersion: 6.0.0 + assetPath: Assets/External/Screen Space Cavity Curvature/README.txt + uploadId: 879086 diff --git a/Assets/External/Screen Space Cavity Curvature/Runtime.meta b/Assets/External/Screen Space Cavity Curvature/Runtime.meta deleted file mode 100644 index ebd587b9b..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d7c017c4be4fff94daca8578ebc3991f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef b/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef deleted file mode 100644 index cc0382aa5..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "SSCC.Runtime", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [ - "UNITY_2019_1_OR_NEWER" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef.meta b/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef.meta deleted file mode 100644 index 2f12fbf27..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 85820f79590499445879fb52e62eb068 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Runtime/SSCC.Runtime.asmdef - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs b/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs deleted file mode 100644 index ebc54a24c..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs +++ /dev/null @@ -1,484 +0,0 @@ -using UnityEngine; -using UnityEngine.Rendering; -#if ENABLE_VR -using XRSettings = UnityEngine.XR.XRSettings; -#endif -#if UNITY_EDITOR -using UnityEditor; -#endif -using System; -using System.Collections.Generic; -using UnityEngine.Experimental.Rendering; - -namespace ScreenSpaceCavityCurvature -{ - [ExecuteInEditMode, ImageEffectAllowedInSceneView, AddComponentMenu("SSCC Screen Space Cavity Curvature")] - [RequireComponent(typeof(Camera))] - public class SSCC : MonoBehaviour - { - public enum PerPixelNormals { DeferredGBuffer, Camera, ReconstructedFromDepth } - public enum DebugMode { Disabled, EffectOnly, ViewNormals } - public enum CavitySamples { Low6, Medium8, High12, VeryHigh20 } - public enum CavityResolution { Full, [InspectorName("Half Upscaled")] HalfUpscaled, Half } - public enum OutputEffectTo { Screen, [InspectorName("_SSCCTexture in shaders")] _SSCCTexture } - - [HideInInspector] public Shader ssccShader; - - [Header("Volume Integration")] - [Tooltip("Enable this to use Volume-based SSCC instead of this component. This component will be disabled when Volume SSCC is active.")] - public bool useVolumeSystem = true; - - // - [Tooltip("Lerps the whole effect from 0 to 1.")] [Range(0f, 1f)] public float effectIntensity = 1f; - [Tooltip("Divides effect intensity by (depth * distanceFade).\nZero means effect doesn't fade with distance.")] [Range(0f, 1f)] public float distanceFade = 0f; - - [Space(6)] - - [Tooltip("The radius of curvature calculations in pixels.")] [Range(0, 4)] public int curvaturePixelRadius = 2; - [Tooltip("How bright does curvature get.")] [Range(0f, 5f)] public float curvatureBrights = 2f; - [Tooltip("How dark does curvature get.")] [Range(0f, 5f)] public float curvatureDarks = 3f; - - [Space(6)] - - [Tooltip("The amount of samples used for cavity calculation.")] public CavitySamples cavitySamples = CavitySamples.High12; - [Tooltip("True: Use pow() blending to make colors more saturated in bright/dark areas of cavity.\nFalse: Use additive blending.\n\nWarning: This option being enabled may mess with bloom post processing.")] public bool saturateCavity = true; - [Tooltip("The radius of cavity calculations in world units.")] [Range(0f, 0.5f)] public float cavityRadius = 0.25f; - [Tooltip("How bright does cavity get.")] [Range(0f, 5f)] public float cavityBrights = 3f; - [Tooltip("How dark does cavity get.")] [Range(0f, 5f)] public float cavityDarks = 2f; - [Tooltip("With this option enabled, cavity can be downsampled to massively improve performance at a cost to visual quality. Recommended for mobile platforms.\n\nNon-upscaled half may introduce aliasing.")] public CavityResolution cavityResolution = CavityResolution.Full; - - [Space(6)] - - [Tooltip("Where to get normals from.")] public PerPixelNormals normalsSource = PerPixelNormals.Camera; - [Tooltip("May be useful to check what objects contribute normals, as objects that do not contribute their normals will not contribute to the effect.")] public DebugMode debugMode = DebugMode.Disabled; - - [Space(6)] - - [Tooltip("Screen: Applies the effect over the entire screen.\n\n_SSCCTexture: Instead of writing the effect to the screen, will write the effect into a global shader texture named _SSCCTexture, so you can sample it selectively in your shaders and exclude certain objects from receiving outlines etc. See \"Output To Texture Examples\" folder for example shaders.")] public OutputEffectTo output = OutputEffectTo.Screen; - // - - void CheckParameters() - { - if (GraphicsSettings.defaultRenderPipeline != null) - { - Debug.LogWarning("Please follow the SRP usage instructions."); - enabled = false; - } - - ssccCamera.depthTextureMode |= DepthTextureMode.Depth; - if (normalsSource == PerPixelNormals.Camera) ssccCamera.depthTextureMode |= DepthTextureMode.DepthNormals; - - if (ssccCamera.actualRenderingPath != RenderingPath.DeferredShading && normalsSource == PerPixelNormals.DeferredGBuffer) normalsSource = PerPixelNormals.Camera; - - if (stereoActive && ssccCamera.actualRenderingPath != RenderingPath.DeferredShading && normalsSource != PerPixelNormals.ReconstructedFromDepth) normalsSource = PerPixelNormals.ReconstructedFromDepth; - - if (output == OutputEffectTo._SSCCTexture && ssccCamera.actualRenderingPath == RenderingPath.DeferredShading) normalsSource = PerPixelNormals.ReconstructedFromDepth; //cant get correct normals texture in deferred - } - - OutputEffectTo Output => debugMode != DebugMode.Disabled ? OutputEffectTo.Screen : output; - - // Volume 시스템 확인 메서드 추가 (Built-in 렌더 파이프라인용) - private bool IsVolumeSystemActive() - { - if (!useVolumeSystem) return false; - - try - { - // Built-in 렌더 파이프라인에서는 볼륨 시스템이 없으므로 항상 false 반환 - // URP용 SSCC가 활성화되어 있는지 확인할 수 없으므로 기본적으로 비활성화 - return false; - } - catch (System.Exception e) - { - Debug.LogWarning($"SSCC Volume system check failed: {e.Message}"); - } - - return false; - } - - static class Pass - { - public const int Copy = 0; - public const int GenerateCavity = 1; - public const int HorizontalBlur = 2; - public const int VerticalBlur = 3; - public const int Final = 4; - } - - static class ShaderProperties - { - public static int mainTex = Shader.PropertyToID("_MainTex"); - public static int cavityTex = Shader.PropertyToID("_CavityTex"); - public static int cavityTex1 = Shader.PropertyToID("_CavityTex1"); - public static int tempTex = Shader.PropertyToID("_TempTex"); - public static int uvTransform = Shader.PropertyToID("_UVTransform"); - public static int inputTexelSize = Shader.PropertyToID("_Input_TexelSize"); - public static int cavityTexTexelSize = Shader.PropertyToID("_CavityTex_TexelSize"); - public static int worldToCameraMatrix = Shader.PropertyToID("_WorldToCameraMatrix"); - //public static int uvToView = Shader.PropertyToID("_UVToView"); - - public static int effectIntensity = Shader.PropertyToID("_EffectIntensity"); - public static int distanceFade = Shader.PropertyToID("_DistanceFade"); - - public static int curvaturePixelRadius = Shader.PropertyToID("_CurvaturePixelRadius"); - public static int curvatureRidge = Shader.PropertyToID("_CurvatureBrights"); - public static int curvatureValley = Shader.PropertyToID("_CurvatureDarks"); - - public static int cavityWorldRadius = Shader.PropertyToID("_CavityWorldRadius"); - public static int cavityRidge = Shader.PropertyToID("_CavityBrights"); - public static int cavityValley = Shader.PropertyToID("_CavityDarks"); - - public static int globalSSCCTexture = Shader.PropertyToID("_SSCCTexture"); - } - - Material mat; - Camera ssccCamera; - CommandBuffer cmdBuffer; - int width; - int height; - bool stereoActive; - XRSettings.StereoRenderingMode stereoRenderingMode; - int screenWidth; - int screenHeight; - - CameraEvent cameraEvent => Output == OutputEffectTo.Screen ? CameraEvent.BeforeImageEffectsOpaque : CameraEvent.BeforeForwardOpaque; - CameraEvent[] possibleCameraEvents = new[] { CameraEvent.BeforeImageEffectsOpaque, CameraEvent.BeforeForwardOpaque }; - - Mesh fullscreenTriangle - { - get - { - if (m_FullscreenTriangle != null) return m_FullscreenTriangle; - m_FullscreenTriangle = new Mesh { name = "Fullscreen Triangle" }; - m_FullscreenTriangle.SetVertices(new List { new Vector3(-1f, -1f, 0f), new Vector3(-1f, 3f, 0f), new Vector3(3f, -1f, 0f) }); - m_FullscreenTriangle.SetIndices(new[] { 0, 1, 2 }, MeshTopology.Triangles, 0, false); - m_FullscreenTriangle.UploadMeshData(false); - return m_FullscreenTriangle; - } - } - - bool isCommandBufferDirty - { - get - { - if (m_PreviousCameraEvent != cameraEvent || m_IsCommandBufferDirty || m_PreviousDebugMode != debugMode || m_PreviousWidth != width || m_PreviousHeight != height || m_PreviousRenderingPath != ssccCamera.actualRenderingPath || m_PreviousOutputEffectTo != Output || m_PreviousCavityResolution != cavityResolution) - { - m_PreviousCameraEvent = cameraEvent; m_PreviousDebugMode = debugMode; m_PreviousWidth = width; m_PreviousHeight = height; m_PreviousRenderingPath = ssccCamera.actualRenderingPath; m_PreviousOutputEffectTo = Output; m_PreviousCavityResolution = cavityResolution; - return true; - } - return false; - } - set - { - m_IsCommandBufferDirty = value; - } - } - - RenderTextureDescriptor m_sourceDescriptor; - bool m_IsCommandBufferDirty; - Mesh m_FullscreenTriangle; - CameraEvent m_PreviousCameraEvent; - DebugMode? m_PreviousDebugMode; - int m_PreviousWidth; - int m_PreviousHeight; - RenderingPath m_PreviousRenderingPath; - OutputEffectTo m_PreviousOutputEffectTo; - CavityResolution m_PreviousCavityResolution; - - static RenderTextureFormat defaultHDRRenderTextureFormat - { - get - { - #if UNITY_ANDROID || UNITY_IPHONE || UNITY_TVOS || UNITY_SWITCH || UNITY_EDITOR - RenderTextureFormat format = RenderTextureFormat.RGB111110Float; - #if UNITY_EDITOR - var target = EditorUserBuildSettings.activeBuildTarget; - if (target != BuildTarget.Android && target != BuildTarget.iOS && target != BuildTarget.tvOS && target != BuildTarget.Switch) - return RenderTextureFormat.DefaultHDR; - #endif - if (SystemInfo.SupportsRenderTextureFormat(format)) - return format; - #endif - return RenderTextureFormat.DefaultHDR; - } - } - RenderTextureFormat sourceFormat { get { return ssccCamera.allowHDR ? defaultHDRRenderTextureFormat : RenderTextureFormat.Default; } } - static RenderTextureFormat colorFormat { get { return SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.ARGBHalf) ? RenderTextureFormat.ARGBHalf : RenderTextureFormat.Default; } } - - void OnEnable() - { - if (!SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.Depth)) - { - Debug.LogWarning("SSCC shader is not supported on this platform."); - this.enabled = false; - return; - } - - if (ssccShader == null) ssccShader = Shader.Find("Hidden/SSCC"); - if (ssccShader == null) - { - Debug.LogError("SSCC shader was not found..."); - return; - } - - if (!ssccShader.isSupported) - { - Debug.LogWarning("SSCC shader is not supported on this platform."); - this.enabled = false; - return; - } - - Initialize(); - } - - void OnDisable() - { - ClearCommandBuffer(cmdBuffer); - - if (mat != null) - DestroyImmediate(mat); - if (fullscreenTriangle != null) - DestroyImmediate(fullscreenTriangle); - } - - void OnPreRender() - { - // 씬뷰에서는 SSCC 효과 비활성화 - if (ssccCamera.cameraType == CameraType.SceneView) - { - if (cmdBuffer != null) - { - ClearCommandBuffer(cmdBuffer); - } - return; - } - - // 볼륨 시스템이 활성화되어 있으면 이 컴포넌트는 비활성화 - if (IsVolumeSystemActive()) - { - if (cmdBuffer != null) - { - ClearCommandBuffer(cmdBuffer); - } - return; - } - - if (ssccShader == null || ssccCamera == null) return; - - FetchRenderParameters(); - CheckParameters(); - UpdateMaterialProperties(); - UpdateShaderKeywords(); - - if (isCommandBufferDirty) - { - ClearCommandBuffer(cmdBuffer); - BuildCommandBuffer(cmdBuffer); - ssccCamera.AddCommandBuffer(cameraEvent, cmdBuffer); - isCommandBufferDirty = false; - } - } - - void OnValidate() - { - if (ssccShader == null || ssccCamera == null) return; - - CheckParameters(); - } - - void Initialize() - { - m_sourceDescriptor = new RenderTextureDescriptor(0, 0); - - ssccCamera = GetComponent(); - ssccCamera.forceIntoRenderTexture = true; - - mat = new Material(ssccShader); - mat.hideFlags = HideFlags.HideAndDontSave; - - cmdBuffer = new CommandBuffer { name = "SSCC" }; - isCommandBufferDirty = true; - } - - void FetchRenderParameters() - { - #if !UNITY_SWITCH && ENABLE_VR - if (ssccCamera.stereoEnabled) - { - var xrDesc = XRSettings.eyeTextureDesc; - stereoRenderingMode = XRSettings.StereoRenderingMode.SinglePass; - - if (XRSettings.stereoRenderingMode == XRSettings.StereoRenderingMode.MultiPass) - stereoRenderingMode = XRSettings.StereoRenderingMode.MultiPass; - - #if UNITY_STANDALONE || UNITY_EDITOR || UNITY_PS4 - if (xrDesc.dimension == TextureDimension.Tex2DArray) - stereoRenderingMode = XRSettings.StereoRenderingMode.SinglePassInstanced; - #endif - - if (stereoRenderingMode == XRSettings.StereoRenderingMode.SinglePass) - { - //xrDesc.width /= 2; - xrDesc.vrUsage = VRTextureUsage.None; - } - - width = xrDesc.width; - height = xrDesc.height; - m_sourceDescriptor = xrDesc; - - screenWidth = XRSettings.eyeTextureWidth; - screenHeight = XRSettings.eyeTextureHeight; - - if (stereoRenderingMode == XRSettings.StereoRenderingMode.SinglePass) - screenWidth /= 2; - - stereoActive = true; - } - else - #endif - { - width = ssccCamera.pixelWidth; - height = ssccCamera.pixelHeight; - m_sourceDescriptor.width = width; - m_sourceDescriptor.height = height; - screenWidth = width; - screenHeight = height; - stereoActive = false; - } - - } - - void ClearCommandBuffer(CommandBuffer cmd) - { - if (cmd != null) - { - //if (ssccCamera != null) ssccCamera.RemoveCommandBuffer(cameraEvent, cmd); - if (ssccCamera != null) foreach (var camEvent in possibleCameraEvents) ssccCamera.RemoveCommandBuffer(camEvent, cmd); - cmd.Clear(); - } - } - - void BuildCommandBuffer(CommandBuffer cmd) - { - cmd.SetGlobalVector(ShaderProperties.uvTransform, SystemInfo.graphicsUVStartsAtTop ? new Vector4(1f, -1f, 0f, 1f) : new Vector4(1f, 1f, 0f, 0f)); - - int div = cavityResolution == CavityResolution.Full ? 1 : cavityResolution == CavityResolution.HalfUpscaled ? 2 : 2; - cmd.GetTemporaryRT(ShaderProperties.cavityTex, width / div, height / div, 0, FilterMode.Bilinear, GraphicsFormat.R32G32B32A32_SFloat); - cmd.GetTemporaryRT(ShaderProperties.cavityTex1, width / div, height / div, 0, FilterMode.Bilinear, GraphicsFormat.R32G32B32A32_SFloat); - Render(ShaderProperties.cavityTex, cmd, mat, Pass.GenerateCavity); - - if (Output == OutputEffectTo._SSCCTexture) - { - cmd.ReleaseTemporaryRT(ShaderProperties.globalSSCCTexture); - cmd.GetTemporaryRT(ShaderProperties.globalSSCCTexture, width, height, 0, FilterMode.Bilinear, GraphicsFormat.R16G16B16A16_SFloat); - cmd.SetGlobalTexture(ShaderProperties.globalSSCCTexture, new RenderTargetIdentifier(ShaderProperties.globalSSCCTexture)); - Render(ShaderProperties.globalSSCCTexture, cmd, mat, Pass.Final); - } - else - { - cmd.SetGlobalTexture(ShaderProperties.globalSSCCTexture, BuiltinRenderTextureType.None); - GetScreenSpaceTemporaryRT(cmd, ShaderProperties.tempTex, colorFormat: sourceFormat); - if (stereoActive && ssccCamera.actualRenderingPath != RenderingPath.DeferredShading) - cmd.Blit(BuiltinRenderTextureType.CameraTarget, ShaderProperties.tempTex); - else - RenderWith(BuiltinRenderTextureType.CameraTarget, ShaderProperties.tempTex, cmd, mat, Pass.Copy); - RenderWith(ShaderProperties.tempTex, BuiltinRenderTextureType.CameraTarget, cmd, mat, Pass.Final); - cmd.ReleaseTemporaryRT(ShaderProperties.tempTex); - } - - cmd.ReleaseTemporaryRT(ShaderProperties.cavityTex); - cmd.ReleaseTemporaryRT(ShaderProperties.cavityTex1); - } - - void UpdateMaterialProperties() - { - //float tanHalfFovY = Mathf.Tan(0.5f * ssccCamera.fieldOfView * Mathf.Deg2Rad); - //float invFocalLenX = 1.0f / (1.0f / tanHalfFovY * (screenHeight / (float)screenWidth)); - //float invFocalLenY = 1.0f / (1.0f / tanHalfFovY); - //mat.SetVector(ShaderProperties.uvToView, new Vector4(2.0f * invFocalLenX, -2.0f * invFocalLenY, -1.0f * invFocalLenX, 1.0f * invFocalLenY)); - - mat.SetVector(ShaderProperties.inputTexelSize, new Vector4(1f / width, 1f / height, width, height)); - int div = cavityResolution == SSCC.CavityResolution.Full ? 1 : cavityResolution == SSCC.CavityResolution.HalfUpscaled ? 2 : 2; - mat.SetVector(ShaderProperties.cavityTexTexelSize, new Vector4(1f / (width / div), 1f / (height / div), width / div, height / div)); - mat.SetMatrix(ShaderProperties.worldToCameraMatrix, ssccCamera.worldToCameraMatrix); - - mat.SetFloat(ShaderProperties.effectIntensity, effectIntensity); - mat.SetFloat(ShaderProperties.distanceFade, distanceFade); - - mat.SetFloat(ShaderProperties.curvaturePixelRadius, new float[] { 0f, 0.5f, 1f, 1.5f, 2.5f }[curvaturePixelRadius]); - mat.SetFloat(ShaderProperties.curvatureRidge, curvatureBrights == 0f ? 999f : (5f - curvatureBrights)); - mat.SetFloat(ShaderProperties.curvatureValley, curvatureDarks == 0f ? 999f : (5f - curvatureDarks)); - - mat.SetFloat(ShaderProperties.cavityWorldRadius, cavityRadius); - mat.SetFloat(ShaderProperties.cavityRidge, cavityBrights * 2f); - mat.SetFloat(ShaderProperties.cavityValley, cavityDarks * 2f); - } - - void UpdateShaderKeywords() - { - mat.shaderKeywords = new string[] - { - ssccCamera.orthographic ? "ORTHOGRAPHIC_PROJECTION" : "__", - debugMode == DebugMode.EffectOnly ? "DEBUG_EFFECT" : debugMode == DebugMode.ViewNormals ? "DEBUG_NORMALS" : "__", - normalsSource == PerPixelNormals.Camera ? "NORMALS_CAMERA" : normalsSource == PerPixelNormals.ReconstructedFromDepth ? "NORMALS_RECONSTRUCT" : "__", - cavitySamples == CavitySamples.Low6 ? "CAVITY_SAMPLES_6" : cavitySamples == CavitySamples.Medium8 ? "CAVITY_SAMPLES_8" : cavitySamples == CavitySamples.High12 ? "CAVITY_SAMPLES_12" : cavitySamples == CavitySamples.VeryHigh20 ? "CAVITY_SAMPLES_20" : "", - saturateCavity ? "SATURATE_CAVITY" : "__", - Output == OutputEffectTo._SSCCTexture ? "OUTPUT_TO_TEXTURE" : "__", - cavityResolution == CavityResolution.HalfUpscaled ? "UPSCALE_CAVITY" : "__" - }; - } - - - - //----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - - RenderTextureDescriptor GetDefaultDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default) - { - var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height, m_sourceDescriptor.colorFormat, depthBufferBits); - modifiedDesc.dimension = m_sourceDescriptor.dimension; - modifiedDesc.volumeDepth = m_sourceDescriptor.volumeDepth; - modifiedDesc.vrUsage = m_sourceDescriptor.vrUsage; - modifiedDesc.msaaSamples = m_sourceDescriptor.msaaSamples; - modifiedDesc.memoryless = m_sourceDescriptor.memoryless; - - modifiedDesc.useMipMap = m_sourceDescriptor.useMipMap; - modifiedDesc.autoGenerateMips = m_sourceDescriptor.autoGenerateMips; - modifiedDesc.enableRandomWrite = m_sourceDescriptor.enableRandomWrite; - modifiedDesc.shadowSamplingMode = m_sourceDescriptor.shadowSamplingMode; - - if (ssccCamera.allowDynamicResolution) - modifiedDesc.useDynamicScale = true; //IF YOU ARE GETTING AN ERROR HERE, UNFORTUNATELY YOUR UNITY VERSION IS TOO LOW FOR THIS ASSET - - if (colorFormat != RenderTextureFormat.Default) modifiedDesc.colorFormat = colorFormat; - - if (readWrite == RenderTextureReadWrite.sRGB) modifiedDesc.sRGB = true; - else if (readWrite == RenderTextureReadWrite.Linear) modifiedDesc.sRGB = false; - else if (readWrite == RenderTextureReadWrite.Default) modifiedDesc.sRGB = QualitySettings.activeColorSpace == ColorSpace.Linear; - - return modifiedDesc; - } - - void GetScreenSpaceTemporaryRT(CommandBuffer cmd, int nameID, int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default, FilterMode filter = FilterMode.Bilinear, int widthOverride = 0, int heightOverride = 0) - { - var desc = GetDefaultDescriptor(depthBufferBits, colorFormat, readWrite); - if (widthOverride > 0) desc.width = widthOverride; - if (heightOverride > 0) desc.height = heightOverride; - if (stereoActive && desc.dimension == TextureDimension.Tex2DArray) desc.dimension = TextureDimension.Tex2D; - cmd.GetTemporaryRT(nameID, desc, filter); - } - - void RenderWith(RenderTargetIdentifier source, RenderTargetIdentifier destination, CommandBuffer cmd, Material material, int pass = 0) - { - cmd.SetGlobalTexture(ShaderProperties.mainTex, source); - cmd.SetRenderTarget(destination); - cmd.DrawMesh(fullscreenTriangle, Matrix4x4.identity, material, 0, pass); - } - - void Render(RenderTargetIdentifier destination, CommandBuffer cmd, Material material, int pass = 0) - { - cmd.SetRenderTarget(destination); - cmd.DrawMesh(fullscreenTriangle, Matrix4x4.identity, material, 0, pass); - } - - } -} diff --git a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs.meta b/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs.meta deleted file mode 100644 index dd45cca0e..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Runtime/SSCC.cs.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: 1d35af20b508d5546ba80581bc1b979a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: - - ssccShader: {fileID: 4800000, guid: 89ec5ce1bd95ed946a65b649164a9c1d, type: 3} - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Runtime/SSCC.cs - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage b/Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage deleted file mode 100644 index ebe2c0eda..000000000 --- a/Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cc0564f5b20131051a3d2eb423e4770a726d3d0727caa0e14d742671cee3e62 -size 27889 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta b/Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta deleted file mode 100644 index 329f8d25b..000000000 --- a/Assets/External/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 7dd73fb2fec8fb642be983cf08cfd6b1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/SRP/HDRP.unitypackage - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt b/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt index 67d4f86cd..4fef10455 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt +++ b/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e2dce4f2045aad5bedb0ff384e8867f1caa430fe3211ace5b4e009d97a6ae8e -size 942 +oid sha256:c36210a4d20c39ef5d072c76e0479c325c5ed0a34f95f824c3411694057b26d8 +size 926 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt.meta b/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt.meta index f70e6c4f9..f2a2d974d 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt.meta +++ b/Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 216995 packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt - uploadId: 664239 + packageVersion: 6.0.0 + assetPath: Assets/External/Screen Space Cavity Curvature/SRP/README HDRP & URP.txt + uploadId: 879086 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage b/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage index cbcc78aab..2fbe84624 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca210626d74bcf76704895efaab4d833684e3eb3b3765cf036d52205e6a71af9 -size 24299 +oid sha256:e12ba0b7e65f2888adaf421b669eeb2fc0a9108c8f8244eb4aacb40dfa625b4f +size 31008 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta b/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta index e5571ce8f..e90889f10 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta @@ -9,6 +9,6 @@ AssetOrigin: serializedVersion: 1 productId: 216995 packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/SRP/URP.unitypackage - uploadId: 664239 + packageVersion: 6.0.0 + assetPath: Assets/External/Screen Space Cavity Curvature/SRP/URP.unitypackage + uploadId: 879086 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Demo_URP/Grey_URP.mat b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Demo_URP/Grey_URP.mat index b5c9f4543..f6ea7e5b2 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Demo_URP/Grey_URP.mat +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Demo_URP/Grey_URP.mat @@ -333,6 +333,7 @@ Material: - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCC.cs b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCC.cs index b120332b3..81ae7e74d 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCC.cs +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCC.cs @@ -42,7 +42,7 @@ namespace ScreenSpaceCavityCurvature.Universal // [Header("(Make sure Post Processing and Depth Texture are enabled.)")] - [Tooltip("Lerps the whole effect from 0 to 1.")] public ClampedFloatParameter effectIntensity = new ClampedFloatParameter(0f, 0f, 1f); + [Tooltip("Lerps the whole effect from 0 to 1.")] public ClampedFloatParameter effectIntensity = new ClampedFloatParameter(1f, 0f, 1f); [Tooltip("Divides effect intensity by (depth * distanceFade).\nZero means effect doesn't fade with distance.")] public ClampedFloatParameter distanceFade = new ClampedFloatParameter(0f, 0f, 1f); [Space(6)] @@ -73,11 +73,6 @@ namespace ScreenSpaceCavityCurvature.Universal [Space(6)] [Tooltip("Screen: Applies the effect over the entire screen.\n\n_SSCCTexture: Instead of writing the effect to the screen, will write the effect into a global shader texture named _SSCCTexture, so you can sample it selectively in your shaders and exclude certain objects from receiving outlines etc. See \"Output To Texture Examples\" folder for example shaders.")] public OutputParameter output = new OutputParameter(OutputEffectTo.Screen); - - [Space(6)] - - [Header("NiloToon Integration")] - [Tooltip("Enable NiloToon character masking. When enabled, SSCC effect will not be applied to NiloToon characters.")] public BoolParameter enableNiloToonMasking = new BoolParameter(true); // public bool IsActive() => effectIntensity.value > 0f; diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCCRendererFeature.cs b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCCRendererFeature.cs index 70e6843c1..1fd34f35d 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCCRendererFeature.cs +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Runtime/SSCCRendererFeature.cs @@ -1,16 +1,21 @@ //#define URP_10_0_0_OR_NEWER //#define UNITY_2021_2_OR_NEWER +#pragma warning disable CS0618 +#pragma warning disable CS0672 + using System.Collections.Generic; using UnityEngine; using UnityEngine.Experimental.Rendering; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; + +#if UNITY_6000_0_OR_NEWER using UnityEngine.Rendering.RenderGraphModule; +#endif namespace ScreenSpaceCavityCurvature.Universal { - public class SSCCRendererFeature : ScriptableRendererFeature { private class SSCCRenderPass : ScriptableRenderPass @@ -31,9 +36,11 @@ namespace ScreenSpaceCavityCurvature.Universal #endif } - SSCC.OutputEffectTo Output => sscc.debugMode.value != SSCC.DebugMode.Disabled ? SSCC.OutputEffectTo.Screen : sscc.output.value; + SSCC.OutputEffectTo Output => (sscc != null && sscc.debugMode.value != SSCC.DebugMode.Disabled) ? SSCC.OutputEffectTo.Screen : (sscc != null ? sscc.output.value : SSCC.OutputEffectTo.Screen); public SSCC sscc; + public bool useNiloToonCharacterMask; + public bool debugCharacterMask; static class Pass { @@ -54,7 +61,6 @@ namespace ScreenSpaceCavityCurvature.Universal public static int inputTexelSize = Shader.PropertyToID("_Input_TexelSize"); public static int cavityTexTexelSize = Shader.PropertyToID("_CavityTex_TexelSize"); public static int worldToCameraMatrix = Shader.PropertyToID("_WorldToCameraMatrix"); - //public static int uvToView = Shader.PropertyToID("_UVToView"); public static int effectIntensity = Shader.PropertyToID("_EffectIntensity"); public static int distanceFade = Shader.PropertyToID("_DistanceFade"); @@ -68,25 +74,42 @@ namespace ScreenSpaceCavityCurvature.Universal public static int cavityValley = Shader.PropertyToID("_CavityDarks"); public static int globalSSCCTexture = Shader.PropertyToID("_SSCCTexture"); - public static int niloToonPrepassBufferTex = Shader.PropertyToID("_NiloToonPrepassBufferTex"); } Material mat { get; set; } RenderTargetIdentifier source { get; set; } CameraData cameraData { get; set; } RenderTextureDescriptor sourceDesc { get; set; } - public SSCCRendererFeature feature { get; set; } public void Setup(Shader shader, ScriptableRenderer renderer, RenderingData renderingData) { if (mat == null) mat = CoreUtils.CreateEngineMaterial(shader); + FetchVolumeComponent(); + + if (sscc != null && sscc.IsActive()) + { + if (Output == SSCC.OutputEffectTo.Screen) + { + renderPassEvent = RenderPassEvent.BeforeRenderingTransparents; + } + else + { +#if UNITY_6000_0_OR_NEWER + // AfterRenderingPrePasses is the earliest point where depth/normals + // from the prepass are available. Using BeforeRenderingOpaques causes + // the Render Graph to defer the pass until after opaques when it sees + // the dependency on cameraDepthTexture. + renderPassEvent = RenderPassEvent.AfterRenderingPrePasses; +#else + renderPassEvent = RenderPassEvent.BeforeRenderingOpaques; +#endif + } + } + #if !URP_10_0_0_OR_NEWER source = renderer.cameraColorTarget; cameraData = renderingData.cameraData; - - FetchVolumeComponent(); - renderPassEvent = Output == SSCC.OutputEffectTo.Screen ? feature.screenOutputPassEvent : RenderPassEvent.BeforeRenderingOpaques; #endif } @@ -97,7 +120,7 @@ namespace ScreenSpaceCavityCurvature.Universal public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) { #if UNITY_2022_1_OR_NEWER - source = renderingData.cameraData.renderer.cameraColorTargetHandle; //implicit conversion hopefully will exist for forseable future + source = renderingData.cameraData.renderer.cameraColorTargetHandle; #else source = renderingData.cameraData.renderer.cameraColorTarget; #endif @@ -106,7 +129,7 @@ namespace ScreenSpaceCavityCurvature.Universal FetchVolumeComponent(); var passInput = ScriptableRenderPassInput.Depth; - if (sscc.normalsSource.value == SSCC.PerPixelNormals.Camera) + if (sscc != null && sscc.normalsSource.value == SSCC.PerPixelNormals.Camera) passInput |= ScriptableRenderPassInput.Normal; ConfigureInput(passInput); @@ -114,8 +137,6 @@ namespace ScreenSpaceCavityCurvature.Universal #if UNITY_2021_2_OR_NEWER ConfigureColorStoreAction(RenderBufferStoreAction.DontCare); #endif - - renderPassEvent = Output == SSCC.OutputEffectTo.Screen ? feature.screenOutputPassEvent : RenderPassEvent.BeforeRenderingOpaques; if (Output == SSCC.OutputEffectTo._SSCCTexture) #if UNITY_2022_1_OR_NEWER @@ -132,15 +153,15 @@ namespace ScreenSpaceCavityCurvature.Universal FetchVolumeComponent(); - if (!sscc.IsActive()) return; + if (sscc == null || !sscc.IsActive()) return; cameraTextureDescriptor.msaaSamples = 1; cameraTextureDescriptor.depthBufferBits = 0; sourceDesc = cameraTextureDescriptor; CheckParameters(); - UpdateMaterialProperties(); - UpdateShaderKeywords(); + UpdateMaterialProperties(cameraData.camera, sourceDesc.width, sourceDesc.height); + UpdateShaderKeywords(cameraData.camera); if (Output == SSCC.OutputEffectTo._SSCCTexture) #if UNITY_2022_1_OR_NEWER @@ -150,7 +171,6 @@ namespace ScreenSpaceCavityCurvature.Universal #endif } - [System.Obsolete("This rendering path is for compatibility mode only (render graph disabled). Use RecordRenderGraph with RenderGraph.")] public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) { if (mat == null) @@ -158,22 +178,19 @@ namespace ScreenSpaceCavityCurvature.Universal Debug.LogError("SSCC material has not been correctly initialized..."); return; } - if (!sscc.IsActive()) return; + if (sscc == null || !sscc.IsActive()) return; var cmd = CommandBufferPool.Get("SSCC"); - // NiloToon prepass 텍스처는 이미 각 카메라에서 자동 생성되므로 그대로 사용 - if (sscc.enableNiloToonMasking.value) - { - // NiloToon prepass 텍스처가 이미 전역으로 설정되어 있으므로 추가 설정 불필요 - // _NiloToonPrepassBufferTex는 NiloToon 시스템에서 자동으로 관리됨 - } - int div = sscc.cavityResolution.value == SSCC.CavityResolution.Full ? 1 : sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled ? 2 : 2; cmd.GetTemporaryRT(ShaderProperties.cavityTex, sourceDesc.width / div, sourceDesc.height / div, 0, FilterMode.Bilinear, GraphicsFormat.R32G32B32A32_SFloat); cmd.GetTemporaryRT(ShaderProperties.cavityTex1, sourceDesc.width / div, sourceDesc.height / div, 0, FilterMode.Bilinear, GraphicsFormat.R32G32B32A32_SFloat); Render(ShaderProperties.cavityTex, cmd, mat, Pass.GenerateCavity); - //RenderWith(ShaderProperties.cavityTex, ShaderProperties.cavityTex1, cmd, mat, Pass.HorizontalBlur); - //RenderWith(ShaderProperties.cavityTex1, ShaderProperties.cavityTex, cmd, mat, Pass.VerticalBlur); + + if (sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled) + { + RenderWith(ShaderProperties.cavityTex, ShaderProperties.cavityTex1, cmd, mat, Pass.HorizontalBlur); + RenderWith(ShaderProperties.cavityTex1, ShaderProperties.cavityTex, cmd, mat, Pass.VerticalBlur); + } if (Output == SSCC.OutputEffectTo._SSCCTexture) { @@ -196,6 +213,204 @@ namespace ScreenSpaceCavityCurvature.Universal context.ExecuteCommandBuffer(cmd); CommandBufferPool.Release(cmd); } + +#if UNITY_6000_0_OR_NEWER + private class CavityPassData { public Material mat; public Mesh mesh; public TextureHandle cavityTex; } + private class CopyPassData { public Material mat; public Mesh mesh; public TextureHandle source; public TextureHandle destination; } + private class BlurPassData { public Material mat; public Mesh mesh; public TextureHandle source; public TextureHandle destination; } + private class FinalPassData { public Material mat; public Mesh mesh; public TextureHandle mainTex; public TextureHandle cavityTex; public TextureHandle destination; } + private class FinalToTexturePassData { public Material mat; public Mesh mesh; public TextureHandle cavityTex; public TextureHandle destination; } + + public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) + { + if (mat == null) + { + Debug.LogError("SSCC material has not been correctly initialized..."); + return; + } + + FetchVolumeComponent(); + if (sscc == null || !sscc.IsActive()) return; + + UniversalResourceData resourceData = frameData.Get(); + UniversalCameraData universalCameraData = frameData.Get(); + + CheckParameters(); + + RenderTextureDescriptor desc = universalCameraData.cameraTargetDescriptor; + desc.msaaSamples = 1; + desc.depthBufferBits = 0; + + UpdateMaterialProperties(universalCameraData.camera, desc.width, desc.height); + UpdateShaderKeywords(universalCameraData.camera); + + int div = sscc.cavityResolution.value == SSCC.CavityResolution.Full ? 1 : 2; + + RenderTextureDescriptor cavityDesc = new RenderTextureDescriptor(Mathf.Max(1, desc.width / div), Mathf.Max(1, desc.height / div), GraphicsFormat.R32G32B32A32_SFloat, 0) { msaaSamples = 1 }; + + TextureHandle cavityTex = UniversalRenderer.CreateRenderGraphTexture(renderGraph, cavityDesc, "_SSCCCavityTex", false, FilterMode.Bilinear); + + Mesh passMesh = fullscreenMesh; + + using (IUnsafeRenderGraphBuilder builder = renderGraph.AddUnsafePass("SSCC Generate Cavity", out CavityPassData passData)) + { + passData.mat = mat; + passData.mesh = passMesh; + passData.cavityTex = cavityTex; + + builder.UseTexture(cavityTex, AccessFlags.Write); + + if (resourceData.cameraDepthTexture.IsValid()) + builder.UseTexture(resourceData.cameraDepthTexture, AccessFlags.Read); + if (sscc.normalsSource.value == SSCC.PerPixelNormals.Camera && resourceData.cameraNormalsTexture.IsValid()) + builder.UseTexture(resourceData.cameraNormalsTexture, AccessFlags.Read); + + builder.AllowGlobalStateModification(true); + + builder.SetRenderFunc(static (CavityPassData data, UnsafeGraphContext ctx) => + { + CommandBuffer cmd = CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd); + cmd.SetRenderTarget(data.cavityTex, 0, CubemapFace.Unknown, -1); + cmd.DrawMesh(data.mesh, Matrix4x4.identity, data.mat, 0, Pass.GenerateCavity); + }); + } + + if (sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled) + { + TextureHandle cavityTex1 = UniversalRenderer.CreateRenderGraphTexture(renderGraph, cavityDesc, "_SSCCCavityTex1", false, FilterMode.Bilinear); + + using (IUnsafeRenderGraphBuilder builder = renderGraph.AddUnsafePass("SSCC Horizontal Blur", out BlurPassData passData)) + { + passData.mat = mat; + passData.mesh = passMesh; + passData.source = cavityTex; + passData.destination = cavityTex1; + + builder.UseTexture(cavityTex, AccessFlags.Read); + builder.UseTexture(cavityTex1, AccessFlags.Write); + builder.AllowGlobalStateModification(true); + + builder.SetRenderFunc(static (BlurPassData data, UnsafeGraphContext ctx) => + { + CommandBuffer cmd = CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd); + cmd.SetGlobalTexture(ShaderProperties.mainTex, data.source); + cmd.SetRenderTarget(data.destination, 0, CubemapFace.Unknown, -1); + cmd.DrawMesh(data.mesh, Matrix4x4.identity, data.mat, 0, Pass.HorizontalBlur); + }); + } + + using (IUnsafeRenderGraphBuilder builder = renderGraph.AddUnsafePass("SSCC Vertical Blur", out BlurPassData passData)) + { + passData.mat = mat; + passData.mesh = passMesh; + passData.source = cavityTex1; + passData.destination = cavityTex; + + builder.UseTexture(cavityTex1, AccessFlags.Read); + builder.UseTexture(cavityTex, AccessFlags.Write); + builder.AllowGlobalStateModification(true); + + builder.SetRenderFunc(static (BlurPassData data, UnsafeGraphContext ctx) => + { + CommandBuffer cmd = CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd); + cmd.SetGlobalTexture(ShaderProperties.mainTex, data.source); + cmd.SetRenderTarget(data.destination, 0, CubemapFace.Unknown, -1); + cmd.DrawMesh(data.mesh, Matrix4x4.identity, data.mat, 0, Pass.VerticalBlur); + }); + } + } + + if (Output == SSCC.OutputEffectTo._SSCCTexture) + { + RenderTextureDescriptor ssccTexDesc = new RenderTextureDescriptor(desc.width, desc.height, GraphicsFormat.R16G16B16A16_SFloat, 0) { msaaSamples = 1 }; + + TextureHandle ssccTex = UniversalRenderer.CreateRenderGraphTexture(renderGraph, ssccTexDesc, "_SSCCTexture", false, FilterMode.Bilinear); + + using (IUnsafeRenderGraphBuilder builder = renderGraph.AddUnsafePass("SSCC Final (Texture)", out FinalToTexturePassData passData)) + { + passData.mat = mat; + passData.mesh = passMesh; + passData.cavityTex = cavityTex; + passData.destination = ssccTex; + + builder.UseTexture(cavityTex, AccessFlags.Read); + builder.UseTexture(ssccTex, AccessFlags.Write); + + if (resourceData.cameraDepthTexture.IsValid()) + builder.UseTexture(resourceData.cameraDepthTexture, AccessFlags.Read); + if (sscc.normalsSource.value == SSCC.PerPixelNormals.Camera && resourceData.cameraNormalsTexture.IsValid()) + builder.UseTexture(resourceData.cameraNormalsTexture, AccessFlags.Read); + + builder.AllowGlobalStateModification(true); + + // Instruct the Render Graph engine to persist and attach this Texture property beyond the graph + builder.SetGlobalTextureAfterPass(ssccTex, ShaderProperties.globalSSCCTexture); + + builder.SetRenderFunc(static (FinalToTexturePassData data, UnsafeGraphContext ctx) => + { + CommandBuffer cmd = CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd); + cmd.SetGlobalTexture(ShaderProperties.cavityTex, data.cavityTex); + cmd.SetRenderTarget(data.destination, 0, CubemapFace.Unknown, -1); + cmd.DrawMesh(data.mesh, Matrix4x4.identity, data.mat, 0, Pass.Final); + }); + } + } + else + { + TextureHandle cameraColor = resourceData.activeColorTexture; + TextureHandle tempTex = UniversalRenderer.CreateRenderGraphTexture(renderGraph, desc, "_SSCCTemp", false, FilterMode.Bilinear); + + using (IUnsafeRenderGraphBuilder builder = renderGraph.AddUnsafePass("SSCC Copy", out CopyPassData passData)) + { + passData.mat = mat; + passData.mesh = passMesh; + passData.source = cameraColor; + passData.destination = tempTex; + + builder.UseTexture(cameraColor, AccessFlags.Read); + builder.UseTexture(tempTex, AccessFlags.Write); + builder.AllowGlobalStateModification(true); + + builder.SetRenderFunc(static (CopyPassData data, UnsafeGraphContext ctx) => + { + CommandBuffer cmd = CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd); + cmd.SetGlobalTexture(ShaderProperties.mainTex, data.source); + cmd.SetRenderTarget(data.destination, 0, CubemapFace.Unknown, -1); + cmd.DrawMesh(data.mesh, Matrix4x4.identity, data.mat, 0, Pass.Copy); + }); + } + + using (IUnsafeRenderGraphBuilder builder = renderGraph.AddUnsafePass("SSCC Final", out FinalPassData passData)) + { + passData.mat = mat; + passData.mesh = passMesh; + passData.mainTex = tempTex; + passData.cavityTex = cavityTex; + passData.destination = cameraColor; + + builder.UseTexture(tempTex, AccessFlags.Read); + builder.UseTexture(cavityTex, AccessFlags.Read); + builder.UseTexture(cameraColor, AccessFlags.Write); + + if (resourceData.cameraDepthTexture.IsValid()) + builder.UseTexture(resourceData.cameraDepthTexture, AccessFlags.Read); + if (sscc.normalsSource.value == SSCC.PerPixelNormals.Camera && resourceData.cameraNormalsTexture.IsValid()) + builder.UseTexture(resourceData.cameraNormalsTexture, AccessFlags.Read); + + builder.AllowGlobalStateModification(true); + + builder.SetRenderFunc(static (FinalPassData data, UnsafeGraphContext ctx) => + { + CommandBuffer cmd = CommandBufferHelpers.GetNativeCommandBuffer(ctx.cmd); + cmd.SetGlobalTexture(ShaderProperties.mainTex, data.mainTex); + cmd.SetGlobalTexture(ShaderProperties.cavityTex, data.cavityTex); + cmd.SetRenderTarget(data.destination, 0, CubemapFace.Unknown, -1); + cmd.DrawMesh(data.mesh, Matrix4x4.identity, data.mat, 0, Pass.Final); + }); + } + } + } +#endif public void Cleanup() { @@ -208,20 +423,12 @@ namespace ScreenSpaceCavityCurvature.Universal sscc = VolumeManager.instance.stack.GetComponent(); } - void UpdateMaterialProperties() + void UpdateMaterialProperties(Camera camera, int sourceWidth, int sourceHeight) { - var sourceWidth = cameraData.cameraTargetDescriptor.width; - var sourceHeight = cameraData.cameraTargetDescriptor.height; - - //float tanHalfFovY = Mathf.Tan(0.5f * cameraData.camera.fieldOfView * Mathf.Deg2Rad); - //float invFocalLenX = 1.0f / (1.0f / tanHalfFovY * (sourceHeight / (float)sourceWidth)); - //float invFocalLenY = 1.0f / (1.0f / tanHalfFovY); - //material.SetVector(ShaderProperties.uvToView, new Vector4(2.0f * invFocalLenX, -2.0f * invFocalLenY, -1.0f * invFocalLenX, 1.0f * invFocalLenY)); - mat.SetVector(ShaderProperties.inputTexelSize, new Vector4(1f / sourceWidth, 1f / sourceHeight, sourceWidth, sourceHeight)); int div = sscc.cavityResolution.value == SSCC.CavityResolution.Full ? 1 : sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled ? 2 : 2; mat.SetVector(ShaderProperties.cavityTexTexelSize, new Vector4(1f / (sourceWidth / div), 1f / (sourceHeight / div), sourceWidth / div, sourceHeight / div)); - mat.SetMatrix(ShaderProperties.worldToCameraMatrix, cameraData.camera.worldToCameraMatrix); + mat.SetMatrix(ShaderProperties.worldToCameraMatrix, camera.worldToCameraMatrix); mat.SetFloat(ShaderProperties.effectIntensity, sscc.effectIntensity.value); mat.SetFloat(ShaderProperties.distanceFade, sscc.distanceFade.value); @@ -235,36 +442,22 @@ namespace ScreenSpaceCavityCurvature.Universal mat.SetFloat(ShaderProperties.cavityValley, sscc.cavityDarks.value * 2f); } - private void UpdateShaderKeywords() + void UpdateShaderKeywords(Camera camera) { - if (mat == null) return; - - // 디버그 모드 키워드 설정 - bool debugEffect = sscc.debugMode.value == SSCC.DebugMode.EffectOnly; - bool debugNormals = sscc.debugMode.value == SSCC.DebugMode.ViewNormals; - - CoreUtils.SetKeyword(mat, "DEBUG_EFFECT", debugEffect); - CoreUtils.SetKeyword(mat, "DEBUG_NORMALS", debugNormals); - - // NiloToon 마스킹 키워드 설정 - CoreUtils.SetKeyword(mat, "CHARACTER_MASKING", sscc.enableNiloToonMasking.value); - - // 기타 키워드 설정 - CoreUtils.SetKeyword(mat, "ORTHOGRAPHIC_PROJECTION", cameraData.camera.orthographic); - CoreUtils.SetKeyword(mat, "NORMALS_RECONSTRUCT", sscc.normalsSource.value == SSCC.PerPixelNormals.ReconstructedFromDepth); - CoreUtils.SetKeyword(mat, "SATURATE_CAVITY", sscc.saturateCavity.value); - CoreUtils.SetKeyword(mat, "OUTPUT_TO_TEXTURE", Output == SSCC.OutputEffectTo._SSCCTexture); - CoreUtils.SetKeyword(mat, "UPSCALE_CAVITY", sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled); - - // Cavity 샘플 수 키워드 설정 - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_6", sscc.cavitySamples.value == SSCC.CavitySamples.Low6); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_8", sscc.cavitySamples.value == SSCC.CavitySamples.Medium8); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_12", sscc.cavitySamples.value == SSCC.CavitySamples.High12); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_20", sscc.cavitySamples.value == SSCC.CavitySamples.VeryHigh20); + mat.shaderKeywords = new string[] + { + camera.orthographic ? "ORTHOGRAPHIC_PROJECTION" : "__", + sscc.debugMode.value == SSCC.DebugMode.EffectOnly ? "DEBUG_EFFECT" : sscc.debugMode.value == SSCC.DebugMode.ViewNormals ? "DEBUG_NORMALS" : "__", + sscc.normalsSource.value == SSCC.PerPixelNormals.ReconstructedFromDepth ? "NORMALS_RECONSTRUCT" : "__", + sscc.cavitySamples.value == SSCC.CavitySamples.Low6 ? "CAVITY_SAMPLES_6" : sscc.cavitySamples.value == SSCC.CavitySamples.Medium8 ? "CAVITY_SAMPLES_8" : sscc.cavitySamples.value == SSCC.CavitySamples.High12 ? "CAVITY_SAMPLES_12" : sscc.cavitySamples.value == SSCC.CavitySamples.VeryHigh20 ? "CAVITY_SAMPLES_20" : "", + sscc.saturateCavity.value ? "SATURATE_CAVITY" : "__", + Output == SSCC.OutputEffectTo._SSCCTexture ? "OUTPUT_TO_TEXTURE" : "__", + sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled ? "UPSCALE_CAVITY" : "__", + useNiloToonCharacterMask ? "CHARACTER_MASKING" : "__", + (useNiloToonCharacterMask && debugCharacterMask) ? "DEBUG_CHARACTER_MASK" : "__" + }; } - - //----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- static Mesh s_FullscreenMesh = null; @@ -308,174 +501,17 @@ namespace ScreenSpaceCavityCurvature.Universal cmd.SetRenderTarget(destination, 0, CubemapFace.Unknown, -1); cmd.DrawMesh(fullscreenMesh, Matrix4x4.identity, material, 0, passIndex); } - - // ===== Render Graph Implementation ===== - - private class PassData - { - public Material material; - public TextureHandle cameraColorTarget; - public TextureHandle cavityTex; - public TextureHandle tempTex; - public TextureHandle ssccOutputTex; - } - - public override void RecordRenderGraph(RenderGraph renderGraph, ContextContainer frameData) - { - if (mat == null) - { - Debug.LogError("SSCC material has not been correctly initialized..."); - return; - } - - FetchVolumeComponent(); - if (sscc == null || !sscc.IsActive()) return; - - var resourceData = frameData.Get(); - var cameraData = frameData.Get(); - - var sourceWidth = cameraData.cameraTargetDescriptor.width; - var sourceHeight = cameraData.cameraTargetDescriptor.height; - int div = sscc.cavityResolution.value == SSCC.CavityResolution.Full ? 1 : 2; - bool outputToTexture = Output == SSCC.OutputEffectTo._SSCCTexture; - - // Update material properties - mat.SetVector(ShaderProperties.inputTexelSize, new Vector4(1f / sourceWidth, 1f / sourceHeight, sourceWidth, sourceHeight)); - mat.SetVector(ShaderProperties.cavityTexTexelSize, new Vector4(1f / (sourceWidth / div), 1f / (sourceHeight / div), sourceWidth / div, sourceHeight / div)); - mat.SetMatrix(ShaderProperties.worldToCameraMatrix, cameraData.camera.worldToCameraMatrix); - mat.SetFloat(ShaderProperties.effectIntensity, sscc.effectIntensity.value); - mat.SetFloat(ShaderProperties.distanceFade, sscc.distanceFade.value); - mat.SetFloat(ShaderProperties.curvaturePixelRadius, new float[] { 0f, 0.5f, 1f, 1.5f, 2.5f }[sscc.curvaturePixelRadius.value]); - mat.SetFloat(ShaderProperties.curvatureRidge, sscc.curvatureBrights.value == 0f ? 999f : (5f - sscc.curvatureBrights.value)); - mat.SetFloat(ShaderProperties.curvatureValley, sscc.curvatureDarks.value == 0f ? 999f : (5f - sscc.curvatureDarks.value)); - mat.SetFloat(ShaderProperties.cavityWorldRadius, sscc.cavityRadius.value); - mat.SetFloat(ShaderProperties.cavityRidge, sscc.cavityBrights.value * 2f); - mat.SetFloat(ShaderProperties.cavityValley, sscc.cavityDarks.value * 2f); - - // Update keywords - bool debugEffect = sscc.debugMode.value == SSCC.DebugMode.EffectOnly; - bool debugNormals = sscc.debugMode.value == SSCC.DebugMode.ViewNormals; - CoreUtils.SetKeyword(mat, "DEBUG_EFFECT", debugEffect); - CoreUtils.SetKeyword(mat, "DEBUG_NORMALS", debugNormals); - CoreUtils.SetKeyword(mat, "CHARACTER_MASKING", sscc.enableNiloToonMasking.value); - CoreUtils.SetKeyword(mat, "ORTHOGRAPHIC_PROJECTION", cameraData.camera.orthographic); - CoreUtils.SetKeyword(mat, "NORMALS_RECONSTRUCT", sscc.normalsSource.value == SSCC.PerPixelNormals.ReconstructedFromDepth); - CoreUtils.SetKeyword(mat, "SATURATE_CAVITY", sscc.saturateCavity.value); - CoreUtils.SetKeyword(mat, "OUTPUT_TO_TEXTURE", outputToTexture); - CoreUtils.SetKeyword(mat, "UPSCALE_CAVITY", sscc.cavityResolution.value == SSCC.CavityResolution.HalfUpscaled); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_6", sscc.cavitySamples.value == SSCC.CavitySamples.Low6); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_8", sscc.cavitySamples.value == SSCC.CavitySamples.Medium8); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_12", sscc.cavitySamples.value == SSCC.CavitySamples.High12); - CoreUtils.SetKeyword(mat, "CAVITY_SAMPLES_20", sscc.cavitySamples.value == SSCC.CavitySamples.VeryHigh20); - - // Create texture descriptors - var cavityDesc = new TextureDesc(sourceWidth / div, sourceHeight / div) - { - colorFormat = GraphicsFormat.R32G32B32A32_SFloat, - depthBufferBits = DepthBits.None, - filterMode = FilterMode.Bilinear, - name = "SSCC_CavityTex" - }; - - // Create cavity texture handle (shared between passes) - TextureHandle cavityTexHandle = renderGraph.CreateTexture(cavityDesc); - - // Pass 1: Generate Cavity - using (var builder = renderGraph.AddUnsafePass("SSCC Generate Cavity", out var passData)) - { - passData.material = mat; - passData.cavityTex = cavityTexHandle; - - builder.UseTexture(passData.cavityTex, AccessFlags.Write); - - builder.SetRenderFunc((PassData data, UnsafeGraphContext context) => - { - var cmd = CommandBufferHelpers.GetNativeCommandBuffer(context.cmd); - cmd.SetRenderTarget(data.cavityTex, 0, CubemapFace.Unknown, -1); - cmd.DrawMesh(fullscreenMesh, Matrix4x4.identity, data.material, 0, Pass.GenerateCavity); - }); - } - - // Pass 2: Final composite - if (outputToTexture) - { - var outputDesc = new TextureDesc(sourceWidth, sourceHeight) - { - colorFormat = GraphicsFormat.R16G16B16A16_SFloat, - depthBufferBits = DepthBits.None, - filterMode = FilterMode.Bilinear, - name = "_SSCCTexture" - }; - - using (var builder2 = renderGraph.AddUnsafePass("SSCC Final Output", out var passData2)) - { - passData2.material = mat; - passData2.cavityTex = cavityTexHandle; - passData2.ssccOutputTex = renderGraph.CreateTexture(outputDesc); - - builder2.UseTexture(passData2.cavityTex, AccessFlags.Read); - builder2.UseTexture(passData2.ssccOutputTex, AccessFlags.Write); - - builder2.SetRenderFunc((PassData data, UnsafeGraphContext context) => - { - var cmd = CommandBufferHelpers.GetNativeCommandBuffer(context.cmd); - cmd.SetGlobalTexture(ShaderProperties.cavityTex, data.cavityTex); - cmd.SetRenderTarget(data.ssccOutputTex, 0, CubemapFace.Unknown, -1); - cmd.DrawMesh(fullscreenMesh, Matrix4x4.identity, data.material, 0, Pass.Final); - cmd.SetGlobalTexture(ShaderProperties.globalSSCCTexture, data.ssccOutputTex); - }); - } - } - else - { - var tempDesc = new TextureDesc(sourceWidth, sourceHeight) - { - colorFormat = cameraData.cameraTargetDescriptor.graphicsFormat, - depthBufferBits = DepthBits.None, - filterMode = FilterMode.Bilinear, - name = "SSCC_TempTex" - }; - - using (var builder2 = renderGraph.AddUnsafePass("SSCC Final Screen", out var passData2)) - { - passData2.material = mat; - passData2.cavityTex = cavityTexHandle; - passData2.cameraColorTarget = resourceData.activeColorTexture; - passData2.tempTex = renderGraph.CreateTexture(tempDesc); - - builder2.UseTexture(passData2.cavityTex, AccessFlags.Read); - builder2.UseTexture(passData2.cameraColorTarget, AccessFlags.ReadWrite); - builder2.UseTexture(passData2.tempTex, AccessFlags.ReadWrite); - - builder2.SetRenderFunc((PassData data, UnsafeGraphContext context) => - { - var cmd = CommandBufferHelpers.GetNativeCommandBuffer(context.cmd); - - // Copy camera color to temp - cmd.SetGlobalTexture(ShaderProperties.mainTex, data.cameraColorTarget); - cmd.SetRenderTarget(data.tempTex, 0, CubemapFace.Unknown, -1); - cmd.DrawMesh(fullscreenMesh, Matrix4x4.identity, data.material, 0, Pass.Copy); - - // Final composite from temp to camera color - cmd.SetGlobalTexture(ShaderProperties.mainTex, data.tempTex); - cmd.SetGlobalTexture(ShaderProperties.cavityTex, data.cavityTex); - cmd.SetRenderTarget(data.cameraColorTarget, 0, CubemapFace.Unknown, -1); - cmd.DrawMesh(fullscreenMesh, Matrix4x4.identity, data.material, 0, Pass.Final); - }); - } - } - } - } [SerializeField] - [Space(15)] - [Header("You can now add SSCC to your Post Process Volume.")] + [Space(15)][Header("You can now add SSCC to your Post Process Volume\nin your scene to finetune SSCC's parameters further.")] Shader shader; - [SerializeField] - [Tooltip("When to apply SSCC effect on screen. Use AfterRenderingPostProcessing to avoid conflicts with NiloToon UberPostProcess.")] - RenderPassEvent screenOutputPassEvent = RenderPassEvent.AfterRenderingPostProcessing; + [Tooltip("NiloToon 캐릭터 영역(_NiloToonPrepassBufferTex.g) 에 SSCC 효과를 적용하지 않음. NiloToonAllInOneRendererFeature 의 forceRenderPrepassBuffer 가 켜져 있어야 매 프레임 동작")] + public bool useNiloToonCharacterMask = true; + + [Tooltip("디버그: 마스크를 그레이스케일 화면으로 직접 출력. 캐릭터=검정, 배경=흰색. 모두 흰색이면 prepass 텍스처 미등록 / 화면 변화 없으면 키워드 비활성")] + public bool debugCharacterMask = false; private SSCCRenderPass renderPass; @@ -489,9 +525,7 @@ namespace ScreenSpaceCavityCurvature.Universal } name = "SSCC"; - renderPass = new SSCCRenderPass(); - renderPass.feature = this; } void OnDisable() @@ -518,23 +552,11 @@ namespace ScreenSpaceCavityCurvature.Universal if (renderingData.cameraData.postProcessEnabled) { + renderPass.useNiloToonCharacterMask = useNiloToonCharacterMask; + renderPass.debugCharacterMask = debugCharacterMask; renderPass.Setup(shader, renderer, renderingData); renderer.EnqueuePass(renderPass); } } - - public override void SetupRenderPasses(ScriptableRenderer renderer, in RenderingData renderingData) - { - if (renderPass == null) return; - - shader = Shader.Find("Hidden/Universal Render Pipeline/SSCC"); - if (shader == null) return; - - renderPass.Setup(shader, renderer, renderingData); - renderPass.ConfigureInput(ScriptableRenderPassInput.Depth | ScriptableRenderPassInput.Normal); - - // Render Graph requires intermediate texture for post-processing effects - renderPass.requiresIntermediateTexture = true; - } } -} +} \ No newline at end of file diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/Shared.cginc b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/Shared.cginc index 57af79905..201203eb7 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/Shared.cginc +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/Shared.cginc @@ -4,20 +4,22 @@ #define SAMPLE(texture, sampler, uv) UNITY_SAMPLE_SCREENSPACE_TEXTURE(texture, uv) #endif -// NiloToon 캐릭터 마스킹 함수 추가 +// NiloToon 캐릭터 마스킹 함수 +// _NiloToonPrepassBufferTex 글로벌 텍스처의 G 채널 = NiloToon 캐릭터 visible area (1=캐릭터, 0=배경) +// NiloToonAllInOneRendererFeature 의 forceRenderPrepassBuffer 가 켜져 있어야 매 프레임 등록됨 +#if CHARACTER_MASKING +TEXTURE2D_X(_NiloToonPrepassBufferTex); +#endif + inline float GetCharacterMask(float2 uv) { #if CHARACTER_MASKING - // NiloToon prepass 텍스처에서 캐릭터 영역 확인 (g 채널이 visible area) - // _NiloToonPrepassBufferTex는 NiloToon 시스템에서 자동으로 전역 설정됨 - float mask = SAMPLE_TEXTURE2D_X(_NiloToonPrepassBufferTex, sampler_PointClamp, uv).g; - // 디버깅: 마스크 값이 0이면 캐릭터 영역, 1이면 배경 영역 - // 텍스처가 없거나 제대로 설정되지 않은 경우를 대비해 안전장치 추가 - // mask 값이 예상 범위를 벗어나면 마스킹을 비활성화 - if (mask < 0.0 || mask > 1.0) return 1.0; // 안전장치 - return mask > 0.0 ? 0.0 : 1.0; // 캐릭터 영역이면 0, 아니면 1 + float characterArea = SAMPLE_TEXTURE2D_X(_NiloToonPrepassBufferTex, sampler_LinearClamp, uv).g; + // 반환값 의미: 1 = 효과 적용(배경), 0 = 효과 제거(캐릭터) + // 부드러운 외곽선을 위해 LinearClamp 샘플링 + 1-G 반전 + return saturate(1.0 - characterArea); #else - return 1.0; // 마스킹 비활성화시 항상 1 + return 1.0; // 마스킹 비활성화 시 항상 효과 적용 #endif } @@ -272,20 +274,15 @@ float4 Composite_Frag(Varyings input) : SV_Target //float depth01 = FetchRawDepth(uv); //if (depth01 == 1.0 || depth01 == 0.0) return col; - // NiloToon 캐릭터 마스킹 적용 + // NiloToon 캐릭터 마스킹: mask = 1(배경) → 효과 그대로, mask = 0(캐릭터) → 효과 제거. + // 외곽 픽셀은 LinearClamp 샘플링으로 부드럽게 lerp 됨. #if CHARACTER_MASKING - float mask = GetCharacterMask(uv); - // 디버깅: 마스크 값 확인 - // mask가 0이면 캐릭터 영역이므로 원본 색상 반환 - // mask가 1이면 배경 영역이므로 SSCC 효과 적용 - - // 디버깅용: 마스크 값을 시각적으로 확인 (임시로 주석 처리) - // return float4(mask, mask, mask, 1.0); // 마스크 값을 흰색으로 표시 - - if (mask < 0.5) - { - return untouchedCol; // 캐릭터 영역 - } + float characterMask = GetCharacterMask(uv); + #if DEBUG_CHARACTER_MASK + // 디버그 모드: 마스크를 그레이스케일로 직접 출력 + // 캐릭터 = 검정 / 배경 = 흰색 / 외곽 = 부드러운 회색 + return float4(characterMask, characterMask, characterMask, 1.0); + #endif #endif float curvature = 0.0; @@ -340,6 +337,11 @@ float4 Composite_Frag(Varyings input) : SV_Target col.rgb -= (cavity * 0.2); #endif + // NiloToon 캐릭터 영역에서 SSCC 효과 제거 (부드러운 외곽 lerp) + #if CHARACTER_MASKING + col.rgb = lerp(untouchedCol.rgb, col.rgb, characterMask); + #endif + //Uncomment this block of code for on/off back and forth effect preview //if (uv.x < sin(_Time.y+(3.1415/2)) * 0.5 + 0.5) //{ diff --git a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/URP_SSCC.shader b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/URP_SSCC.shader index 11849e2be..4a6efa836 100644 --- a/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/URP_SSCC.shader +++ b/Assets/External/Screen Space Cavity Curvature/SRP/URP/Shaders/URP_SSCC.shader @@ -23,6 +23,7 @@ #pragma multi_compile_local __ OUTPUT_TO_TEXTURE #pragma multi_compile_local __ UPSCALE_CAVITY #pragma multi_compile_local __ CHARACTER_MASKING + #pragma multi_compile_local __ DEBUG_CHARACTER_MASK #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" @@ -33,7 +34,6 @@ TEXTURE2D_X(_MainTex); TEXTURE2D_X(_CavityTex); - TEXTURE2D_X(_NiloToonPrepassBufferTex); //Unity 6.0's urp #includes themselves define sampler_LinearClamp #if UNITY_VERSION < 600000 @@ -160,7 +160,7 @@ #else float3 N = float3(0, 0, 0); #endif - N = float3(N.x, -N.y, N.z); + N = float3(N.x, -N.yz); #endif N = float3(N.x, -N.y, N.z); diff --git a/Assets/External/Screen Space Cavity Curvature/Shaders.meta b/Assets/External/Screen Space Cavity Curvature/Shaders.meta deleted file mode 100644 index 9b7ce422f..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 76172b2df8171ae4e8cdc749378f9fac -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader b/Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader deleted file mode 100644 index 86fc88400..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader +++ /dev/null @@ -1,253 +0,0 @@ -Shader "Hidden/SSCC" -{ - Properties - { - _MainTex("", any) = "" {} - _SSCCTexture("", any) = "" {} - } - - CGINCLUDE - - #define HLSL 0 - #pragma target 3.0 - #pragma editor_sync_compilation - - #pragma multi_compile_local __ DEBUG_EFFECT DEBUG_NORMALS - #pragma multi_compile_local __ ORTHOGRAPHIC_PROJECTION - #pragma multi_compile_local __ NORMALS_CAMERA NORMALS_RECONSTRUCT - #pragma multi_compile_local CAVITY_SAMPLES_6 CAVITY_SAMPLES_8 CAVITY_SAMPLES_12 CAVITY_SAMPLES_20 - #pragma multi_compile_local __ SATURATE_CAVITY - #pragma multi_compile_local __ OUTPUT_TO_TEXTURE - #pragma multi_compile_local __ UPSCALE_CAVITY - - #include "UnityCG.cginc" - - UNITY_DECLARE_SCREENSPACE_TEXTURE(_MainTex); - UNITY_DECLARE_SCREENSPACE_TEXTURE(_CavityTex); - UNITY_DECLARE_SCREENSPACE_TEXTURE(_CameraDepthNormalsTexture); - UNITY_DECLARE_SCREENSPACE_TEXTURE(_CameraGBufferTexture2); - UNITY_DECLARE_DEPTH_TEXTURE(_CameraDepthTexture); - SamplerState sampler_LinearClamp; - SamplerState sampler_PointClamp; - - CBUFFER_START(FrequentlyUpdatedUniforms) - //float4 _UVToView; - float4 _Input_TexelSize; - float4 _CavityTex_TexelSize; - float4x4 _WorldToCameraMatrix; - - float _EffectIntensity; - float _DistanceFade; - - float _CurvaturePixelRadius; - float _CurvatureBrights; - float _CurvatureDarks; - - float _CavityWorldRadius; - float _CavityBrights; - float _CavityDarks; - CBUFFER_END - - CBUFFER_START(PerPassUpdatedUniforms) - float4 _UVTransform; - CBUFFER_END - - struct Attributes - { - float3 vertex : POSITION; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; - - struct Varyings - { - float4 vertex : SV_POSITION; - float2 uv : TEXCOORD0; - UNITY_VERTEX_OUTPUT_STEREO - }; - - float2 TransformTriangleVertexToUV(float2 vertex) - { - float2 uv = (vertex + 1.0) * 0.5; - return uv; - } - - Varyings Vert_Default(Attributes input) - { - Varyings o; - - UNITY_SETUP_INSTANCE_ID(input); - UNITY_INITIALIZE_OUTPUT(Varyings, o); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - - o.vertex = float4(input.vertex.xy, 0.0, 1.0); - o.uv = TransformTriangleVertexToUV(input.vertex.xy); - - #if UNITY_UV_STARTS_AT_TOP - o.uv = o.uv * float2(1.0, -1.0) + float2(0.0, 1.0); - #endif - - o.uv = TransformStereoScreenSpaceTex(o.uv, 1.0); - - return o; - } - - Varyings Vert_UVTransform(Attributes input) - { - Varyings o; - - UNITY_SETUP_INSTANCE_ID(input); - UNITY_INITIALIZE_OUTPUT(Varyings, o); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - - o.vertex = float4(input.vertex.xy, 0.0, 1.0); - o.uv = TransformTriangleVertexToUV(input.vertex.xy) * _UVTransform.xy + _UVTransform.zw; - - o.uv = TransformStereoScreenSpaceTex(o.uv, 1.0); - - return o; - } - - // - inline half4 FetchSceneColor(float2 uv) { - return UNITY_SAMPLE_SCREENSPACE_TEXTURE(_MainTex, uv); - } - inline float FetchRawDepth(float2 uv) { - return SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, uv); - } - inline float LinearizeDepth(float depth) { - #if ORTHOGRAPHIC_PROJECTION - #if UNITY_REVERSED_Z - depth = 1 - depth; - #endif - float linearDepth = _ProjectionParams.y + depth * (_ProjectionParams.z - _ProjectionParams.y); - #else - float linearDepth = LinearEyeDepth(depth); - #endif - return linearDepth; - } - inline float3 FetchViewPos(float2 uv) { - float depth = LinearizeDepth(FetchRawDepth(uv)); - //return float3((uv * _UVToView.xy + _UVToView.zw) * depth, depth); - float4 UVToView = float4(2 / unity_CameraProjection._m00, -2 / unity_CameraProjection._m11, -1 / unity_CameraProjection._m00, 1 / unity_CameraProjection._m11); - #if ORTHOGRAPHIC_PROJECTION - return float3((uv * UVToView.xy + UVToView.zw), depth); - #else - return float3((uv * UVToView.xy + UVToView.zw) * depth, depth); - #endif - } - inline float3 MinDiff(float3 P, float3 Pr, float3 Pl) { - float3 V1 = Pr - P; - float3 V2 = P - Pl; - return (dot(V1, V1) < dot(V2, V2)) ? V1 : V2; - } - inline float3 FetchViewNormals(float3 P, float2 uv) { - #if NORMALS_RECONSTRUCT - float c = FetchRawDepth(uv); - half3 viewSpacePos_c = FetchViewPos(uv); - // get data at 1 pixel offsets in each major direction - half3 viewSpacePos_l = FetchViewPos(uv + float2(-1.0, 0.0) * _Input_TexelSize.xy); - half3 viewSpacePos_r = FetchViewPos(uv + float2(+1.0, 0.0) * _Input_TexelSize.xy); - half3 viewSpacePos_d = FetchViewPos(uv + float2(0.0, -1.0) * _Input_TexelSize.xy); - half3 viewSpacePos_u = FetchViewPos(uv + float2(0.0, +1.0) * _Input_TexelSize.xy); - half3 l = viewSpacePos_c - viewSpacePos_l; - half3 r = viewSpacePos_r - viewSpacePos_c; - half3 d = viewSpacePos_c - viewSpacePos_d; - half3 u = viewSpacePos_u - viewSpacePos_c; - half4 H = half4( - FetchRawDepth(uv + float2(-1.0, 0.0) * _Input_TexelSize.xy), - FetchRawDepth(uv + float2(+1.0, 0.0) * _Input_TexelSize.xy), - FetchRawDepth(uv + float2(-2.0, 0.0) * _Input_TexelSize.xy), - FetchRawDepth(uv + float2(+2.0, 0.0) * _Input_TexelSize.xy) - ); - half4 V = half4( - FetchRawDepth(uv + float2(0.0, -1.0) * _Input_TexelSize.xy), - FetchRawDepth(uv + float2(0.0, +1.0) * _Input_TexelSize.xy), - FetchRawDepth(uv + float2(0.0, -2.0) * _Input_TexelSize.xy), - FetchRawDepth(uv + float2(0.0, +2.0) * _Input_TexelSize.xy) - ); - half2 he = abs((2 * H.xy - H.zw) - c); - half2 ve = abs((2 * V.xy - V.zw) - c); - half3 hDeriv = he.x < he.y ? l : r; - half3 vDeriv = ve.x < ve.y ? d : u; - float3 N = normalize(cross(hDeriv, vDeriv)); - #else - #if NORMALS_CAMERA - float3 N = DecodeViewNormalStereo(UNITY_SAMPLE_SCREENSPACE_TEXTURE(_CameraDepthNormalsTexture, uv)); - #else - float3 N = UNITY_SAMPLE_SCREENSPACE_TEXTURE(_CameraGBufferTexture2, uv).rgb * 2.0 - 1.0; - N = mul((float3x3)_WorldToCameraMatrix, N); - #endif - N = float3(N.x, -N.yz); - #endif - - N = float3(N.x, -N.y, N.z); - return N; - } - // - - ENDCG - - SubShader - { - LOD 100 - ZWrite Off ZTest Always Cull Off - - Pass // 0 - { - Name "Copy" - CGPROGRAM - #pragma vertex Vert_Default - #pragma fragment Frag - half4 Frag(Varyings input) : SV_Target - { - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - return UNITY_SAMPLE_SCREENSPACE_TEXTURE(_MainTex, input.uv); - } - ENDCG - } - - Pass // 1 - { - Name "GenerateCavity" - CGPROGRAM - #pragma vertex Vert_Default - #pragma fragment Cavity_Frag - #include "Shared.cginc" - ENDCG - } - - Pass // 2 - { - Name "HorizontalBlur" - CGPROGRAM - #pragma vertex Vert_Default - #pragma fragment HorizontalBlur_Frag - #include "Shared.cginc" - ENDCG - } - - Pass // 3 - { - Name "VerticalBlur" - CGPROGRAM - #pragma vertex Vert_Default - #pragma fragment VerticalBlur_Frag - #include "Shared.cginc" - ENDCG - } - - Pass // 4 - { - Name "Final" - ColorMask RGB - CGPROGRAM - #pragma vertex Vert_Default - #pragma fragment Composite_Frag - #include "Shared.cginc" - ENDCG - } - - } - - Fallback Off -} \ No newline at end of file diff --git a/Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader.meta b/Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader.meta deleted file mode 100644 index e3bf22449..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: 89ec5ce1bd95ed946a65b649164a9c1d -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Shaders/Builtin_SSCC.shader - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc b/Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc deleted file mode 100644 index 2b4063247..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc +++ /dev/null @@ -1,332 +0,0 @@ -#if HLSL - #define SAMPLE(texture, sampler, uv) SAMPLE_TEXTURE2D_X(texture, sampler, uv) -#else - #define SAMPLE(texture, sampler, uv) UNITY_SAMPLE_SCREENSPACE_TEXTURE(texture, uv) -#endif - -//CAVITY V -#ifdef CAVITY_SAMPLES_6 - #define CAVITY_SAMPLES 6 -#endif -#ifdef CAVITY_SAMPLES_8 - #define CAVITY_SAMPLES 8 -#endif -#ifdef CAVITY_SAMPLES_12 - #define CAVITY_SAMPLES 12 -#endif -#ifdef CAVITY_SAMPLES_20 - #define CAVITY_SAMPLES 20 -#endif -#ifdef SSCC_HDRP - #define ACTUAL_CAVITY_SAMPLES (CAVITY_SAMPLES+2) -#else - #define ACTUAL_CAVITY_SAMPLES (CAVITY_SAMPLES) -#endif -float _InterleavedGradientNoise(float2 pixCoord, int frameCount) -{ - const float3 magic = float3(0.06711056f, 0.00583715f, 52.9829189f); - float2 frameMagicScale = float2(2.083f, 4.867f); - pixCoord += frameCount * frameMagicScale; - return frac(magic.z * frac(dot(pixCoord, magic.xy))); -} -float3 PickSamplePoint(float2 uv, float randAddon, int index) -{ - float2 positionSS = uv * _CavityTex_TexelSize.zw; - float gn = _InterleavedGradientNoise(positionSS, index); - float u = frac(gn) * 2.0 - 1.0; - float theta = gn * 6.28318530717958647693; - float sn, cs; - sincos(theta, sn, cs); - return float3(float2(cs, sn) * sqrt(1.0 - u * u), u); -} -float3x3 GetCoordinateConversionParameters(out float2 p11_22, out float2 p13_31) -{ - float3x3 camProj = (float3x3)unity_CameraProjection; - //float3x3 camProj = (float3x3)/*UNITY_MATRIX_P*/_Projection; - p11_22 = rcp(float2(camProj._11, camProj._22)); - p13_31 = float2(camProj._13, camProj._23); - return camProj; -} -float3 ReconstructViewPos(float2 uv, float depth, float2 p11_22, float2 p13_31) -{ - #if ORTHOGRAPHIC_PROJECTION - float3 viewPos = float3(((uv.xy * 2.0 - 1.0 - p13_31) * p11_22), depth); - #else - float3 viewPos = float3(depth * ((uv.xy * 2.0 - 1.0 - p13_31) * p11_22), depth); - #endif - return viewPos; -} -void SampleDepthAndViewpos(float2 uv, float2 p11_22, float2 p13_31, out float depth, out float3 vpos) -{ - depth = LinearizeDepth(FetchRawDepth(uv)); - vpos = ReconstructViewPos(uv, depth, p11_22, p13_31); -} -void Cavity(float2 uv, float3 normal, out float cavity, out float edges) -{ - cavity = edges = 0.0; - float2 p11_22, p13_31; - float3x3 camProj = GetCoordinateConversionParameters(p11_22, p13_31); - - float depth; - float3 vpos; - SampleDepthAndViewpos(uv, p11_22, p13_31, depth, vpos); - - float randAddon = uv.x * 1e-10; - float rcpSampleCount = rcp(ACTUAL_CAVITY_SAMPLES); - - //UNITY_LOOP - UNITY_UNROLL - for (int i = 0; i < int(ACTUAL_CAVITY_SAMPLES); i++) - { - #if defined(SHADER_API_D3D11) - i = floor(1.0001 * i); - #endif - - #if 0 - float3 v_s1 = PickSamplePoint(uv.yx, randAddon, i); - #else - float3 v_s1 = PickSamplePoint(uv, randAddon, i); - #endif - v_s1 *= sqrt((i + 1.0) * rcpSampleCount) * _CavityWorldRadius * 0.5; - float3 vpos_s1 = vpos + v_s1; - - float3 spos_s1 = mul(camProj, vpos_s1); - #if ORTHOGRAPHIC_PROJECTION - float2 uv_s1_01 = clamp((spos_s1.xy + 1.0) * 0.5, 0.0, 1.0); - #else - float2 uv_s1_01 = clamp((spos_s1.xy * rcp(vpos_s1.z) + 1.0) * 0.5, 0.0, 1.0); - #endif - - float depth_s1 = LinearizeDepth(FetchRawDepth(uv_s1_01)); - float3 vpos_s2 = ReconstructViewPos(uv_s1_01, depth_s1, p11_22, p13_31); - - float3 dir = vpos_s2 - vpos; - float len = length(dir); - float f_dot = dot(dir, normal); - //float kBeta = 0.002; - float kBeta = 0.002 * 4; - float f_cavities = f_dot - kBeta * depth; - float f_edge = -f_dot - kBeta * depth; - float f_bias = 0.05 * len + 0.0001; - - if (f_cavities > -f_bias) - { - float attenuation = 1.0 / (len * (1.0 + len * len * 3.)); - cavity += f_cavities * attenuation; - } - if (f_edge > f_bias) - { - float attenuation = 1.0 / (len * (1.0 + len * len * 0.01)); - edges += f_edge * attenuation; - } - } - - //cavity *= 1.0 / ACTUAL_CAVITY_SAMPLES; - //edges *= 1.0 / ACTUAL_CAVITY_SAMPLES; - cavity *= 1.0 * _CavityWorldRadius * 0.5; - edges *= 1.0 * _CavityWorldRadius * 0.5; - - float kContrast = 0.6; - cavity = pow(abs(cavity * rcpSampleCount), kContrast); - edges = pow(abs(edges * rcpSampleCount), kContrast); - - cavity = clamp(cavity * _CavityDarks, 0.0, 1.0); - edges = edges * _CavityBrights; -} -//CAVITY ^ - -//CURVATURE V -float CurvatureSoftClamp(float curvature, float control) -{ - if (curvature < 0.5 / control) - return curvature * (1.0 - curvature * control); - return 0.25 / control; -} -float Curvature(float2 uv, float3 P) -{ - float3 offset = float3(_Input_TexelSize.xy, 0.0) * (_CurvaturePixelRadius); - - float normal_up = FetchViewNormals(P, uv + offset.zy).g; - float normal_down = FetchViewNormals(P, uv - offset.zy).g; - float normal_right = FetchViewNormals(P, uv + offset.xz).r; - float normal_left = FetchViewNormals(P, uv - offset.xz).r; - - float normal_diff = (normal_up - normal_down) + (normal_right - normal_left); - - //if (abs(normal_diff) <= 0.1) return 0; //slight low pass filter to remove noise from camera normals precision - //new and improved low pass filter: - //if (uv.x < 0.5) - { - if (normal_diff > 0.0) normal_diff = sign(normal_diff) * pow(normal_diff, 2.0); - _CavityBrights += 0.5; - } - - if (normal_diff >= 0.0) - return 2.0 * CurvatureSoftClamp(normal_diff, _CurvatureBrights); - else - return -2.0 * CurvatureSoftClamp(-normal_diff, _CurvatureDarks); -} -//CURVATURE ^ - -float invLerp(float from, float to, float value) { - return (value - from) / (to - from); -} -float remap(float origFrom, float origTo, float targetFrom, float targetTo, float value) { - float rel = invLerp(origFrom, origTo, value); - return lerp(targetFrom, targetTo, rel); -} - -float4 Cavity_Frag(Varyings input) : SV_Target -{ - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - #ifdef UnityStereoTransformScreenSpaceTex - float2 uv = UnityStereoTransformScreenSpaceTex(input.uv); - #else - float2 uv = input.uv; - #endif - - float3 P = FetchViewPos(uv); - float3 N = FetchViewNormals(P, uv); - - float cavity = 0.0, edges = 0.0; - Cavity(uv, N, cavity, edges); - return float4(cavity, edges, FetchRawDepth(uv), 1.0); -} - -float2 GaussianBlur(float2 uv, float2 pixelOffset) -{ - const float gWeights[2] = - { - 0.44908, - 0.05092 - }; - const float gOffsets[2] = - { - 0.53805, - 2.06278 - }; - float2 colOut = 0.0; - UNITY_UNROLL - for(int i = 0; i < 2; i++) - { - float2 texCoordOffset = pixelOffset * gOffsets[i]; - float2 p1 = SAMPLE(_MainTex, sampler_LinearClamp, uv + texCoordOffset).xy; - float2 p2 = SAMPLE(_MainTex, sampler_LinearClamp, uv - texCoordOffset).xy; - colOut += gWeights[i] * (p1 + p2); - } - return colOut; -} -float4 HorizontalBlur_Frag(Varyings input) : SV_Target -{ - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - - return float4 - ( - GaussianBlur(input.uv, float2(_CavityTex_TexelSize.x, 0.0)), - SAMPLE(_MainTex, sampler_LinearClamp, input.uv).z, - 1.0 - ); -} -float4 VerticalBlur_Frag(Varyings input) : SV_Target -{ - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - - return float4 - ( - GaussianBlur(input.uv, float2(0.0, _CavityTex_TexelSize.y)), - SAMPLE(_MainTex, sampler_LinearClamp, input.uv).z, - 1.0 - ); -} - -float4 Composite_Frag(Varyings input) : SV_Target -{ - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - #ifdef UnityStereoTransformScreenSpaceTex - float2 uv = UnityStereoTransformScreenSpaceTex(input.uv); - #else - float2 uv = input.uv; - #endif - - float3 P = FetchViewPos(uv); - float3 N = FetchViewNormals(P, uv); - float4 col = FetchSceneColor(uv); - float4 untouchedCol = FetchSceneColor(uv); - //float depth01 = FetchRawDepth(uv); - //if (depth01 == 1.0 || depth01 == 0.0) return col; - - float curvature = 0.0; - curvature = Curvature(uv, P); - - //float cavity = 0.0, edges = 0.0; - //Cavity(uv, N, cavity, edges); - - float2 cavityTex; - #if UPSCALE_CAVITY - float2 LowResTexelSize = _CavityTex_TexelSize.xy; - float2 LowResBufferSize = _CavityTex_TexelSize.zw; - float2 Corner00UV = floor(uv * LowResBufferSize - .5f) / LowResBufferSize + .5f * LowResTexelSize; - float2 BilinearWeights = (uv - Corner00UV) * LowResBufferSize; - - //xy is signal, z is depth it used - float3 TextureValues00 = SAMPLE(_CavityTex, sampler_LinearClamp, Corner00UV).xyz; - float3 TextureValues10 = SAMPLE(_CavityTex, sampler_LinearClamp, Corner00UV + float2(LowResTexelSize.x, 0)).xyz; - float3 TextureValues01 = SAMPLE(_CavityTex, sampler_LinearClamp, Corner00UV + float2(0, LowResTexelSize.y)).xyz; - float3 TextureValues11 = SAMPLE(_CavityTex, sampler_LinearClamp, Corner00UV + LowResTexelSize).xyz; - - float4 CornerWeights = float4( - (1 - BilinearWeights.y) * (1 - BilinearWeights.x), - (1 - BilinearWeights.y) * BilinearWeights.x, - BilinearWeights.y * (1 - BilinearWeights.x), - BilinearWeights.y * BilinearWeights.x); - - float Epsilon = .0001f/*-.0001f*//*0.0f*/; - - float4 CornerDepths = abs(float4(TextureValues00.z, TextureValues10.z, TextureValues01.z, TextureValues11.z)); - float SceneDepth = FetchRawDepth(uv); - float4 DepthWeights = 1.0f / (abs(CornerDepths - SceneDepth.xxxx) + Epsilon); - float4 FinalWeights = CornerWeights * DepthWeights; - - cavityTex = (FinalWeights.x*TextureValues00.xy + FinalWeights.y*TextureValues10.xy + FinalWeights.z*TextureValues01.xy + FinalWeights.w*TextureValues11.xy) / dot(FinalWeights, 1); - #else - cavityTex = SAMPLE(_CavityTex, sampler_LinearClamp, uv).xy; - #endif - float cavity = cavityTex.r, edges = cavityTex.g; - - if (uv.x < _Input_TexelSize.x * 2 || uv.y < _Input_TexelSize.y * 2 || 1 - uv.x < _Input_TexelSize.x * 2 || 1 - uv.y < _Input_TexelSize.y * 2) { curvature = cavity = edges = 0; }; - - col.rgb += (curvature * 0.4); - - #if SATURATE_CAVITY - //float3 extra = col.rgb - saturate(col.rgb); - col.rgb = pow(saturate(col.rgb), 1 - (edges * 0.5)); - col.rgb = pow(saturate(col.rgb), 1 + (cavity * 1)); - //col.rgb += extra; - #else - col.rgb += (edges * 0.2); - col.rgb -= (cavity * 0.2); - #endif - - //Uncomment this block of code for on/off back and forth effect preview - //if (uv.x < sin(_Time.y+(3.1415/2)) * 0.5 + 0.5) - //{ - // if (uv.x > (sin(_Time.y+(3.1415/2)) * 0.5 + 0.5) - 0.002) return 0; - // return untouchedCol; - //} - - - #if DEBUG_EFFECT - return ((1.0 - cavity) * (1.0 + edges) * (1.0 + curvature)) * 0.25; - #elif DEBUG_NORMALS - return float4(N * 0.5 + 0.5, 1); - #endif - - #if OUTPUT_TO_TEXTURE - float r = curvature * 0.4; - float g = (edges * 0.2) - (cavity * 0.2); - return float4(r * rcp(max(1, P.z * _DistanceFade)) * _EffectIntensity, g * rcp(max(1, P.z * _DistanceFade)) * _EffectIntensity, 1, 1); - //Values rescaled so they're more consistent to work with, if you just +curvature+edges it should match 'screen' output - #else - return lerp(untouchedCol, col, rcp(max(1, P.z * _DistanceFade)) * _EffectIntensity); - #endif -} diff --git a/Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc.meta b/Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc.meta deleted file mode 100644 index d863c0ac2..000000000 --- a/Assets/External/Screen Space Cavity Curvature/Shaders/Shared.cginc.meta +++ /dev/null @@ -1,16 +0,0 @@ -fileFormatVersion: 2 -guid: 320b7d4bebad59e4ead8d08b151d6a7f -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/Shaders/Shared.cginc - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples.meta b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples.meta deleted file mode 100644 index 93d1c04b1..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2caf2819c0dabce42b6b938c8f5a9ba4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage deleted file mode 100644 index 3cf0c431c..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ccbf706afd18ef0c7fc7a35b795b602c70cb9781c19e17097e907576026bbde -size 1572 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta deleted file mode 100644 index 6767a12e3..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 0e83bea63c06f674eb5018b4edaaa234 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture - Example.unitypackage - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt deleted file mode 100644 index 1fda87378..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8510084b4e2db6f4f3e1444dc1def1453eedc8c0528b537ef3c5e611cd5e0690 -size 568 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt.meta b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt.meta deleted file mode 100644 index 3b4d63013..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 9673b087a168cd34984bd85711945362 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/Readme.txt - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage deleted file mode 100644 index 85c563fb1..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ce3f33dc10b2902d81c5342701f6eb29b89ecd90c4011cf472c44a76b14e84b -size 6996 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta deleted file mode 100644 index a09d28029..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: c2a3494b77a23b54aa8b5ad80b580749 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture - Example.unitypackage - uploadId: 664239 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage deleted file mode 100644 index 28154d8a7..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17aecdc9b58f3f6cb32d35eed3737734c83e9d01a69833f911ed678712707d4a -size 7114 diff --git a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta b/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta deleted file mode 100644 index f9a65846b..000000000 --- a/Assets/External/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta +++ /dev/null @@ -1,15 +0,0 @@ -fileFormatVersion: 2 -guid: 63fa4c6385d5807478747f832fef4a20 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 216995 - packageName: Screen Space Cavity & Curvature (Built-In/URP/HDRP) - packageVersion: 1.1.7 - assetPath: Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ - _SSCCTexture Example.unitypackage - uploadId: 664239 diff --git a/Assets/Resources/Settings/Streamingle Render Pipeline Asset_Renderer.asset b/Assets/Resources/Settings/Streamingle Render Pipeline Asset_Renderer.asset index 8aed52295..8cd49a10a 100644 --- a/Assets/Resources/Settings/Streamingle Render Pipeline Asset_Renderer.asset +++ b/Assets/Resources/Settings/Streamingle Render Pipeline Asset_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75028ae78252d73ab5421e689151f63a831c9d2f129eb8eec5813c89e239ad52 -size 20220 +oid sha256:5fecc227bda1c93111504ca778501363518064e789ff1df2342d7141979cdc9c +size 20245 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/New Lighting Settings.lighting b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/New Lighting Settings.lighting index 575a93bde..977f2af79 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/New Lighting Settings.lighting +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/New Lighting Settings.lighting @@ -16,7 +16,7 @@ LightingSettings: m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 2 - m_LightmapMaxSize: 1024 + m_LightmapMaxSize: 2048 m_LightmapSizeFixed: 0 m_UseMipmapLimits: 1 m_BakeResolution: 80 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Door__Door_C_jpg.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Door__Door_C_jpg.mat index b01fb1326..78e351634 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Door__Door_C_jpg.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Door__Door_C_jpg.mat @@ -11,7 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -52,6 +54,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -60,6 +66,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -139,6 +149,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -159,14 +173,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -189,6 +207,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glass.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glass.mat index d4638c3a9..3cb6d2f62 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glass.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glass.mat @@ -13,6 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -56,6 +58,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -64,6 +70,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -143,6 +153,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -163,14 +177,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -193,6 +211,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 0 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg.mat index 8e0f2454e..f3baa3eb7 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg.mat @@ -11,7 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -52,6 +54,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 7cdb9e9a3dfc22141a81b462e7d3e156, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +66,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -139,6 +149,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -159,14 +173,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -189,6 +207,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_0.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_0.mat index 2b1776108..460e1695b 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_0.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_0.mat @@ -24,7 +24,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -65,6 +67,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -152,6 +162,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -172,14 +186,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -202,6 +220,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_1.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_1.mat index 587d5f35b..5176a718b 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_1.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Glossy__Reflexion_jpg_1.mat @@ -11,7 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -52,6 +54,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -60,6 +66,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -139,6 +149,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -159,14 +173,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 1 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -189,6 +207,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.001.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.001.mat index eb3851dc6..d992c1548 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.001.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.001.mat @@ -25,6 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA - _NORMALMAP - _RECEIVE_NILOTOON_CHAR_SHADOW m_InvalidKeywords: [] @@ -67,6 +69,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: ce56236b3e4998b4db0f5fb5e2a49d3b, type: 3} m_Scale: {x: 1, y: 1} @@ -75,6 +81,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -154,6 +164,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -173,7 +187,7 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 0.036 + - _Metallic: 0 - _NiloToonCharShadowStrength: 0.436 - _OcclusionStrength: 1 - _Parallax: 0.005 @@ -182,8 +196,10 @@ Material: - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - - _Smoothness: 0.916 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.035 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -206,6 +222,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.002.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.002.mat index 57d4326f1..e08a902df 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.002.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.002.mat @@ -11,7 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -52,6 +54,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 8916341405c555d4ba51bc017a3334a3, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +66,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -139,6 +149,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -159,14 +173,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -189,6 +207,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.003.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.003.mat index d1d669811..1e75e171a 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.003.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/Material.003.mat @@ -24,7 +24,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -65,6 +67,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: edc08116811c69242916caa491c9adac, type: 3} m_Scale: {x: 1, y: 1} @@ -73,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -152,6 +162,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -182,6 +196,8 @@ Material: - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -204,6 +220,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/T_hanging_lights_1001.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/T_hanging_lights_1001.mat index 8cac6e18f..1fd681963 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/T_hanging_lights_1001.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/T_hanging_lights_1001.mat @@ -26,6 +26,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -67,6 +69,10 @@ Material: m_Texture: {fileID: 2800000, guid: 81dd5322943c71147a119c6b11329dd0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: e606b18608d2e494ba9f59b7e19212b0, type: 3} m_Scale: {x: 1, y: 1} @@ -75,6 +81,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -154,6 +164,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -174,14 +188,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0.381 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - - _Smoothness: 0.735 + - _Smoothness: 0.432 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -204,6 +222,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/defaultMat_0.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/defaultMat_0.mat index 634e6f2dc..b7f0b4eb4 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/defaultMat_0.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/defaultMat_0.mat @@ -11,7 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -52,6 +54,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 36751da21e8ed3a498bdb2e229780664, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +66,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -139,6 +149,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -159,14 +173,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 1 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -189,6 +207,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/embossed-plaster.mat b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/embossed-plaster.mat index a3b1eb408..7df598b07 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/embossed-plaster.mat +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Glb/[공용]댄스 연습실.Materials/embossed-plaster.mat @@ -25,6 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _NILOTOON_ADVANCED_PBR + - _NILOTOON_SPECULAR_AA - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -66,6 +68,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FGDLUT: + m_Texture: {fileID: 2800000, guid: ae18db2a5acb3f94784619389358f154, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 3772a8f15086ac645b8a3bacba216699, type: 3} m_Scale: {x: 1, y: 1} @@ -74,6 +80,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + 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} @@ -153,6 +163,10 @@ Material: m_Ints: [] m_Floats: - _AddPrecomputedVelocity: 0 + - _AdvancedPBR_ChanDiffuseStrength: 1 + - _AdvancedPBR_EnergyCompensation: 1 + - _AdvancedPBR_F90Strength: 1 + - _AdvancedPBR_SpecularValue: 0.5 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 @@ -173,14 +187,18 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0.131 + - _NiloToonCharShadowStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 - _Smoothness: 0.843 - _SmoothnessTextureChannel: 0 + - _SpecularAA_ScreenSpaceVariance: 0.15 + - _SpecularAA_Threshold: 0.18 - _SpecularHighlights: 1 - _SplatAlbedoMapATiling: 1 - _SplatAlbedoMapBTiling: 1 @@ -203,6 +221,11 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseAdvancedPBR: 1 + - _UseChanDiffuse: 0 + - _UseFGDLUT: 0 + - _UseNOSMap: 0 + - _UseSpecularAA: 1 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZWrite: 1 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실.unity b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실.unity index 037e9032b..465e50418 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실.unity +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d43d1ceaab2e2547dd88f4f2f97b90fa8c08a346ab4f27ff366498f9a8137eb -size 98966 +oid sha256:c65d8375782831eeb4fae49a0f90071ccc25110a9ef06bb316f88306958dbad2 +size 102765 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Global Volume Profile.asset b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Global Volume Profile.asset index 3edafab4e..b6f101d85 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Global Volume Profile.asset +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Global Volume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88181a18204efe0256c8b1a70eeec8bd4d31cbf696019bdf2f33333044f23c11 -size 27614 +oid sha256:b4f0e78adc0cd39035cedc3a088b39fb7c80795dfc39fd56d589191315eed350 +size 27631 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/LightingData.asset b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/LightingData.asset index bf70299ac..c20966d27 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/LightingData.asset +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aec6e2578e298d641f2a37b4a36d401f791cd335f963ed8bca8f17d8bb67ba23 -size 23841 +oid sha256:77a41a593c982dec3eddec72d379ff8ecac50537c65f7741c307c4949fa15c2c +size 23409 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_dir.png index 7a768169f..ff0fc8b29 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_dir.png +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7979d39a23b45ce497eed74d488e07dd3d3703b7dcdaa9003e3a0dc27aafed9f -size 563484 +oid sha256:dba5933a1f42b6f638f3a0f8ff156f0ff911fd2f3b902c758df6bf16b6a94cf5 +size 1363653 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_light.exr index c6e8efdf0..6c00544e4 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_light.exr +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22f79f79e837416f0d1de67089d31270d625e8f6aa6c1bbf6debb6f784adef08 -size 7167207 +oid sha256:7cfbb5dd47e0118676049b6729caa37540c2b4793bf6e1b5023f72b603b94a5f +size 31023975 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_dir.png index 193d98aa0..3fa161976 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_dir.png +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ebe9e3f6f14aa4b586b5cb7d38008dc5755db15076365a57339929060707475 -size 301493 +oid sha256:fd32ad069928afec9e8f6aad96a163e3fa67b8d5d2100c11ce5a787e3658b1c6 +size 163582 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_light.exr index 8c4ce3d6c..63a0f9780 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_light.exr +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8cbc7f1a2c7efe55759bedb5e15f3d7d151c3ada92fa41f76868770e993f4c4 -size 6924356 +oid sha256:53e0e9292173362a9e161420a307009ad988e554d5ec2b5d9827b18bf44a9508 +size 17036087 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_dir.png index 36903deea..738fae852 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_dir.png +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5e977cce639bf825af4532ee28296aa933abc0db324f4e1b5dd995ba708d1d5 -size 391265 +oid sha256:4ceb6daca8c8af6bda98354f22a26ee0fb4dd64843fc5b1120482c217883a4b0 +size 451468 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_light.exr index 413d378a9..f6beb46e0 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_light.exr +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af88514da273dbd4cbb66d5eca6132162f205b31ada413cc0b8536a46cd434fb -size 10624788 +oid sha256:0a5e615cdae5fd26289404f8e6006e14c3d13d672bf53f5570b4e73d4897169d +size 9316049 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png deleted file mode 100644 index 259435fb3..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:327ebd13e6ea2222e4939e406ed9ec02b2d66778deb69c307df57e71b1fc8374 -size 102127 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png.meta deleted file mode 100644 index 5079aac58..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_dir.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 695f4ff7e3fc1bb47835025019a73f8c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr deleted file mode 100644 index 88174782d..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2330291949e481110bd36336c57f0cee5ebd391a23e879384e9abb0607bb743d -size 5527595 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr.meta deleted file mode 100644 index 315dad121..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-3_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 9347674d7427ec34bb729d2d75d49480 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png deleted file mode 100644 index e60330b02..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff4af0fda10d6b84b42bc33414871171ba205afab1904ef0f20eabba63b56730 -size 233312 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png.meta deleted file mode 100644 index 9ddb557f7..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_dir.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 66686f1b558d9424f9264a116e0f3f8a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr deleted file mode 100644 index a10e7a1fd..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5762a802a8cadf0145fc8519930c8cd093498c406b85c044833304894a60aa45 -size 7340136 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr.meta deleted file mode 100644 index 2dfec5de0..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-4_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 76510edb63367774cbb6604bf1af9e8e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png deleted file mode 100644 index 103e3412c..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93f1e0d5a158c587aa41c46d73bcf25ac59aa2be98403465e0d550530b1a1939 -size 48701 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png.meta deleted file mode 100644 index f4a442b3b..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_dir.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 66b19b6e2a88a2740a03850e901c1f84 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr deleted file mode 100644 index 7512b31fd..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5199804b97f7100206569ade1bcfa9fb1ecc104166332a7d7f0f66e68b13722 -size 2287379 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr.meta deleted file mode 100644 index c133b5a97..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-5_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 0edb763249ebda742bbe6bd5e606afec -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png deleted file mode 100644 index ddee00b92..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:252e370790576110786a20d384f0213900b00521da12d5c13c350ba2e339502c -size 29916 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png.meta deleted file mode 100644 index 3f7caf6c5..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_dir.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: e6199872890fe8f47a509897a435a289 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr deleted file mode 100644 index f33081d0a..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c2d6b41a03d4db9f2d161c70e00cf77a26a3877372b28fd47f9df50787ca98b -size 1201844 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr.meta b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr.meta deleted file mode 100644 index 66e2ced25..000000000 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/Lightmap-6_comp_light.exr.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 7655ae17f8945294f8a7b30fbae09ffe -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/ReflectionProbe-0.exr b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/ReflectionProbe-0.exr index 0f7098973..21521d8c5 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/ReflectionProbe-0.exr +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83e8d5f29a91d595d0900accbc62323dac54f5667f0d020b75a1269684de5820 -size 17870035 +oid sha256:84725586f0689f75902c2f4461e38309cd816d2a366c7a0347a596d9cf4b576d +size 17871232 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellData.bytes b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellData.bytes index 164ca5764..d30cb3bea 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellData.bytes +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:589348dc12bd4dc4094c422c46f4f8f72726b53175664af36be3d195e8ca7f84 +oid sha256:bea9c32f440ab8c648a216a2e1823a11ea18bffb057a38184fd4187413b70fe4 size 1048576 diff --git a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellOptionalData.bytes b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellOptionalData.bytes index 61ee62434..0e6e63fe6 100644 --- a/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellOptionalData.bytes +++ b/Assets/ResourcesData/Background/[공용]댄스 연습실/Scene/[공용]댄스 연습실/[공용]댄스 연습실 Baking Set-Default.CellOptionalData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdceac1f038a1f1b3291dda3f3e875c0a59e88fc181f7570bd0647cec8e6b725 +oid sha256:bf0f52fb3462daf33bff290d954909f48ae318e13eb2d977a32b5185a38a0b91 size 1048576 diff --git a/Assets/Scripts/Contents/BossRaid/Editor/BossRaidSetup.cs b/Assets/Scripts/Contents/BossRaid/Editor/BossRaidSetup.cs index de73604b0..ebf24c14c 100644 --- a/Assets/Scripts/Contents/BossRaid/Editor/BossRaidSetup.cs +++ b/Assets/Scripts/Contents/BossRaid/Editor/BossRaidSetup.cs @@ -9,7 +9,6 @@ namespace Streamingle.Contents.BossRaid.Editor /// public static class BossRaidSetup { - [MenuItem("Streamingle/BossRaid/Setup Scene (One-Click)")] public static void SetupScene() { // === 1. BossData 에셋 확보 === diff --git a/Assets/Scripts/Contents/BossRaid/Editor/ParticleCreator.cs b/Assets/Scripts/Contents/BossRaid/Editor/ParticleCreator.cs index b7cf0de3d..264e47df3 100644 --- a/Assets/Scripts/Contents/BossRaid/Editor/ParticleCreator.cs +++ b/Assets/Scripts/Contents/BossRaid/Editor/ParticleCreator.cs @@ -5,7 +5,7 @@ namespace Streamingle.Contents.BossRaid.Editor { public static class ParticleCreator { - [MenuItem("Streamingle/BossRaid/Create Particle Prefabs")] + [MenuItem("Streamingle/BossRaid/파티클 프리팹 생성", false, 401)] public static void CreateAll() { string basePath = "Assets/Scripts/Contents/BossRaid/Resources/Particles"; diff --git a/Assets/Scripts/Editor/StreamingleTools/StreamingleAvatarExport.cs b/Assets/Scripts/Editor/StreamingleTools/StreamingleAvatarExport.cs index d009c7f47..f8537a9c5 100644 --- a/Assets/Scripts/Editor/StreamingleTools/StreamingleAvatarExport.cs +++ b/Assets/Scripts/Editor/StreamingleTools/StreamingleAvatarExport.cs @@ -18,7 +18,7 @@ public class StreamingleAvatarExporter : EditorWindow private Dictionary meshTags = new Dictionary(); private string[] tagOptions = { "None", "Clothes", "Hair", "Face", "Body", "Other" }; - [MenuItem("Tools/Streamingle/아바타 내보내기")] + [MenuItem("Streamingle/아바타 내보내기", false, 300)] public static void ShowWindow() { GetWindow("Streamingle 내보내기"); diff --git a/Assets/Scripts/Editor/StreamingleTools/StreamingleControllerSetupToolAdvanced.cs b/Assets/Scripts/Editor/StreamingleTools/StreamingleControllerSetupToolAdvanced.cs index fee39517d..468cc7d9e 100644 --- a/Assets/Scripts/Editor/StreamingleTools/StreamingleControllerSetupToolAdvanced.cs +++ b/Assets/Scripts/Editor/StreamingleTools/StreamingleControllerSetupToolAdvanced.cs @@ -16,6 +16,7 @@ namespace Streamingle.Editor public string propertyName; public Type componentType; public string gameObjectName; + public string prefabPath; // 비어있으면 빈 GameObject + AddComponent. 있으면 prefab 인스턴스화 } private ControllerDef[] controllerDefs; @@ -35,7 +36,7 @@ namespace Streamingle.Editor private readonly StringBuilder logBuilder = new(); - [MenuItem("Tools/Streamingle/고급 컨트롤러 설정 도구")] + [MenuItem("Streamingle/씬 컨트롤러 설정", false, 1)] public static void ShowWindow() { var wnd = GetWindow("Streamingle 설정"); @@ -52,6 +53,7 @@ namespace Streamingle.Editor new() { label = "아이템 컨트롤러", propertyName = "itemController", componentType = typeof(ItemController), gameObjectName = "아이템 컨트롤러" }, new() { label = "이벤트 컨트롤러", propertyName = "eventController", componentType = typeof(EventController), gameObjectName = "이벤트 컨트롤러" }, new() { label = "아바타 의상 컨트롤러", propertyName = "avatarOutfitController", componentType = typeof(AvatarOutfitController), gameObjectName = "아바타 의상 컨트롤러" }, + new() { label = "Spout & NDI 출력", propertyName = null, componentType = typeof(RenderStreamOutput), gameObjectName = "Spout&Ndi", prefabPath = "Assets/Scripts/SpoutOutputScript/Spout&Ndi.prefab" }, }; existingComponents = new Component[controllerDefs.Length]; @@ -291,13 +293,12 @@ namespace Streamingle.Editor if (createToggles[i] == null || !createToggles[i].value) continue; var def = controllerDefs[i]; - var go = new GameObject(def.gameObjectName); - Undo.RegisterCreatedObjectUndo(go, $"Create {def.label}"); + var go = InstantiateControllerObject(def); + if (go == null) continue; if (parent != null) - go.transform.SetParent(parent.transform); + go.transform.SetParent(parent.transform, worldPositionStays: true); - go.AddComponent(def.componentType); existingComponents[i] = go.GetComponent(def.componentType); Log($"+ 생성: {def.label}"); created++; @@ -406,6 +407,33 @@ namespace Streamingle.Editor EditorGUIUtility.PingObject(parent); } + // prefabPath 가 있으면 prefab 인스턴스화, 없으면 빈 GO + AddComponent. + private GameObject InstantiateControllerObject(ControllerDef def) + { + if (!string.IsNullOrEmpty(def.prefabPath)) + { + var prefab = AssetDatabase.LoadAssetAtPath(def.prefabPath); + if (prefab == null) + { + Log($"! Prefab 을 찾지 못했습니다: {def.prefabPath}"); + return null; + } + var instance = (GameObject)PrefabUtility.InstantiatePrefab(prefab); + if (instance == null) + { + Log($"! Prefab 인스턴스화 실패: {def.label}"); + return null; + } + Undo.RegisterCreatedObjectUndo(instance, $"Create {def.label}"); + return instance; + } + + var go = new GameObject(def.gameObjectName); + Undo.RegisterCreatedObjectUndo(go, $"Create {def.label}"); + go.AddComponent(def.componentType); + return go; + } + #endregion #region Logging diff --git a/Assets/Scripts/SpoutOutputScript/Spout&Ndi.prefab b/Assets/Scripts/SpoutOutputScript/Spout&Ndi.prefab index ba532d665..64f747df3 100644 --- a/Assets/Scripts/SpoutOutputScript/Spout&Ndi.prefab +++ b/Assets/Scripts/SpoutOutputScript/Spout&Ndi.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28bb0e3683c3a42fc6b99647e29533cc73bfe1064874f54cb5728f48f39a8c0d +oid sha256:4f0c3402e6abd3063833ce4b62f317df8c63d0192abbedf1a1e07d839bb79a66 size 2330 diff --git a/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundSceneLoaderWindow.cs b/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundSceneLoaderWindow.cs index 46309d2d5..529163bcb 100644 --- a/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundSceneLoaderWindow.cs +++ b/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundSceneLoaderWindow.cs @@ -224,7 +224,7 @@ namespace Streamingle.Background.Editor private Label _backupInfoLabel; private Button _copyLightingBtn, _restoreBtn; - [MenuItem("Streamingle/Background Scene Loader %#b")] + [MenuItem("Streamingle/배경 씬 불러오기 %#b", false, 100)] public static void ShowWindow() { var window = GetWindow("배경 씬 로더"); diff --git a/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundThumbnailCapture.cs b/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundThumbnailCapture.cs index e7f89e31c..ec456d3fc 100644 --- a/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundThumbnailCapture.cs +++ b/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/BackgroundThumbnailCapture.cs @@ -28,7 +28,7 @@ namespace Streamingle.Background.Editor private BackgroundSceneDatabase _database; private BackgroundSceneInfo _currentSceneInfo; - [MenuItem("Streamingle/Capture Background Thumbnail %#t")] + [MenuItem("Streamingle/배경 썸네일 캡처 %#t", false, 101)] public static void ShowWindow() { var window = GetWindow("썸네일 캡처"); diff --git a/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/WebsiteBackgroundExporter.cs b/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/WebsiteBackgroundExporter.cs index 6d3cda980..995b5df20 100644 --- a/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/WebsiteBackgroundExporter.cs +++ b/Assets/Scripts/Streamingle/StreamingleControl/Background/Editor/WebsiteBackgroundExporter.cs @@ -22,7 +22,7 @@ namespace Streamingle.Background.Editor private bool _isExporting; private UnityWebRequestAsyncOperation _currentRequest; - [MenuItem("Streamingle/Upload Backgrounds to Website")] + [MenuItem("Streamingle/배경 업로드", false, 102)] public static void ShowWindow() { var window = GetWindow("배경 업로드"); diff --git a/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/PropBrowserWindow.cs b/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/PropBrowserWindow.cs index b776a7d9d..ed2d76012 100644 --- a/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/PropBrowserWindow.cs +++ b/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/PropBrowserWindow.cs @@ -48,7 +48,7 @@ namespace Streamingle.Prop.Editor private Label _countLabel; private ScrollView _scrollView; - [MenuItem("Streamingle/Prop Browser %#p")] + [MenuItem("Streamingle/프롭 브라우저 %#p", false, 200)] public static void ShowWindow() { var window = GetWindow("프랍 브라우저"); diff --git a/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/WebsitePropExporter.cs b/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/WebsitePropExporter.cs index 51a878c2d..e18a4d0ab 100644 --- a/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/WebsitePropExporter.cs +++ b/Assets/Scripts/Streamingle/StreamingleControl/Prop/Editor/WebsitePropExporter.cs @@ -24,7 +24,7 @@ namespace Streamingle.Prop.Editor private const string SETTINGS_PATH = "Assets/Resources/Settings/PropSyncSettings.asset"; private const string DATABASE_PATH = "Assets/Resources/Settings/PropDatabase.asset"; - [MenuItem("Streamingle/Upload Props to Website")] + [MenuItem("Streamingle/프롭 업로드", false, 201)] public static void ShowWindow() { var window = GetWindow("프랍 업로드"); diff --git a/Packages/manifest.json b/Packages/manifest.json index 67fcdec1a..d199a54ff 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fdd07a76f8c4bc978ac20c7b94ccbbe7f4a54addfb53a7178f26f655635f940 -size 2600 +oid sha256:9b1e3c29b414cb308dee1287c1d46d79eb33d7deb6e9b7200bc755aada0bc78e +size 2700 diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8ecd42e5a..cfeed0423 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7410d4e7460907a76ba875909a052605c721e8fc6874a94b21bb516ab6d3595 -size 15765 +oid sha256:dac67e8ef861289b38ec1600e7d9c10377a48c73b61e06ca0858d6586ba719a3 +size 16119 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 594671a23..47ad34374 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d2e69c7c632b7c45c8903eff2e2744bba00195dd1e93fb553f60695b6e59f1d -size 2615 +oid sha256:cc2f9c6f6f397f7bf48d29c11af60e67e639437533e1b07ca54e2706d126c6d8 +size 2686 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index f0a7d6e6b..2e83b6c07 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8235e5a0dae7829f690a76c69ed7c136b8b2b8528dd515777dfa2b4bf36dc099 -size 1296 +oid sha256:3738a3adf0cc42aea8a6554b9d81f722787927cb10a0707b1004f08cb8f8f1ca +size 1376