Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-31 23:42:28 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,467 Commits 3 Branches 219 Tags 124 MiB
dbdb147e2a
Commit Graph

311 Commits

Author SHA1 Message Date
ousttrue
760051f1ac
Merge pull request #1085 from ousttrue/feature10/VRMC_hdr_emissiveMultiplier 
VRMC_materials_hdr_emissiveMultiplier 実装
 2021-06-30 15:10:26 +09:00
ousttrue
a319b61441 null check 2021-06-30 14:51:26 +09:00
ousttrue
8b645b060d
Merge pull request #1083 from Santarh/fixDuplicatedSufix 
Add unique suffix to same name assets.
 2021-06-30 13:51:10 +09:00
Masataka SUMI
e1c897b220 Add unique suffix to same name assets. 2021-06-29 22:23:03 +09:00
Masataka SUMI
70c01d5344 AnimationClip import with AnimationClipFactory 2021-06-29 21:02:19 +09:00
ousttrue
0bdb224215 gltfExporter use GltfExportSettings 2021-06-29 20:25:58 +09:00
ousttrue
6cfdf81429 merge MeshExportSettings to GltfExportSettings 2021-06-29 20:25:58 +09:00
ousttrue
7f7c01c011 mv GltfExportSettings to Runtime 2021-06-29 20:25:57 +09:00
ousttrue
a4ef5999a0 GltfExportSettings to C# class from ScriptableObject 2021-06-29 20:25:57 +09:00
ousttrue
d90179a720 experimental zip archive importer 2021-06-29 15:53:53 +09:00
ousttrue
7e71dc3d62 fix SettingProvider 
> Cannot create Settings Provider for: CreateProjectSettingsProvider
> UnityEditor.WindowLayout:LoadDefaultWindowPreferences ()
 2021-06-29 14:57:03 +09:00
Masataka SUMI
bc5051258a Use ambiguous parser in ScripterImporter 2021-06-28 01:40:22 +09:00
Masataka SUMI
3ed5c4fe5c Rename IGltfData to GltfData 2021-06-28 00:26:54 +09:00
Masataka SUMI
a1c40eeda0 Implements Parser variants. 2021-06-28 00:26:05 +09:00
Masataka SUMI
e5ca1346a5 Rename GltfParser to IGltfData 2021-06-27 21:45:30 +09:00
ousttrue
b6db76874b s_typeMap を遅延 2021-06-24 18:54:34 +09:00
ousttrue
8080bf7ab6 CanExtract 2021-06-24 18:46:12 +09:00
ousttrue
1ea276e959 CanExtract 2021-06-24 18:39:27 +09:00
ousttrue
765c685837 remove ScriptedImporterExtension 2021-06-24 18:24:18 +09:00
ousttrue
d72e1f1551 no animation message 2021-06-24 17:40:05 +09:00
ousttrue
e0a9fc1e9e
Merge pull request #1061 from ousttrue/fix/skip_default_trs 
Export 時に default 値の TRS を出力しない
 2021-06-22 14:19:00 +09:00
ousttrue
20d068e16f skip T if [0, 0, 0] 2021-06-22 14:06:41 +09:00
PoChang007
53649f9ef8
Merge pull request #1053 from ousttrue/feature10/remap_editor 
Feature10/remap editor
 2021-06-22 13:56:37 +09:00
ousttrue
c6cb7e9df3 VRM10ExportDialog use VRM10MetaEditor 2021-06-21 19:17:51 +09:00
ousttrue
b4131c4bad VRM10MetaEditor 2021-06-21 18:34:39 +09:00
ousttrue
9ba9a9f5a6 rename 2021-06-21 18:21:50 +09:00
ousttrue
1161054638 implement revert and apply 2021-06-21 15:30:25 +09:00
ousttrue
e5b1f378c3 ScriptedImporterEditorBase に　Apply 前の状態を保持する。 2021-06-21 15:01:06 +09:00
ousttrue
21d0ce714e RemapEditorBase に externalObjectMap を保持しない 2021-06-21 14:15:48 +09:00
ousttrue
e04ac65bf5 WIP reload timing 2021-06-21 13:43:27 +09:00
ousttrue
682bde5289 RemapEditorBase constructor 2021-06-21 13:43:27 +09:00
ousttrue
f6c0f475cd RemapEditorBase 2021-06-21 13:43:26 +09:00
ousttrue
8f28621c92
Merge pull request #1042 from ousttrue/feature10/vrm_object 
[vrm1]ScriptableObjectの構成を見直し
 2021-06-16 17:49:51 +09:00
