diff --git a/Assets/VRM/UniGLTF/Editor/Tests/MaterialTests.cs b/Assets/VRM/UniGLTF/Editor/Tests/MaterialTests.cs index c6f2e49c3..d8d520c6a 100644 --- a/Assets/VRM/UniGLTF/Editor/Tests/MaterialTests.cs +++ b/Assets/VRM/UniGLTF/Editor/Tests/MaterialTests.cs @@ -217,6 +217,7 @@ namespace UniGLTF { var material = new Material(Shader.Find("Standard")); material.SetColor("_EmissionColor", new Color(0, 1, 2, 1)); + material.EnableKeyword("_EMISSION"); var materialExporter = new MaterialExporter(); var textureExportManager = new TextureExportManager(new Texture[] { }); var gltfMaterial = materialExporter.ExportMaterial(material, textureExportManager); diff --git a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs index 7f1b56db9..64a040a05 100644 --- a/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs +++ b/Assets/VRM/UniVRM/Scripts/Format/VRMExportSettings.cs @@ -141,14 +141,19 @@ namespace VRM foreach (var src in go.transform.Traverse().SelectMany(x => x.GetComponents())) { - // Copy VRMSprngBone + // Copy VRMSpringBone var dst = dstSecondary.gameObject.AddComponent(); dst.m_comment = src.m_comment; dst.m_stiffnessForce = src.m_stiffnessForce; dst.m_gravityPower = src.m_gravityPower; dst.m_gravityDir = src.m_gravityDir; dst.m_dragForce = src.m_dragForce; + if (src.m_center != null) + { + dst.m_center = map[src.m_center]; + } dst.RootBones = src.RootBones.Select(x => map[x]).ToList(); + dst.m_hitRadius = src.m_hitRadius; if (src.ColliderGroups != null) { dst.ColliderGroups = src.ColliderGroups.Select(x => map[x.transform].GetComponent()).ToArray(); diff --git a/README.ja.md b/README.ja.md index bdeee56a4..9d70b35b9 100644 --- a/README.ja.md +++ b/README.ja.md @@ -6,12 +6,12 @@ * [MIT License](./LICENSE.txt) -## [VRM](https://dwango.github.io/vrm/) +## [VRM](https://vrm.dev/) 「VRM」はVRアプリケーション向けの人型3Dアバター(3Dモデル)データを扱うためのファイルフォーマットです。 glTF2.0をベースとしており、誰でも自由に利用することができます。 -## [UniVRM](https://github.com/dwango/UniVRM) +## [UniVRM](https://github.com/vrm-c/UniVRM) 「UniVRM」は VRM の Unity 実装で、VRMモデルの作成・インポート・エクスポートができます。 @@ -19,16 +19,16 @@ glTF2.0をベースとしており、誰でも自由に利用することがで ## Download -1. 本リポジトリの[リリースページ](https://github.com/dwango/UniVRM/releases)へ移動してください。 +1. 本リポジトリの[リリースページ](https://github.com/vrm-c/UniVRM/releases)へ移動してください。 1. 最新の``UniVRM-0.xx.unitypackage``をダウンロードしてください。 1. ``UniVRM-0.xx.unitypackage``をUnityのプロジェクトにインポートしてください。 - 1. [UniVRMのインストール](https://dwango.github.io/vrm/univrm/univrm_install/)も参照してください。 + 1. [UniVRMのインストール](https://vrm.dev/univrm/univrm_install/)も参照してください。 ## Script Samples -* [UniVRMTest(テストとサンプル)](https://github.com/dwango/UniVRMTest) +* [UniVRMTest(テストとサンプル)](https://github.com/vrm-c/UniVRMTest) ## Documents -* https://dwango.github.io/vrm/ -* https://github.com/dwango/UniVRM/wiki +* https://vrm.dev/ +* https://github.com/vrm-c/UniVRM/wiki diff --git a/README.md b/README.md index 80bf6312e..7bd6f77c3 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ * [MIT License](./LICENSE.txt) -## [VRM](https://dwango.github.io/vrm/) +## [VRM](https://vrm.dev/) "VRM" is a file format for using 3d humanoid avatars (and models) in VR applications. VRM is based on glTF2.0. If you comply with the MIT license, you are free to use it. -## [UniVRM](https://github.com/dwango/UniVRM) +## [UniVRM](https://github.com/vrm-c/UniVRM) "UniVRM" is a Unity implementation of VRM. It can create, import and export VRM models. @@ -19,17 +19,17 @@ VRM is based on glTF2.0. If you comply with the MIT license, you are free to use ## Download -1. Go to the [releases page](https://github.com/dwango/UniVRM/releases) +1. Go to the [releases page](https://github.com/vrm-c/UniVRM/releases) 1. Download the latest ``UniVRM-0.xx.unitypackage`` 1. Import the downloaded package into the Unity project. - 1. See also [UniVRM installation](https://dwango.github.io/en/vrm/univrm/univrm_install/) + 1. See also [UniVRM installation](https://vrm.dev/en/univrm/univrm_install/) ## Script Samples -* [UniVRMTest](https://github.com/dwango/UniVRMTest) +* [UniVRMTest](https://github.com/vrm-c/UniVRMTest) ## Documents -* https://dwango.github.io/vrm/ -* https://dwango.github.io/en/vrm/ -* https://github.com/dwango/UniVRM/wiki +* https://vrm.dev/ +* https://vrm.dev/en/ +* https://github.com/vrm-c/UniVRM/wiki