diff --git a/.gitignore b/.gitignore
index d8d76d543..c78e61598 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,10 +49,16 @@ Assets/StreamingAssets/crashlytics-build.properties
#
# Manually appended
#
+
+# Personal
.idea/
Assets/_Private/
Assets/_Private.meta
+# Unity
+/ProjectSettings/BurstAotSettings_StandaloneWindows.json
+
# sphinx build
public
*.pyc
+
diff --git a/Assets/UniGLTF/UniHumanoid/doc.meta b/Assets/UniGLTF/Editor/UniHumanoid.meta
similarity index 62%
rename from Assets/UniGLTF/UniHumanoid/doc.meta
rename to Assets/UniGLTF/Editor/UniHumanoid.meta
index 50c76b7f7..aa7f73e46 100644
--- a/Assets/UniGLTF/UniHumanoid/doc.meta
+++ b/Assets/UniGLTF/Editor/UniHumanoid.meta
@@ -1,8 +1,6 @@
fileFormatVersion: 2
-guid: bd16aca6bf957944396bb28ff3678f05
+guid: 87fb37c3af5e8f941b873faeabf6a5f8
folderAsset: yes
-timeCreated: 1517663952
-licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs
rename to Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/BoneMappingEditor.cs.meta
rename to Assets/UniGLTF/Editor/UniHumanoid/BoneMappingEditor.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs
rename to Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/HumanPoseTransferEditor.cs.meta
rename to Assets/UniGLTF/Editor/UniHumanoid/HumanPoseTransferEditor.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs
rename to Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/HumanoidEditor.cs.meta
rename to Assets/UniGLTF/Editor/UniHumanoid/HumanoidEditor.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs b/Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs
rename to Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/MuscleInspectorEditor.cs.meta
rename to Assets/UniGLTF/Editor/UniHumanoid/MuscleInspectorEditor.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef b/Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef
rename to Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef.meta b/Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/UniHumanoid.Editor.asmdef.meta
rename to Assets/UniGLTF/Editor/UniHumanoid/UniHumanoid.Editor.asmdef.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs b/Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs
rename to Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs.meta b/Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/bvhAssetPostprocessor.cs.meta
rename to Assets/UniGLTF/Editor/UniHumanoid/bvhAssetPostprocessor.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Resources.meta b/Assets/UniGLTF/Runtime/Resources.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Resources.meta
rename to Assets/UniGLTF/Runtime/Resources.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset b/Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset
rename to Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset
diff --git a/Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset.meta b/Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Resources/T-Pose.pose.asset.meta
rename to Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt b/Assets/UniGLTF/Runtime/Resources/test_motion.txt
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt
rename to Assets/UniGLTF/Runtime/Resources/test_motion.txt
diff --git a/Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt.meta b/Assets/UniGLTF/Runtime/Resources/test_motion.txt.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Resources/test_motion.txt.meta
rename to Assets/UniGLTF/Runtime/Resources/test_motion.txt.meta
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs
index 09ed4ad2b..603a94c2c 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureExporter.cs
@@ -17,10 +17,10 @@ namespace UniGLTF
///
/// を更新し、textures の index を返す
///
+ /// もっとも根本の Exporter クラスのみが呼び出すべきである。
+ /// 他の拡張機能などが呼び出すべきではない。
+ ///
///
- ///
- ///
- ///
/// gltf texture index
public static int PushGltfTexture(ExportingGltfData data, Texture2D texture, ColorSpace textureColorSpace, ITextureSerializer textureSerializer)
{
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs
index 11552c84a..4f8707b7b 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs
@@ -46,8 +46,6 @@ namespace UniGLTF
private set;
}
- public ITextureExporter TextureExporter => m_textureExporter;
-
protected virtual IMaterialExporter CreateMaterialExporter()
{
return new MaterialExporter();
@@ -65,7 +63,8 @@ namespace UniGLTF
}
}
- TextureExporter m_textureExporter;
+ protected ITextureExporter TextureExporter => _textureExporter;
+ private TextureExporter _textureExporter;
GltfExportSettings m_settings;
@@ -236,7 +235,7 @@ namespace UniGLTF
#region Materials and Textures
Materials = uniqueUnityMeshes.GetUniqueMaterials().ToList();
- m_textureExporter = new TextureExporter(textureSerializer);
+ _textureExporter = new TextureExporter(textureSerializer);
var materialExporter = CreateMaterialExporter();
_gltf.materials = Materials.Select(x => materialExporter.ExportMaterial(x, TextureExporter, m_settings)).ToList();
@@ -378,7 +377,7 @@ namespace UniGLTF
ExportExtensions(textureSerializer);
// Extension で Texture が増える場合があるので最後に呼ぶ
- var exported = m_textureExporter.Export();
+ var exported = _textureExporter.Export();
for (var exportedTextureIdx = 0; exportedTextureIdx < exported.Count; ++exportedTextureIdx)
{
var (unityTexture, colorSpace) = exported[exportedTextureIdx];
diff --git a/Assets/UniGLTF/UniHumanoid.meta b/Assets/UniGLTF/Runtime/UniHumanoid.meta
similarity index 58%
rename from Assets/UniGLTF/UniHumanoid.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid.meta
index 67270dc2c..b06bf81e4 100644
--- a/Assets/UniGLTF/UniHumanoid.meta
+++ b/Assets/UniGLTF/Runtime/UniHumanoid.meta
@@ -1,9 +1,8 @@
fileFormatVersion: 2
-guid: 42aed961be744fc4b9d423ac4c29f3c9
+guid: b1162898a107f7f43aec5979932edd38
folderAsset: yes
-timeCreated: 1545999482
-licenseType: Pro
DefaultImporter:
+ externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs b/Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/AnimationClipUtility.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/AnimationClipUtility.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs b/Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/AvatarDescription.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs b/Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneGizmoDrawer.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneGizmoDrawer.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs b/Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/BoneMapping.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/BoneMapping.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs b/Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/BvhBone.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/BvhBone.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Extensions.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Extensions.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Extensions.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/Extensions.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Extensions/EnumExtensions.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/Extensions/EnumExtensions.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Format.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Format.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Format.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/Format.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Format/Bvh.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/Format/Bvh.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseClip.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanPoseTransfer.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseTransfer.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Humanoid.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/Humanoid.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs b/Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/HumanoidLoader.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/HumanoidLoader.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IBone.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IBone.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhAnimationClip.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhAnimationClip.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporter.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporter.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/BvhImporterContext.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/BvhImporterContext.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/BvhExtensions.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/BvhExtensions.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/IO/Extensions/UnityExtensions.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/IO/Extensions/UnityExtensions.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleDebug.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleDebug.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/MuscleInspector.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/MuscleInspector.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier.meta
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandPose.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandPose.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier/HandRig.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/HandRig.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs
diff --git a/Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/PoseModifier/IPoseModifier.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/PoseModifier/IPoseModifier.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs b/Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/Skeleton.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/Skeleton.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonEstimator.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonEstimator.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs
rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs.meta b/Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scripts/SkeletonMeshUtility.cs.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/SkeletonMeshUtility.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef b/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef
rename to Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef
diff --git a/Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef.meta b/Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/UniHumanoid.asmdef.meta
rename to Assets/UniGLTF/Runtime/UniHumanoid/UniHumanoid.asmdef.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes.meta b/Assets/UniGLTF/Samples/UniHumanoid.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes.meta
rename to Assets/UniGLTF/Samples/UniHumanoid.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs b/Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs
rename to Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs.meta b/Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/HumanBuilderTest.cs.meta
rename to Assets/UniGLTF/Samples/UniHumanoid/HumanBuilderTest.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity b/Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity
rename to Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity.meta b/Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/PoseTransfer.unity.meta
rename to Assets/UniGLTF/Samples/UniHumanoid/PoseTransfer.unity.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs
rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs.meta b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.cs.meta
rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity
rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity.meta b/Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/RuntimeBvhLoader.unity.meta
rename to Assets/UniGLTF/Samples/UniHumanoid/RuntimeBvhLoader.unity.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/target.mat b/Assets/UniGLTF/Samples/UniHumanoid/target.mat
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/target.mat
rename to Assets/UniGLTF/Samples/UniHumanoid/target.mat
diff --git a/Assets/UniGLTF/UniHumanoid/Scenes/target.mat.meta b/Assets/UniGLTF/Samples/UniHumanoid/target.mat.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Scenes/target.mat.meta
rename to Assets/UniGLTF/Samples/UniHumanoid/target.mat.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests.meta b/Assets/UniGLTF/Tests/UniHumanoid.meta
similarity index 57%
rename from Assets/UniGLTF/UniHumanoid/Editor/Tests.meta
rename to Assets/UniGLTF/Tests/UniHumanoid.meta
index 3b8730642..9ff4681ea 100644
--- a/Assets/UniGLTF/UniHumanoid/Editor/Tests.meta
+++ b/Assets/UniGLTF/Tests/UniHumanoid.meta
@@ -1,9 +1,8 @@
fileFormatVersion: 2
-guid: fcdf450ca966f85428c238046e51c2ca
+guid: 8e2610f02b10eed49b1862c9bb5c5633
folderAsset: yes
-timeCreated: 1534750149
-licenseType: Free
DefaultImporter:
+ externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs b/Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs
rename to Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs.meta b/Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/BvhLoaderTests.cs.meta
rename to Assets/UniGLTF/Tests/UniHumanoid/BvhLoaderTests.cs.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef b/Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef
rename to Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef
diff --git a/Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef.meta b/Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef.meta
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/Editor/Tests/UniHumanoid.Editor.Tests.asmdef.meta
rename to Assets/UniGLTF/Tests/UniHumanoid/UniHumanoid.Editor.Tests.asmdef.meta
diff --git a/Assets/UniGLTF/UniHumanoid/Editor.meta b/Assets/UniGLTF/UniHumanoid/Editor.meta
deleted file mode 100644
index 700ef71e6..000000000
--- a/Assets/UniGLTF/UniHumanoid/Editor.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 6dfa46c173ff021418df4bada32ddfe9
-folderAsset: yes
-timeCreated: 1517655448
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/LICENSE.md b/Assets/UniGLTF/UniHumanoid/LICENSE.md
deleted file mode 100644
index 3299d454f..000000000
--- a/Assets/UniGLTF/UniHumanoid/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 ousttrue
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/Assets/UniGLTF/UniHumanoid/LICENSE.md.meta b/Assets/UniGLTF/UniHumanoid/LICENSE.md.meta
deleted file mode 100644
index 24df7cd34..000000000
--- a/Assets/UniGLTF/UniHumanoid/LICENSE.md.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3ea85fd858590174f98cc2cd4c3e083f
-timeCreated: 1522228320
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/README.md.meta b/Assets/UniGLTF/UniHumanoid/README.md.meta
deleted file mode 100644
index 832294e89..000000000
--- a/Assets/UniGLTF/UniHumanoid/README.md.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: be513cfaa8530114d85f1e8e0f29708a
-timeCreated: 1517370218
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/Scripts.meta b/Assets/UniGLTF/UniHumanoid/Scripts.meta
deleted file mode 100644
index a7876e5ea..000000000
--- a/Assets/UniGLTF/UniHumanoid/Scripts.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 64819743741f38e43b64a7d6add8cea9
-folderAsset: yes
-timeCreated: 1517166088
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta b/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta
deleted file mode 100644
index d3f0a79c8..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: f4993bbf703729441869ce8186574f2b
-timeCreated: 1517138583
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta b/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta
deleted file mode 100644
index da2e5c7d2..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 1e5ed0d1eaae21c46b59beeeb761a357
-timeCreated: 1517138581
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/assets.png.meta b/Assets/UniGLTF/UniHumanoid/doc/assets.png.meta
deleted file mode 100644
index 232c0dde7..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/assets.png.meta
+++ /dev/null
@@ -1,68 +0,0 @@
-fileFormatVersion: 2
-guid: f998ebae6d907c94b87d25d0d24939d6
-timeCreated: 1535601388
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 4
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- filterMode: -1
- aniso: -1
- mipBias: -1
- wrapMode: -1
- nPOTScale: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta b/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta
deleted file mode 100644
index 78605cee5..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 06577ef88ae5dea4189cb3022681fa9f
-timeCreated: 1518017275
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta b/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta
deleted file mode 100644
index 87746bc3e..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 65ce8e194a35af1449cbc70c76e385ad
-timeCreated: 1518016999
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta b/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta
deleted file mode 100644
index 41830c182..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 0f274a7a8cb1663479e10b9b1820156d
-timeCreated: 1518016802
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta b/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta
deleted file mode 100644
index 15ffc1163..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 81969f93770cf844eab1f4137fefe07e
-timeCreated: 1517138582
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta b/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta
deleted file mode 100644
index 141eaaa97..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 8dd213e4a507dac4585f174f27fcd677
-timeCreated: 1518018122
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta b/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta
deleted file mode 100644
index ccfeb446e..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png.meta
+++ /dev/null
@@ -1,77 +0,0 @@
-fileFormatVersion: 2
-guid: 0091e5f38ae478b47ba5b2aec91e1598
-timeCreated: 1519110272
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- externalObjects: {}
- serializedVersion: 4
- 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
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -1
- 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}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta b/Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta
deleted file mode 100644
index 0a350c611..000000000
--- a/Assets/UniGLTF/UniHumanoid/doc/mesh.png.meta
+++ /dev/null
@@ -1,68 +0,0 @@
-fileFormatVersion: 2
-guid: 7e153a45f4c3fab428c47e3d6509252d
-timeCreated: 1535601388
-licenseType: Free
-TextureImporter:
- fileIDToRecycleName: {}
- serializedVersion: 4
- mipmaps:
- mipMapMode: 0
- enableMipMap: 1
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- filterMode: -1
- aniso: -1
- mipBias: -1
- wrapMode: -1
- nPOTScale: 1
- lightmap: 0
- compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
- spriteTessellationDetail: -1
- textureType: 0
- textureShape: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- platformSettings:
- - buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- spritePackingTag:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/VRM/Runtime/IO/VRMExporter.cs b/Assets/VRM/Runtime/IO/VRMExporter.cs
index 741d31ad9..47178ed03 100644
--- a/Assets/VRM/Runtime/IO/VRMExporter.cs
+++ b/Assets/VRM/Runtime/IO/VRMExporter.cs
@@ -118,7 +118,7 @@ namespace VRM
VRM.meta.title = meta.Title;
if (meta.Thumbnail != null)
{
- VRM.meta.texture = GltfTextureExporter.PushGltfTexture(_data, meta.Thumbnail, ColorSpace.sRGB, textureSerializer);
+ VRM.meta.texture = TextureExporter.RegisterExportingAsSRgb(meta.Thumbnail, needsAlpha: true);
}
VRM.meta.licenseType = meta.LicenseType;
diff --git a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs
index 24e3dda1f..fe57e83ee 100644
--- a/Assets/VRM10/Runtime/Migration/MeshUpdater.cs
+++ b/Assets/VRM10/Runtime/Migration/MeshUpdater.cs
@@ -157,7 +157,7 @@ namespace UniVRM10
gltfNode.translation = node.LocalTranslation.ToFloat3();
gltfNode.rotation = node.LocalRotation.ToFloat4();
gltfNode.scale = node.LocalScaling.ToFloat3();
- if (gltfNode.skin >= 0)
+ if (gltfNode.mesh >= 0 && gltfNode.skin >= 0)
{
var gltfSkin = gltf.skins[gltfNode.skin];
gltfSkin.inverseBindMatrices = AddAccessor(node.MeshGroup.Skin.InverseMatrices.GetSpan());
diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs
new file mode 100644
index 000000000..45d088afd
--- /dev/null
+++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace VRMShaders
+{
+ internal static class EditorTextureUtility
+ {
+ public static bool TryGetAsEditorTexture2DAsset(Texture texture, out Texture2D texture2D, out TextureImporter assetImporter)
+ {
+ texture2D = texture as Texture2D;
+ if (texture2D != null)
+ {
+ var path = AssetDatabase.GetAssetPath(texture2D);
+ if (!string.IsNullOrEmpty(path))
+ {
+ assetImporter = AssetImporter.GetAtPath(path) as TextureImporter;
+ if (assetImporter != null)
+ {
+ return true;
+ }
+ }
+ }
+
+ texture2D = null;
+ assetImporter = null;
+ return false;
+ }
+
+ public static bool TryGetOriginalTexturePixelSize(TextureImporter textureImporter, out Vector2Int size)
+ {
+ // private メソッド TextureImporter.GetWidthAndHeight を無理やり呼ぶ
+ var getSizeMethod = typeof(TextureImporter).GetMethod("GetWidthAndHeight", BindingFlags.NonPublic | BindingFlags.Instance);
+ if (textureImporter != null && getSizeMethod != null)
+ {
+ var args = new object[2] { 0, 0 };
+ getSizeMethod.Invoke(textureImporter, args);
+ var originalWidth = (int)args[0];
+ var originalHeight = (int)args[1];
+
+ size = new Vector2Int(originalWidth, originalHeight);
+ return true;
+ }
+
+ size = default;
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta
new file mode 100644
index 000000000..79ab25f71
--- /dev/null
+++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/EditorTextureUtility.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 20719e2944224be681a607b6db951720
+timeCreated: 1638542710
\ No newline at end of file
diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs
index 3def724cc..ee0932873 100644
--- a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs
+++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Exporter/EditorTextureSerializer.cs
@@ -1,6 +1,5 @@
using System;
using System.IO;
-using System.Reflection;
using UnityEditor;
using UnityEngine;
@@ -8,7 +7,7 @@ namespace VRMShaders
{
public sealed class EditorTextureSerializer : ITextureSerializer
{
- private readonly RuntimeTextureSerializer m_runtimeSerializer = new RuntimeTextureSerializer();
+ private readonly RuntimeTextureSerializer _runtimeSerializer = new RuntimeTextureSerializer();
///
/// Texture をオリジナルのテクスチャアセット(png/jpg)ファイルのバイト列そのまま出力してよいかどうか判断する。
@@ -24,13 +23,13 @@ namespace VRMShaders
public bool CanExportAsEditorAssetFile(Texture texture, ColorSpace exportColorSpace)
{
// Exists as UnityEditor Texture2D Assets ?
- if (!TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var textureImporter)) return false;
+ if (!EditorTextureUtility.TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var textureImporter)) return false;
// Maintain original width/height ?
- if (!IsTextureSizeMaintained(texture2D, textureImporter)) return false;
+ if (!IsTextureSizeMaintained(textureImporter)) return false;
// Equals color space ?
- if (!IsFileColorSpaceSameWithExportColorSpace(texture2D, textureImporter, exportColorSpace)) return false;
+ if (!IsFileColorSpaceSameWithExportColorSpace(textureImporter, exportColorSpace)) return false;
// Each Texture Importer Type Validation
switch (textureImporter.textureType)
@@ -56,7 +55,19 @@ namespace VRMShaders
return (bytes, mime);
}
- return m_runtimeSerializer.ExportBytesWithMime(texture, exportColorSpace);
+ return _runtimeSerializer.ExportBytesWithMime(texture, exportColorSpace);
+ }
+
+ ///
+ /// 出力に使用したいテクスチャに対して、Unity のエディタアセットとしての圧縮設定を OFF にする。
+ ///
+ public void ModifyTextureAssetBeforeExporting(Texture texture)
+ {
+ if (EditorTextureUtility.TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var assetImporter))
+ {
+ assetImporter.textureCompression = TextureImporterCompression.Uncompressed;
+ assetImporter.SaveAndReimport();
+ }
}
///
@@ -94,44 +105,17 @@ namespace VRMShaders
return false;
}
- private bool TryGetAsEditorTexture2DAsset(Texture texture, out Texture2D texture2D, out TextureImporter assetImporter)
- {
- texture2D = texture as Texture2D;
- if (texture2D != null)
- {
- var path = AssetDatabase.GetAssetPath(texture2D);
- if (!string.IsNullOrEmpty(path))
- {
- assetImporter = AssetImporter.GetAtPath(path) as TextureImporter;
- if (assetImporter != null)
- {
- return true;
- }
- }
- }
-
- texture2D = null;
- assetImporter = null;
- return false;
- }
-
///
/// Texture2D の画像サイズが、オリジナルの画像サイズを維持しているかどうか
///
/// TextureImporter の MaxTextureSize 設定によっては、Texture2D の画像サイズはオリジナルも小さくなりうる。
///
- private bool IsTextureSizeMaintained(Texture2D texture, TextureImporter textureImporter)
+ private bool IsTextureSizeMaintained(TextureImporter textureImporter)
{
- // private メソッド TextureImporter.GetWidthAndHeight を無理やり呼ぶ
- var getSizeMethod = typeof(TextureImporter).GetMethod("GetWidthAndHeight", BindingFlags.NonPublic | BindingFlags.Instance);
- if (textureImporter != null && getSizeMethod != null)
+ if (EditorTextureUtility.TryGetOriginalTexturePixelSize(textureImporter, out var originalSize))
{
- var args = new object[2] { 0, 0 };
- getSizeMethod.Invoke(textureImporter, args);
- var originalWidth = (int)args[0];
- var originalHeight = (int)args[1];
- var originalSize = Mathf.Max(originalWidth, originalHeight);
- if (textureImporter.maxTextureSize >= originalSize)
+ var originalMaxSize = Mathf.Max(originalSize.x, originalSize.y);
+ if (textureImporter.maxTextureSize >= originalMaxSize)
{
return true;
}
@@ -140,7 +124,7 @@ namespace VRMShaders
return false;
}
- private bool IsFileColorSpaceSameWithExportColorSpace(Texture2D texture, TextureImporter textureImporter, ColorSpace colorSpace)
+ private bool IsFileColorSpaceSameWithExportColorSpace(TextureImporter textureImporter, ColorSpace colorSpace)
{
switch (colorSpace)
{
diff --git a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs
index c6266f698..e59fc340b 100644
--- a/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs
+++ b/Assets/VRMShaders/GLTF/IO/Editor/Texture/Importer/TextureImporterConfigurator.cs
@@ -8,31 +8,29 @@ namespace VRMShaders
{
public static class TextureImporterConfigurator
{
- public static void ConfigureSize(Texture texture, TextureImporter textureImporter)
+ private static void ConfigureSize(TextureImporter textureImporter)
{
- var maxSize = Mathf.Max(texture.width, texture.height);
- textureImporter.maxTextureSize
- = maxSize > 4096 ? 8192 :
- maxSize > 2048 ? 4096 :
- maxSize > 1024 ? 2048 :
- maxSize > 512 ? 1024 :
+ if (!EditorTextureUtility.TryGetOriginalTexturePixelSize(textureImporter, out var originalSize)) return;
+
+ var originalMaxSize = Mathf.Max(originalSize.x, originalSize.y);
+ textureImporter.maxTextureSize = originalMaxSize > 4096 ? 8192 :
+ originalMaxSize > 2048 ? 4096 :
+ originalMaxSize > 1024 ? 2048 :
+ originalMaxSize > 512 ? 1024 :
512;
- textureImporter.SaveAndReimport();
}
- public static void ConfigureNormalMap(Texture texture, TextureImporter textureImporter)
+ private static void ConfigureNormalMap(TextureImporter textureImporter)
{
textureImporter.textureType = TextureImporterType.NormalMap;
- textureImporter.SaveAndReimport();
}
- public static void ConfigureLinear(Texture texture, TextureImporter textureImporter)
+ private static void ConfigureLinear(TextureImporter textureImporter)
{
textureImporter.sRGBTexture = false;
- textureImporter.SaveAndReimport();
}
- public static void ConfigureSampler(TextureDescriptor texDesc, TextureImporter textureImporter)
+ private static void ConfigureSampler(TextureDescriptor texDesc, TextureImporter textureImporter)
{
textureImporter.mipmapEnabled = texDesc.Sampler.EnableMipMap;
textureImporter.filterMode = texDesc.Sampler.FilterMode;
@@ -40,72 +38,34 @@ namespace VRMShaders
textureImporter.wrapModeV = texDesc.Sampler.WrapModesV;
}
- class ImporterGetter : IDisposable
- {
- public TextureImporter Importer;
-
- ImporterGetter(TextureImporter importer)
- {
- Importer = importer;
- }
-
- public void Dispose()
- {
- Importer.SaveAndReimport();
- }
-
- public static bool TryGetImporter(Texture texture, out ImporterGetter getter)
- {
- var path = AssetDatabase.GetAssetPath(texture);
- if (String.IsNullOrEmpty(path))
- {
- Debug.LogWarning($"{path} is not asset");
- }
- else
- {
- if (AssetImporter.GetAtPath(path) is TextureImporter importer)
- {
- getter = new ImporterGetter(importer);
- return true;
- }
- else
- {
- Debug.LogWarning($"{path}: fail to get TextureImporter");
- }
- }
- getter = default;
- return false;
- }
- }
-
- static void Configure(TextureDescriptor texDesc, Texture external, TextureImporter importer)
+ private static void Configure(TextureDescriptor texDesc, TextureImporter importer)
{
switch (texDesc.TextureType)
{
case TextureImportTypes.NormalMap:
{
- ConfigureSize(external, importer);
- ConfigureNormalMap(external, importer);
+ ConfigureSize(importer);
+ ConfigureNormalMap(importer);
}
break;
case TextureImportTypes.StandardMap:
{
- ConfigureSize(external, importer);
- ConfigureLinear(external, importer);
+ ConfigureSize(importer);
+ ConfigureLinear(importer);
}
break;
case TextureImportTypes.sRGB:
{
- ConfigureSize(external, importer);
+ ConfigureSize(importer);
}
break;
case TextureImportTypes.Linear:
{
- ConfigureSize(external, importer);
- ConfigureLinear(external, importer);
+ ConfigureSize(importer);
+ ConfigureLinear(importer);
}
break;
@@ -116,18 +76,13 @@ namespace VRMShaders
ConfigureSampler(texDesc, importer);
}
- public static void Configure(TextureDescriptor texDesc, IReadOnlyDictionary ExternalMap)
+ public static void Configure(TextureDescriptor texDesc, IReadOnlyDictionary externalMap)
{
- if (ExternalMap.TryGetValue(texDesc.SubAssetKey, out Texture external))
- {
- if (ImporterGetter.TryGetImporter(external, out ImporterGetter getter))
- {
- using (getter)
- {
- Configure(texDesc, external, getter.Importer);
- }
- }
- }
+ if (!externalMap.TryGetValue(texDesc.SubAssetKey, out var externalTexture)) return;
+ if (!EditorTextureUtility.TryGetAsEditorTexture2DAsset(externalTexture, out var texture2D, out var importer)) return;
+
+ Configure(texDesc, importer);
+ importer.SaveAndReimport();
}
}
}
diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs
index 8da1bf82b..c14118b8c 100644
--- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs
+++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/ITextureSerializer.cs
@@ -22,5 +22,12 @@ namespace VRMShaders
/// 具体的には Texture2D をコピーする際に、コピー先の Texture2D の色空間を決定するために使用する。
///
(byte[] bytes, string mime) ExportBytesWithMime(Texture2D texture, ColorSpace exportColorSpace);
+
+ ///
+ /// エクスポートに使用したい Texture に対して、事前準備を行う。
+ ///
+ /// たとえば UnityEditor においては、Texture Asset の圧縮設定を OFF にしたりしたい。
+ ///
+ void ModifyTextureAssetBeforeExporting(Texture texture);
}
}
diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs
index 9bbd12e3f..c5894a8c4 100644
--- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs
+++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/RuntimeTextureSerializer.cs
@@ -1,6 +1,5 @@
using System;
using UnityEngine;
-using VRMShaders;
namespace VRMShaders
{
@@ -39,6 +38,11 @@ namespace VRMShaders
}
}
+ public void ModifyTextureAssetBeforeExporting(Texture texture)
+ {
+ // NOTE: Do nothing.
+ }
+
private static (byte[] bytes, string mime) CopyTextureAndGetBytesWithMime(Texture2D texture, ColorSpace colorSpace)
{
var needsAlpha = texture.format != TextureFormat.RGB24;
diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs
index 058bd8d14..3b4229dc6 100644
--- a/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs
+++ b/Assets/VRMShaders/GLTF/IO/Runtime/Texture/Exporter/TextureExporter.cs
@@ -10,12 +10,12 @@ namespace VRMShaders
///
public sealed class TextureExporter : IDisposable, ITextureExporter
{
- private readonly ITextureSerializer m_textureSerializer;
+ private readonly ITextureSerializer _textureSerializer;
private readonly List _exportingList = new List();
public TextureExporter(ITextureSerializer textureSerializer)
{
- m_textureSerializer = textureSerializer;
+ _textureSerializer = textureSerializer;
}
public void Dispose()
@@ -94,7 +94,13 @@ namespace VRMShaders
var param = new TextureExportParam(TextureExportTypes.OcclusionMetallicRoughness, ColorSpace.Linear,
metallicSmoothTexture, occlusionTexture, smoothness, false,
- () => OcclusionMetallicRoughnessConverter.Export(metallicSmoothTexture, smoothness, occlusionTexture));
+ () =>
+ {
+ _textureSerializer.ModifyTextureAssetBeforeExporting(metallicSmoothTexture);
+ _textureSerializer.ModifyTextureAssetBeforeExporting(occlusionTexture);
+ return OcclusionMetallicRoughnessConverter.Export(metallicSmoothTexture, smoothness,
+ occlusionTexture);
+ });
if (TryGetExistsParam(param, out var existsIdx))
{
// Return cacehd
@@ -116,7 +122,11 @@ namespace VRMShaders
}
var param = new TextureExportParam(TextureExportTypes.Normal, ColorSpace.Linear, src, default, default,
- false, () => NormalConverter.Export(src));
+ false, () =>
+ {
+ _textureSerializer.ModifyTextureAssetBeforeExporting(src);
+ return NormalConverter.Export(src);
+ });
if (TryGetExistsParam(param, out var existsIdx))
{
// Return cached;
@@ -136,12 +146,15 @@ namespace VRMShaders
{
// get Texture2D
var texture2D = src as Texture2D;
- if (m_textureSerializer.CanExportAsEditorAssetFile(texture2D, exportColorSpace))
+ if (_textureSerializer.CanExportAsEditorAssetFile(texture2D, exportColorSpace))
{
- // do nothing
+ // NOTE: 生のファイルとして出力可能な場合、何もせずそのまま Texture2D を渡す。
+ // ただし、この場合のみ圧縮設定をオフにしなかった場合、挙動としてバグっぽく見えるので、これもオフにする。
+ _textureSerializer.ModifyTextureAssetBeforeExporting(src);
}
else
{
+ _textureSerializer.ModifyTextureAssetBeforeExporting(src);
texture2D = TextureConverter.CopyTexture(src, exportColorSpace, needsAlpha, null);
}
return texture2D;
diff --git a/docs/index.md b/docs/index.md
index d3f52a83c..3c2358c84 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,6 +9,7 @@ UnityでVRMをエクスポートする方法などについては [manual](https
build
implementation/index
gltf/index
+unihumanoid/index
vrm0/index
vrm1/index
release/index
diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png b/docs/unihumanoid/BoneMappingGizmo.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/BoneMappingGizmo.png
rename to docs/unihumanoid/BoneMappingGizmo.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png b/docs/unihumanoid/BoneMappingInspector.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/BoneMappingInspector.png
rename to docs/unihumanoid/BoneMappingInspector.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/assets.png b/docs/unihumanoid/assets.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/assets.png
rename to docs/unihumanoid/assets.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png b/docs/unihumanoid/bvh_bonemapping.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/bvh_bonemapping.png
rename to docs/unihumanoid/bvh_bonemapping.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png b/docs/unihumanoid/bvh_gameobject.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/bvh_gameobject.png
rename to docs/unihumanoid/bvh_gameobject.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png b/docs/unihumanoid/bvh_prefab.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/bvh_prefab.png
rename to docs/unihumanoid/bvh_prefab.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanoid.gif b/docs/unihumanoid/humanoid.gif
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/humanoid.gif
rename to docs/unihumanoid/humanoid.gif
diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png b/docs/unihumanoid/humanpose_transfer.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer.png
rename to docs/unihumanoid/humanpose_transfer.png
diff --git a/Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png b/docs/unihumanoid/humanpose_transfer_inspector.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/humanpose_transfer_inspector.png
rename to docs/unihumanoid/humanpose_transfer_inspector.png
diff --git a/Assets/UniGLTF/UniHumanoid/README.md b/docs/unihumanoid/index.md
similarity index 74%
rename from Assets/UniGLTF/UniHumanoid/README.md
rename to docs/unihumanoid/index.md
index 2b1559526..a7137e73d 100644
--- a/Assets/UniGLTF/UniHumanoid/README.md
+++ b/docs/unihumanoid/index.md
@@ -2,11 +2,7 @@
Unity humanoid utility with bvh importer.
-# License
-
-* [MIT](./LICENSE.md)
-
-# BVH runtime loader
+## BVH runtime loader
```cs
var context = new BvhImporterContext();
@@ -15,19 +11,19 @@ context.Load(); // create Skeleton hierarchy and mesh for visualize
GameObject root = context.Root;
```
-## RuntimeLoader
+### RuntimeLoader
* Scenes/RuntimeBvhLoader.unity
-## RuntimeLoader and PoseTransfer
+### RuntimeLoader and PoseTransfer
Load BVH and transfer pose to any model with humanoid avatar.
* Scenes/PoseTransfer.unity
-
+
-
+
-# Load bvh and create prefab with AnimationClip
+## Load bvh and create prefab with AnimationClip
Drop bvh file to Assets folder.
Then, AssetPostprocessor import bvh file.
@@ -37,15 +33,15 @@ Then, AssetPostprocessor import bvh file.
* create a legacy mode AnimationClip
* create a skinned mesh for preview
-
+
Instanciate prefab to scene.
-
+
That object can play.
-# BoneMapping
+## BoneMapping
This script help create human avatar from exist GameObject hierarchy.
First, attach this script to root GameObject that has Animator.
@@ -63,15 +59,14 @@ If fail to guess bone mapping, you can set bones manually.
Optional, press Ensure T-Pose.
Create avatar.
-
+
These humanoids imported by [UniGLTF](https://github.com/ousttrue/UniGLTF) and created human avatar by BoneMapping.
-
+
-# Download BVH files
+## Download BVH files
* https://sites.google.com/a/cgspeed.com/cgspeed/motion-capture
* http://mocapdata.com/
* http://www.thetrailerspark.com/download/Mocap/Packed/EYES-JAPAN/BVH/
-
diff --git a/Assets/UniGLTF/UniHumanoid/doc/mesh.png b/docs/unihumanoid/mesh.png
similarity index 100%
rename from Assets/UniGLTF/UniHumanoid/doc/mesh.png
rename to docs/unihumanoid/mesh.png