ousttrue
55db3fa8c3 clear 2021-06-15 20:03:23 +09:00
Masataka SUMI
50383c3483 Disable auto-referenced in asmdefs 2021-06-15 18:00:27 +09:00
ousttrue
48a9ea6230 new EditorGUI.DisabledScope(false) は GUI.enabled = true という意味ではないぽい 2021-06-15 14:04:33 +09:00
ousttrue
423889cb05 UnityObjectManager is not unnecessary for prefab 2021-06-11 17:12:13 +09:00
ousttrue
612a59cba7 TakeResponsibilityForDestroyObjectFunc の返り値削除 
GameObject(prefab root)の移譲の判定にしか使っていなかった。設計変更で不要になった
 2021-06-10 20:39:13 +09:00
ousttrue
e9d4654678 UnityObjectManager から ScriptedImporter に移譲する 2021-06-10 20:39:12 +09:00
ousttrue
a17c789a02 ImporterContext.LoadAsync が UnityObjectManager を戻すようにインタフェースを変更 2021-06-10 20:39:12 +09:00
ousttrue
3b1f3fb52c add SubAssetKey to TakeResponsibilityForDestroyObjectFunc 2021-06-10 20:39:11 +09:00
ousttrue
506460665a null check. public MeshExportInfo.CalcMeshSize 2021-06-03 20:21:10 +09:00
ousttrue
66f0411218 integrate MeshWithRenderer to MeshExportInfo 2021-06-03 19:42:30 +09:00
ousttrue
0706c869ee MeshExportInfo.Renderers 2021-06-03 18:32:43 +09:00
ousttrue
ce98d54976 IBlendShapeFilter 2021-06-03 18:14:38 +09:00
ousttrue
f02d2d2ee0 MeshExportInfo.GetInfo 2021-06-03 17:23:04 +09:00
ousttrue
67e58a8cde コード整理。static 2021-06-03 17:10:08 +09:00
ousttrue
acfe0d347a implement AnimationClip extract 2021-06-03 14:11:12 +09:00
ousttrue
4c130f1e27 TmpGuiEnable to EditorGUI.DisabledScope 2021-06-03 14:11:12 +09:00
ousttrue
ca8a04d6cb VertexColorState を格上げ 2021-06-02 17:25:25 +09:00
ousttrue
2d53b15559 MeshUtility.Humanoid を UniHumanoid.Humanoid に移動 2021-06-01 18:24:07 +09:00
ousttrue
56db0e2e54 rename namespace MeshUtility to UniGLTF.MeshUtility 
* MeshUtility と UniGLTF に重複していたクラスを削除
 2021-06-01 18:09:41 +09:00
ousttrue
72fe88deb4 fix SettingsProvider 
#if
 2021-05-28 16:55:27 +09:00
ousttrue
2016d636c0 use SettingProvider 
workaround
https://github.com/Unity-Technologies/com.unity.cinemachine/blob/master/Editor/Windows/CinemachineSettings.cs#L313
 2021-05-28 16:45:19 +09:00
