From 86207b7cbd414626e67e8ed46f9534a22d523f23 Mon Sep 17 00:00:00 2001 From: notargs Date: Tue, 25 Apr 2023 11:05:11 +0900 Subject: [PATCH] =?UTF-8?q?MTOON=E5=AF=BE=E5=BF=9C=E6=99=82=E3=81=AFUnityC?= =?UTF-8?q?G=E3=82=92=E7=94=A8=E3=81=84=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl | 2 ++ .../MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl | 2 ++ .../Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl | 2 ++ .../MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl | 2 ++ 10 files changed, 20 insertions(+) diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl index e406a2491..7c3f85b60 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_attribute.hlsl @@ -1,8 +1,10 @@ #ifndef VRMC_MATERIALS_MTOON_ATTRIBUTE_INCLUDED #define VRMC_MATERIALS_MTOON_ATTRIBUTE_INCLUDED +#ifndef MTOON_URP #include #include +#endif struct Attributes { diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl index 84ca54245..ac5ebfd20 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_fragment.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_FORWARD_FRAGMENT_INCLUDED #define VRMC_MATERIALS_MTOON_FORWARD_FRAGMENT_INCLUDED +#ifndef MTOON_URP #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_utility.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl index e536543f3..dc01e79ba 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_forward_vertex.hlsl @@ -1,8 +1,10 @@ #ifndef VRMC_MATERIALS_MTOON_FORWARD_VERTEX_INCLUDED #define VRMC_MATERIALS_MTOON_FORWARD_VERTEX_INCLUDED +#ifndef MTOON_URP #include #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_utility.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl index 1eda41448..7c23aaf30 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_normal.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_GEOMETRY_NORMAL_INCLUDED #define VRMC_MATERIALS_MTOON_GEOMETRY_NORMAL_INCLUDED +#ifndef MTOON_URP #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_utility.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl index 5a9e9ac46..30f6ae553 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_uv.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_GEOMETRY_UV_INCLUDED #define VRMC_MATERIALS_MTOON_GEOMETRY_UV_INCLUDED +#ifndef MTOON_URP #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_utility.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl index 6ee24dbde..4a2ce56c0 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_geometry_vertex.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_GEOMETRY_VERTEX_INCLUDED #define VRMC_MATERIALS_MTOON_GEOMETRY_VERTEX_INCLUDED +#ifndef MTOON_URP #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_utility.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl index 274f51d51..7825dd777 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_INPUT_INCLUDED #define VRMC_MATERIALS_MTOON_INPUT_INCLUDED +#ifndef MTOON_URP #include +#endif // Textures UNITY_DECLARE_TEX2D(_MainTex); diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl index 39a3c5eb4..44aa72782 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_mtoon.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_LIGHTING_MTOON_INCLUDED #define VRMC_MATERIALS_MTOON_LIGHTING_MTOON_INCLUDED +#ifndef MTOON_URP #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_utility.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl index 5940d9bba..c7ee39be5 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_lighting_unity.hlsl @@ -1,9 +1,11 @@ #ifndef VRMC_MATERIALS_MTOON_LIGHTING_UNITY_INCLUDED #define VRMC_MATERIALS_MTOON_LIGHTING_UNITY_INCLUDED +#ifndef MTOON_URP #include #include #include +#endif #include "./vrmc_materials_mtoon_define.hlsl" #include "./vrmc_materials_mtoon_input.hlsl" #include "./vrmc_materials_mtoon_attribute.hlsl" diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl index bd1d91262..e59f7ff79 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_utility.hlsl @@ -1,7 +1,9 @@ #ifndef VRMC_MATERIALS_MTOON_UTILITY_INCLUDED #define VRMC_MATERIALS_MTOON_UTILITY_INCLUDED +#ifndef MTOON_URP #include +#endif // define static const float PI_2 = 6.28318530718;