Merge branch 'dev'

whiteflare · Apr 11, 2020 · 1420ce4 · 1420ce4
2 parents f2aa5bf + d3b9963
commit 1420ce4
Show file tree

Hide file tree

Showing 252 changed files with 5,188 additions and 735 deletions.
diff --git a/Editor/WF_Common.cs b/Editor/WF_Common.cs
@@ -272,7 +272,8 @@ internal static class WFI18N
             { "[AL] Fresnel Power", "[AL] フレネル強度" },
             { "[AL] Cutoff Threshold", "[AL] カットアウトしきい値" },
             // Tessellation
-            { "Tessellation", "テッセレーション分割強度" },
+            { "Tess Type", "Tessタイプ" },
+            { "Tess Factor", "Tess分割強度" },
             { "Smoothing", "Phongスムージング" },
             { "Displacement HeightMap", "ハイトマップ" },
             { "HeightMap Scale", "ハイトマップのスケール" },
@@ -360,6 +361,7 @@ internal static class WFI18N
             { "Custom Sun Azimuth", "カスタム太陽の方角" },
             { "Custom Sun Altitude", "カスタム太陽の高度" },
             { "Disable BackLit", "逆光補正しない" },
+            { "Disable ObjectBasePos", "メッシュ原点を取得しない" },
             // DebugMode
             { "Debug View", "デバッグ表示" },
             // Gem Reflection

diff --git a/Examples/UnToon_Avatar_2A-7s.unity b/Examples/UnToon_Avatar_2A-7s.unity
diff --git a/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_A.asset b/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_A.asset
diff --git a/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_A.prefab b/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_A.prefab
diff --git a/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_B.asset b/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_B.asset
diff --git a/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_B.prefab b/Examples/UnToon_CornelBox_Assets/Baked_2a7s_2ero_B.prefab
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/LightBlue.mat b/Examples/UnToon_CornelBox_Assets/Materials/LightBlue.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/LightWhite.mat b/Examples/UnToon_CornelBox_Assets/Materials/LightWhite.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/Metallic.mat b/Examples/UnToon_CornelBox_Assets/Materials/Metallic.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/SolidGreen.mat b/Examples/UnToon_CornelBox_Assets/Materials/SolidGreen.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/SolidRed.mat b/Examples/UnToon_CornelBox_Assets/Materials/SolidRed.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/SolidWhite.mat b/Examples/UnToon_CornelBox_Assets/Materials/SolidWhite.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/SolidWhiteSmooth.mat b/Examples/UnToon_CornelBox_Assets/Materials/SolidWhiteSmooth.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/tex_armor(Clone)_asset2.mat b/Examples/UnToon_CornelBox_Assets/Materials/tex_armor(Clone)_asset2.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/tex_body(Clone)_asset0.mat b/Examples/UnToon_CornelBox_Assets/Materials/tex_body(Clone)_asset0.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/tex_face(Clone)_asset4.mat b/Examples/UnToon_CornelBox_Assets/Materials/tex_face(Clone)_asset4.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/tex_faceoption(Clone)_asset5.mat b/Examples/UnToon_CornelBox_Assets/Materials/tex_faceoption(Clone)_asset5.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/tex_hair(Clone)_asset3.mat b/Examples/UnToon_CornelBox_Assets/Materials/tex_hair(Clone)_asset3.mat
diff --git a/Examples/UnToon_CornelBox_Assets/Materials/tex_photon(Clone)_asset1.mat b/Examples/UnToon_CornelBox_Assets/Materials/tex_photon(Clone)_asset1.mat
diff --git a/Examples/UnToon_CornellBox.unity b/Examples/UnToon_CornellBox.unity
diff --git a/Examples/UnToon_CornellBox/LightingData.asset b/Examples/UnToon_CornellBox/LightingData.asset
diff --git a/Examples/UnToon_CornellBox/LightingData.asset.meta b/Examples/UnToon_CornellBox/LightingData.asset.meta
diff --git a/Examples/UnToon_CornellBox/Lightmap-0_comp_light.exr b/Examples/UnToon_CornellBox/Lightmap-0_comp_light.exr
diff --git a/Examples/UnToon_CornellBox/Lightmap-0_comp_light.exr.meta b/Examples/UnToon_CornellBox/Lightmap-0_comp_light.exr.meta
diff --git a/Examples/UnToon_CornellBox/ReflectionProbe-0.exr b/Examples/UnToon_CornellBox/ReflectionProbe-0.exr
diff --git a/Examples/UnToon_CornellBox/ReflectionProbe-0.exr.meta b/Examples/UnToon_CornellBox/ReflectionProbe-0.exr.meta
diff --git a/Examples/UnToon_CornellBox/ReflectionProbe-1.exr b/Examples/UnToon_CornellBox/ReflectionProbe-1.exr
diff --git a/Examples/UnToon_CornellBox/ReflectionProbe-1.exr.meta b/Examples/UnToon_CornellBox/ReflectionProbe-1.exr.meta
diff --git a/Examples/UnToon_CornellBox/ReflectionProbe-2.exr b/Examples/UnToon_CornellBox/ReflectionProbe-2.exr
diff --git a/Examples/UnToon_CornellBox/ReflectionProbe-2.exr.meta b/Examples/UnToon_CornellBox/ReflectionProbe-2.exr.meta
diff --git a/Examples/UnToon_Sample.unity b/Examples/UnToon_Sample.unity
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/2a7s_2ero_Avatar.prefab b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/2a7s_2ero_Avatar.prefab
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AllShapes.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AllShapes.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.controller b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_AutoBlink.controller
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_amazed.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_amazed.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_badsmile.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_badsmile.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_battlemode.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_battlemode.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_sit.overrideController b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_sit.overrideController
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile2.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_smile2.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_stand.overrideController b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_stand.overrideController
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_surprise.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_surprise.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_wink.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/2a72ero_wink.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/IDLE_2a7.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/IDLE_2a7.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/SIT_2a7.anim b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/SIT_2a7.anim
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/編集用2A-7.controller b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/anim/編集用2A-7.controller
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/fbx/2a7s_2eroVRC.fbx.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/fbx/2a7s_2eroVRC.fbx.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_face.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_face.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_faceoption.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_faceoption.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_photon.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_photon.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_armor.png.meta b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/tex/2a7s_2ero_armor.png.meta