Masataka SUMI
02e51346f4 define ITextureDeserializer 2021-05-27 18:54:27 +09:00
Masataka SUMI
570cef700d mv TextureImportParam TextureDescriptor 2021-05-27 15:43:57 +09:00
Masataka SUMI
adbe16e154 mv GetTextureImportParamSet Get 2021-05-27 15:37:38 +09:00
Masataka SUMI
a4a5b1d0cb mv TextureSetImporter TextureDescriptorGenerator 2021-05-27 15:36:52 +09:00
Masataka SUMI
157c7091f7 follow test 2021-05-27 15:35:45 +09:00
Masataka SUMI
86d1dc0db7 rename 2021-05-27 15:16:03 +09:00
Masataka SUMI
b549f54a13 define TextureSet 2021-05-27 15:12:49 +09:00
Masataka SUMI
a6d730d15f Refactor Texture enumeration to TextureSetImport 2021-05-26 21:22:34 +09:00
Masataka SUMI
d39c9114db Fix type parent 2021-05-25 19:22:42 +09:00
Masataka SUMI
6e85b42d65 Fix error of extracting 2021-05-25 18:22:44 +09:00
Masataka SUMI
68c8fed9dd Fix bug 2021-05-25 17:57:40 +09:00
Masataka SUMI
44eead7f67 make extracted asset replacement work 2021-05-25 17:01:38 +09:00
Masataka SUMI
76582ebcf3 Ignore null 2021-05-25 16:47:16 +09:00
Masataka SUMI
34e5e4689c Ignore considering gltf external textures 2021-05-25 16:43:47 +09:00
Masataka SUMI
7b5301d348 Convert VRM0 meta texture before extracting 2021-05-25 16:35:13 +09:00
Masataka SUMI
b7593254d9 Strict SubAssetKey constructor 2021-05-25 15:44:20 +09:00
Masataka SUMI
709fe25783 SubAssetKey の使用を厳格化 2021-05-24 23:28:43 +09:00
Masataka SUMI
9cd3288e4d mv SubAssetKey 2021-05-24 20:12:19 +09:00
ousttrue
c1930ca040
Merge pull request #961 from Santarh/refactorTextureSerializer 
Refactoring Serializing Textures
 2021-05-20 18:35:09 +09:00
Masataka SUMI
f88e8d7286 Refactoring Serializing Textures 2021-05-20 18:23:26 +09:00
ousttrue
41b411a461 Default の Asset をサーチしてまとめて Reimport を発動する 2021-05-20 17:24:27 +09:00
ousttrue
5ffab988dc 矢張り、EditorPrefs を使うことにした 
* symbol UNIGLTF_DEFAULT_AXES_X は止める
 2021-05-20 12:56:00 +09:00
ousttrue
3ba3f899e3 add ScriptedImporterAxes 2021-05-19 18:08:10 +09:00
ousttrue
3f2f2bbff1 add Axes.Default 2021-05-19 18:00:41 +09:00
ousttrue
aab1596a9a ToggleSymbol 2021-05-19 17:53:13 +09:00
ousttrue
22cb1372be axis の複数形は、axes 
not axises
 2021-05-19 17:28:10 +09:00
ousttrue
91d39f5fba materialsがsubmeshより多くて null を含む場合をValidationErrorにする #946 2021-05-17 13:47:51 +09:00
ousttrue
db93e9390f
Merge pull request #944 from Santarh/throwExportNonReadableTexture 
Exporter can export compressed or non-readable texture.
 2021-05-14 12:47:04 +09:00
Masataka SUMI
0b812fa778 Use TextureExporter in Texture Saver. 2021-05-13 20:58:00 +09:00
oO
07ff382635 Fix incorrect value caching of M17N 2021-05-13 00:52:51 +09:00
ousttrue
a19e737662 vrm1 の Extract 先を vrm0 と別になるように修正。VRm10ExpressionAvatar が MonoBehaviour になった修正 2021-05-10 15:33:35 +09:00
ousttrue
4d4cb0cf14 add ValidationContext 2021-05-07 15:10:26 +09:00
ousttrue
42b7a9b43b
Merge pull request #929 from ousttrue/feature/mesh_validator 
Feature/mesh validator
 2021-05-06 21:39:40 +09:00
ousttrue
4d3e24d49c gltf, vrm0, vrm1 でMeshExportValidatorを共通部品化 2021-05-06 20:03:55 +09:00
Masataka SUMI
9a8f5b6772 Separating directories between generated format.g.cs and generated serializer/deserializer.g.cs 2021-05-06 18:58:44 +09:00
ousttrue
1aa3b38a35 EnumSerializationType 指定を除去(Reflection用の印なので無くてよい) 2021-05-06 16:29:32 +09:00
ousttrue
f25f249b29 remove dependency on UniGLTF from format 2021-05-06 16:29:19 +09:00
ousttrue
da5133ebdf remove dependency on UniJson from format 2021-05-06 16:29:08 +09:00
ousttrue
2428630ec9 DIFFERENT_MATERIAL_COUNT 2021-05-06 15:31:05 +09:00
ousttrue
8629531284 MeshExportValidator.Validate 2021-05-06 15:18:17 +09:00
ousttrue
502628b768 ジェネレーターの名前競合の回避 2021-04-30 13:02:20 +09:00
ousttrue
d85cc70a64 indent 2021-04-30 12:47:14 +09:00
ousttrue
ab0e3a4b80 UniGLTF.MeshExportValidatorEditor 2021-04-22 20:11:31 +09:00
ousttrue
ef1697ec54 SetExternalUnityObject が SubAssetKey を使う 2021-04-22 17:14:25 +09:00
ousttrue
8e81e5e698 T-Poseボタンの表示位置を変更(T-Poseにしないと表示されなかった) 2021-04-21 16:01:24 +09:00
ousttrue
29cbf879e2 tpose button on humanoid tab 2021-04-21 15:47:28 +09:00
ousttrue
da41a5cc67 OnLayout 2021-04-20 21:07:59 +09:00
ousttrue
8e8ee5cf65 MeshExportValidator 2021-04-20 21:02:47 +09:00
ousttrue
cb1f596700 SubAssetKey == 2021-04-20 14:32:20 +09:00
ousttrue
01241ac7be StandardMap の AssetKey の比較を修正 2021-04-20 14:03:06 +09:00
ousttrue
1cd4c3d951 remove targetPath.ImportAsset. use EditorApplication.delayCall 2021-04-20 13:50:36 +09:00
ousttrue
b790a9a969 mv Assets/VRM/Editor/Format/HumanoidValidator.cs to Assets/UniGLTF/Editor/UniGLTF/Validation/HumanoidValidator.cs 2021-04-20 12:54:51 +09:00
ousttrue
ca8eac3ec2 Validation, Validator を移動 2021-04-20 12:50:42 +09:00
ousttrue
07582487ad UNIGLTF_IO_AXIS 2021-04-19 21:38:00 +09:00
ousttrue
c80435d640 言語の自動判定と保存を実装 2021-04-19 21:09:40 +09:00
ousttrue
6a4a47d2e9 UniGLTF/UniGLTFPreference 2021-04-19 20:56:30 +09:00
ousttrue
df8fbe79cd UniGLTF.M17N 2021-04-19 20:55:46 +09:00
ousttrue
33bd8a38f9 use ExportDialogBase 2021-04-19 20:36:16 +09:00
ousttrue
7d5d323ead ExportDialogBase 2021-04-19 19:48:40 +09:00
ousttrue
25ea39cd87 SaveFileDialog 2021-04-19 18:48:42 +09:00
ousttrue
8d9de7a9d4 Validation, 多言語化を UniGLTF 配下に移動 2021-04-19 15:37:50 +09:00
ousttrue
a07d00fcd2 MeshUtility を UniGLTF の SubFolder に移動。asmdef を削除 2021-04-19 15:19:30 +09:00
ousttrue
1582cd1c24 TextureImporterConfigurator を VRMShaders.GLTF.IO.Editor に移動 2021-04-19 15:13:15 +09:00
ousttrue
596651f551 Merge branch 'master' into feature10/update_jsonschema 2021-04-15 17:50:55 +09:00
ousttrue
caf61c2785 remove debug code 2021-04-15 17:18:26 +09:00
ousttrue
208311164b VRMC_constraints to VRMC_node_constraint 2021-04-14 17:45:24 +09:00
ousttrue
b8334ae645 pull JsonSchema. debug 2021-04-14 17:38:30 +09:00
ousttrue
66a7cfc768 TextureImportParam の　GltfName, ConvertedName を UnityObjectName に単純化 2021-04-14 16:41:15 +09:00
ousttrue
56b7f1ae20 SubAssetKey 2021-04-14 13:50:09 +09:00
Masataka SUMI
5310269afb impl UniGLTF.EditorSettingsValidator 2021-04-12 21:34:42 +09:00
ousttrue
e35bc5f2fe GetBytesWithMime を VRMShaders に移動 
* UniGLTF.GltfTextureExporter.GetBytesWithMime を VRMShaders.AssetTextureUtil.GetTextureBytesWithMime に移動
*　テスト NotReadable, Compressed を VRMShaders に移動
* テスト用リソース Resources/4x4.png と 4x4compressed.DDS を VRMShaders に移動
 2021-04-12 18:17:24 +09:00
ousttrue
608caf1e74 DivideVertexBuffer option 2021-04-12 15:13:07 +09:00
ousttrue
63bbace295
Merge pull request #854 from Santarh/vrmShaderRefac 
Refactoring VRMShaders directory & asmdef
 2021-04-08 20:23:21 +09:00
Masataka SUMI
8eaceb6c8e Refactoring VRMShaders directory & asmdef 2021-04-08 20:19:37 +09:00
ousttrue
b62c123b66 meta, expressionAvatar, expression の extract を復旧 2021-04-06 15:08:37 +09:00
ousttrue
002e8c6060 rename AssetTextureUtil.UseAsset to AssetTextureUtil.IsTextureEditorAsset 2021-04-05 13:15:13 +09:00
ousttrue
27fa5dbc60 VRMShaders.TextureExporter, AssetTextureUtil 2021-04-02 18:35:02 +09:00
ousttrue
d28f700997 移動 VRMShaders.TextureExporter 
#726 separate AssetTextureUtil
 2021-04-02 18:14:27 +09:00
ousttrue
a15b497b85 use Vrm10MToonMaterialImporter 2021-04-01 12:16:45 +09:00
ousttrue
f8745ee17f comment 2021-04-01 12:16:43 +09:00
ousttrue
323a816024 WIP RuntimeUnityBuilder 2021-04-01 12:16:43 +09:00
ousttrue
5fd98cc54c fix Remapped Textures 2021-03-25 20:33:03 +09:00
ousttrue
aa7fb07b12 rename 2021-03-24 18:38:55 +09:00
ousttrue
f89f1a26f1 VRMShaders.TextureImportTypes 2021-03-24 16:19:58 +09:00
ousttrue
2438516bda namespace VRMShaders 2021-03-24 15:56:33 +09:00
ousttrue
7cf9895b02 VRMShaders.GetTextureParam 2021-03-24 15:52:51 +09:00
ousttrue
95ee01b41f GetTextureParam 2021-03-23 21:51:18 +09:00
ousttrue
8aa450d3ac remove UnityWebRequestTextureLoader 2021-03-23 18:46:22 +09:00
ousttrue
111bee6e9c If the textures are different but the images have the same reference 2021-03-23 15:06:11 +09:00
ousttrue
8d95a4d1eb extract texture from external path to asset path 2021-03-18 14:39:12 +09:00
ousttrue
c66beb3424
Merge pull request #798 from ousttrue/fix/gltf_material_name_is_empty 
UnitTest追加(GltfSmapleModels, VRM_TEST_MODELS)
 2021-03-18 13:40:42 +09:00
ousttrue
b34afd81d5 fix image.uri startsWith "data:" 2021-03-17 19:29:23 +09:00
ousttrue
14e25083af base.OnEnable が必用 
#783
 2021-03-17 18:19:56 +09:00
ousttrue
f55cd3ec69
Merge pull request #780 from ousttrue/fix/roughness_smooth_conversion 
MetallicRoughnessOcclusion テクスチャーの取り廻しを中心に改修
 2021-03-17 17:51:18 +09:00
ousttrue
1d38656df2 fix rebase 2021-03-17 15:42:16 +09:00
ousttrue
558f651534 fix normalMap extract 2021-03-17 15:32:08 +09:00