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
3,704 Commits 3 Branches 219 Tags 124 MiB
e22189c7bb
Commit Graph

802 Commits

Author SHA1 Message Date
PoChang007
916dbbab6c
Merge pull request #1173 from ousttrue/feature10/update_vrm10viewer 
add VRM10AutoExpression for VRM10Viewer. move test_motion.txt
 2021-08-25 22:59:50 +09:00
ousttrue
8c69119058 add VRM10AutoExpression for VRM10Viewer. move test_motion.txt 2021-08-25 19:58:45 +09:00
ousttrue
56492d3f82 play mode の expression preview 2021-08-25 18:31:06 +09:00
ousttrue
e9425948e5 EditorEditMode のデフォルト値を Advanced に変更 2021-08-25 16:49:42 +09:00
ousttrue
584f9c67a4 importer の matcap texture の間違いを修正 2021-08-24 20:25:35 +09:00
ousttrue
2367e9dbc9 null check 
* try による握りつぶしをやめて Error は失敗させる
 2021-08-24 20:19:39 +09:00
ousttrue
a16d352cd9 rename unigltf to gltf 2021-08-20 16:57:39 +09:00
ousttrue
8e51cef38f UniVRM-0.81.0 
* rename com.vrmc.unigltf to com.vrmc.gltf
* and reversion. com.vrmc.gltf use same version with vrm
 2021-08-19 18:49:08 +09:00
ousttrue
9562909c65 com.vrmc.univrm1 to com.vrmc.vrm 2021-08-18 20:56:43 +09:00
ousttrue
3dfca8b3e6 fix 2021-08-18 19:34:27 +09:00
ousttrue
7c3a0c48cc prefix 2021-08-18 18:59:38 +09:00
ousttrue
448cefded0 update 2021-08-18 18:30:07 +09:00
ousttrue
54d2e967e5 mv VRM10.Samples to VRM10/Samples 
* StreamingAssets 移動
* BVH load 調整
 2021-08-18 18:19:14 +09:00
ousttrue
cb5a30d683 update VersionMenu 
* vrm-1 の更新忘れてた
* samples 追加
 2021-08-18 18:04:18 +09:00
ousttrue
504f6e8a47 remove not implemented 2021-08-17 21:15:01 +09:00
ousttrue
b0de928791 UNITY_EDITOR 2021-08-17 21:02:50 +09:00
ousttrue
f8b965760d WIP EditorTool 2021-08-17 20:53:05 +09:00
ousttrue
e530c4c6da implement Mesh.colors 2021-08-16 19:23:33 +09:00
ousttrue
96dc839f26 Editor の状態保持を static 変数に変更 2021-08-11 17:46:28 +09:00
ousttrue
3767165f9b Expression の UI 調整 2021-08-11 17:43:18 +09:00
ousttrue
9592905e57 VRM10Expression.Preset と ExpressionName を廃止 
* VRM10Expression.Preset は VRM10ObjectExpression　の度のスロットにセットされているかで判定
* VRM10Expression.ExpressionName は VRM10Expression.name を使う
 2021-08-10 19:49:48 +09:00
PoChang007
7ee49e0866
Merge pull request #1134 from ousttrue/feature1/update_jsonschema 
Feature1/update jsonschema
 2021-08-10 18:33:46 +09:00
PoChang007
8f31f32d68
Merge pull request #1136 from ousttrue/fix1/fix_firstperson_editor 
Fix1/fix firstperson editor
 2021-08-06 18:28:48 +09:00
ousttrue
081dbae6ff first person set default button 2021-08-06 17:42:20 +09:00
ousttrue
f28b5f93df assign vrmObject.Prefab when Extract 2021-08-06 17:24:05 +09:00
ousttrue
b4b01e7518 prefab field 2021-08-06 17:19:36 +09:00
ousttrue
026797d2f3 import 時に null の expression をデフォルト値で生成する 2021-08-06 16:51:48 +09:00
ousttrue
93bb449548 remove log message 2021-08-06 16:42:33 +09:00
ousttrue
13d6b263a9 fix obsoleted 2021-08-06 16:41:37 +09:00
ousttrue
dd31a7d611 update schema done 2021-08-06 16:34:43 +09:00
ousttrue
cc89cb104c update JsonSchema to VRM-1.0beta 2021-08-06 16:27:50 +09:00
Masataka SUMI
36e7d1ef98 remove duplicated 2021-08-04 23:35:48 +09:00
Masataka SUMI
58b2588f2d Use GUID in asmdefs 2021-08-04 15:19:09 +09:00
ousttrue
cb0c2b7570 Unity-2019 require ApplyRevertGUI call in OnInspectorGUI 
https://github.com/Unity-Technologies/UnityCsReference/blob/2019.4/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.cs#L443
 2021-08-04 14:37:23 +09:00
ousttrue
6951519a79 null check 2021-08-03 14:57:05 +09:00
ousttrue
6dead3bcd8 add null check 2021-08-03 13:34:36 +09:00
ousttrue
819fb95a25 Extract 時に VRM10Expression.Prefab をセットする 2021-07-29 17:51:38 +09:00
ousttrue
c1c778e907 * PreviewPrefab の ObjectField を常時表示 
* m_scene のライフサイクルを整理(生成を遅延。OnDestroyとPrefabが変更された時に破棄)
 2021-07-29 17:42:21 +09:00
ousttrue
9fd371563c remove inheritance 2021-07-29 17:19:08 +09:00
ousttrue
89073efdba remove unused 2021-07-29 17:13:42 +09:00
Masataka SUMI
21a5f4e315 Make asmdef's auto-referenced true. 2021-07-19 16:15:35 +09:00
ousttrue
e57235d0a0 fix ExpressionTest 2021-07-19 12:37:14 +09:00
ousttrue
77a8c21213 fix GetOrLoadExpression 2021-07-19 12:34:14 +09:00
Masataka SUMI
8c661736cd Rename MToon10 2021-07-15 16:35:59 +09:00
ousttrue
a1b8ef429e fix generator 2021-07-02 19:57:37 +09:00
ousttrue
fa460f0031 JsonSchema を更新してコードを再生成した 
https://github.com/vrm-c/vrm-specification/pull/296
 2021-07-02 19:57:37 +09:00
ousttrue
ea642495cd fix VRMC_hdr_emissiveMultiplier generation path 2021-07-02 19:56:40 +09:00
ousttrue
a96e0b6267 GenerateInfo 2021-07-02 19:56:39 +09:00
ousttrue
760051f1ac
Merge pull request #1085 from ousttrue/feature10/VRMC_hdr_emissiveMultiplier 
VRMC_materials_hdr_emissiveMultiplier 実装
 2021-06-30 15:10:26 +09:00
Masataka SUMI
e1c897b220 Add unique suffix to same name assets. 2021-06-29 22:23:03 +09:00
ousttrue
bc8a8b3a7f update VRM10MetaEditor 2021-06-29 20:27:35 +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
68d9c76d0e mv EmissiveMultiplier to UniGLTF 2021-06-29 20:25:56 +09:00
ousttrue
aacb30bac3 JsonSchemaからの再生成 
* VRMC_materials_hdr_emissiveMultiplier が追加
* TextureTransformBind.Scaling => Scale rename
 2021-06-29 20:25:56 +09:00
ousttrue
94f2d9f7bb ApplyModifiedProperties 2021-06-29 17:32:13 +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
Masataka SUMI
02455ef51d TextureDeserializer can await. 2021-06-24 22:03:46 +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
0b575c43d2
Merge pull request #1072 from Santarh/exportTexturesWithoutAlpha 
Export textures with alpha channel only if necessary
 2021-06-24 15:43:15 +09:00
Masataka SUMI
ba086dc0ed Don't export alpha channel if alphaMode was not opaque in vrm1.0 2021-06-24 15:27:19 +09:00
Masataka SUMI
2ad014f11c Rename 2021-06-24 15:13:05 +09:00
Masataka SUMI
fbd885c67c Export texture's alpha if only necessary. 2021-06-23 23:04:16 +09:00
Masataka SUMI
8472a20cdf define variable name clearly 2021-06-23 21:07:44 +09:00
ousttrue
c6e6bf64a3 fix using 2021-06-23 12:53:43 +09:00
ousttrue
13c445f882 vrm0 の時だけ migration checkbox 2021-06-22 15:12: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
61d77b2989 restore meta editor 2021-06-21 19:13:48 +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
PoChang007
4f549c59d1
Merge pull request #1049 from ousttrue/feature10/fix_sparse 
Feature10/fix sparse
 2021-06-21 13:40:55 +09:00
ousttrue
061eae6029 static 2021-06-18 18:53:10 +09:00
ousttrue
1e958ae408 impl custom editor 
renderer を pulldown で選択できるようになった
 2021-06-18 18:52:14 +09:00
ousttrue
12e17f8c99 fix extract folder 2021-06-17 15:17:18 +09:00
ousttrue
8cad2ed2d0 external_object_map に null が入っているときがある(対象を削除したとき) 2021-06-17 14:35:18 +09:00
ousttrue
3181dd6c90 fix Migrate_VrmTestModels 2021-06-16 18:32:43 +09:00
ousttrue
593e7ec896 fix Migrate_SpringBoneTest 2021-06-16 18:32:43 +09:00
ousttrue
4e91e16901 null check 2021-06-16 18:01:30 +09:00
ousttrue
8f28621c92
Merge pull request #1042 from ousttrue/feature10/vrm_object 
[vrm1]ScriptableObjectの構成を見直し
 2021-06-16 17:49:51 +09:00
ousttrue
9fa1517a57 update Expression 2021-06-16 17:40:12 +09:00
ousttrue
ca4bab658e update RendererFirstPersonFlags。文字列で保持 2021-06-16 17:03:41 +09:00
ousttrue
a35db5cf36 Spring on Controller 2021-06-16 15:57:37 +09:00
ousttrue
43ee6595c4 rename 2021-06-16 15:42:42 +09:00
ousttrue
2664a773e0 DrawLookAtGizmo 2021-06-16 15:38:10 +09:00
ousttrue
8a01eae5f1 Gaze to VRM10Controller 2021-06-16 15:00:02 +09:00
ousttrue
872a0ddc97 Export VRM10ObjectMeta 2021-06-16 14:51:36 +09:00
ousttrue
cac6d2d295 fix extract VRM10Object 2021-06-15 20:13:25 +09:00
ousttrue
55db3fa8c3 clear 2021-06-15 20:03:23 +09:00
ousttrue
cb59024f8e WIP VRM10Object 2021-06-15 19:10:54 +09:00
ousttrue
9a43354294
Merge pull request #1041 from Santarh/fixMigrationMToonTest 
Fix MToon migration tests
 2021-06-15 18:52:22 +09:00
Masataka SUMI
0545cbc365 Fix MToon migration tests 2021-06-15 18:47:13 +09:00
Masataka SUMI
50383c3483 Disable auto-referenced in asmdefs 2021-06-15 18:00:27 +09:00
ousttrue
1a063ff3f6
Merge pull request #1036 from ousttrue/feature10/impl_aim_constraint 
aim constraint Yaw, Pitch freeze
 2021-06-15 15:11:31 +09:00
ousttrue
ca2d28ddfb null check 2021-06-15 15:01:17 +09:00
ousttrue
671b333673 aim constraint Yaw, Pitch freeze 2021-06-15 14:51:20 +09:00
ousttrue
ceed241abd avoid editor error if not playing 2021-06-15 14:16:52 +09:00
ousttrue
48a9ea6230 new EditorGUI.DisabledScope(false) は GUI.enabled = true という意味ではないぽい 2021-06-15 14:04:33 +09:00
ousttrue
048ce04ebd runtime 変数置き場を隔離して、初期化を遅延。Editor 用の変数の初期化を分離。 2021-06-15 13:43:16 +09:00
Masataka SUMI
193342c701 Fix failing extracting meta object file in vrm1 2021-06-14 19:41:16 +09:00
Masataka SUMI
03144e6add fix bug 2021-06-14 16:35:29 +09:00
ousttrue
bc429439ee とりあえず Exception 回避 2021-06-14 15:36:42 +09:00
ousttrue
611da973e5
Merge pull request #1024 from Santarh/mtoon3 
Use MToon10 in VRM1.0 implementation.
 2021-06-14 12:43:10 +09:00
Masataka SUMI
f66ef33d2d migrate mtoon texture transform correctly. 2021-06-11 21:46:01 +09:00
ousttrue
f680423aba
Merge pull request #1023 from ousttrue/feature10/update_jsonschema 
JsonSchema を更新
 2021-06-11 17:27:23 +09:00
ousttrue
423889cb05 UnityObjectManager is not unnecessary for prefab 2021-06-11 17:12:13 +09:00
ousttrue
c523b1c7ea JsonSchema を更新 2021-06-11 16:38:22 +09:00
ousttrue
612a59cba7 TakeResponsibilityForDestroyObjectFunc の返り値削除 
GameObject(prefab root)の移譲の判定にしか使っていなかった。設計変更で不要になった
 2021-06-10 20:39:13 +09:00
ousttrue
0bdd18c408 fix humanoid SubAssetKey 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
Masataka SUMI
2dd31517e2 use MToon10 in VRM10 import/export 2021-06-10 20:23:42 +09:00
Masataka SUMI
45b7b3e7de Add migration mtoon10 2021-06-10 15:20:13 +09:00
ousttrue
44b9652d6f null check 2021-06-09 15:50:16 +09:00
ousttrue
d01b41e963 fix VrmScriptedImporterEditorGUI 2021-06-09 15:49:53 +09:00
ousttrue
3c779b1110 UnityEditor.Selection.activeTransform 2021-06-09 15:49:32 +09:00
ousttrue
e7d461fac1 Vrm10Parser を導入して、ここで extension の取り出しと migrate を呼び出すようにした。 2021-06-09 13:16:04 +09:00
ousttrue
b07eda0caa TryParseOrMigrate return bool 2021-06-08 19:38:40 +09:00
ousttrue
83654b447d OnEnable is run when Attached. 2021-06-08 19:24:46 +09:00
ousttrue
bf3f4416a8 Vrm10Importer.OpenOrMigrate 2021-06-08 19:24:17 +09:00
ousttrue
8dd640b4bc ObjectField in play mode 
https://qiita.com/mattak/items/6f4c358b781392a4c3fb
 2021-06-08 18:40:04 +09:00
ousttrue
098d0458a1 remove waning 2021-06-08 18:22:06 +09:00
ousttrue
b8bf52592f
Merge pull request #1007 from ousttrue/feature/impl_morph_target_sparse_for_divided 
既存の morphTarget の sparse export を整理して、divided 頂点バッファでも動くようにした
 2021-06-07 19:18:08 +09:00
ousttrue
ada991eb71 コード見直し。SparseBase　使ってなかった。 2021-06-07 19:13:10 +09:00
ousttrue
20602bc805 texture が無い時(index==-1)に入れ物を作らない。KHR_materials_unlit を有効に。 2021-06-04 17:25:23 +09:00
ousttrue
40be812e25 fix -1 index in migration 2021-06-04 16:34:26 +09:00
ousttrue
a557fd6eae show migration error 2021-06-04 16:27:25 +09:00
ousttrue
80abc5d7ce implement BlendShapeExporter.Export 2021-06-04 15:40:44 +09:00
ousttrue
7e42a8bd12 BlendShapeExporter を準備中 2021-06-04 13:39:28 +09:00
ousttrue
ce98d54976 IBlendShapeFilter 2021-06-03 18:14:38 +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
fd18413d67
Merge pull request #996 from ousttrue/feature10/update_spring_bone_tail_spec 
Feature10/update spring bone tail spec
 2021-06-01 19:43:45 +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
a7464374ab spring bone の末端に追加の joint を配置 
https://github.com/vrm-c/vrm-specification/pull/255
 2021-06-01 17:29:36 +09:00
ousttrue
e3ffffbd6f SpringBone 末端の仕様変更 
https://github.com/vrm-c/vrm-specification/pull/255
 2021-06-01 17:03:56 +09:00
ousttrue
b2f342d7e1 rename VRM10SpringJoint to VRM10SpringBoneJoint 2021-06-01 16:55:34 +09:00
ousttrue
f97bbc1ea5 new m_colliderList 2021-06-01 16:42:36 +09:00
ousttrue
3f09717236
Feature10/spring bone editor (#994) 
* SceneView switch

* VRM10ControllerEditor を分割

* VRM10/Editor/Components/VRM10ControllerSceneView.cs

* LookAtEditor, SpringBoneEditor

* VRM10SpringBoneColliderGroup and VRM10SpringBone to VRM10ControllerSpringBone. not MonoBehaviour

* ReorderableList

* VRM10Window.cs

* SpringBoneTreeView

* ScrollView

* rename

* VRM10SpringBoneColliderEditor

* SelectedGUIBase

* spring name

* VRM10SpringBoneCollider gizmo to handle

* SelectedGUI

* 再度、VRM10SpringBoneColliderGroup を MonoBehaviour へ。SerializedObject の参照の都合
 2021-06-01 16:00:49 +09:00
Masataka SUMI
9d0592088a Add argument to VRM & VRM10 ImporterContext 2021-05-27 21:32:11 +09:00
Masataka SUMI
02e51346f4 define ITextureDeserializer 2021-05-27 18:54:27 +09:00
Masataka SUMI
c456c9ddf7 mv MaterialImporter MaterialDescriptorGenerator 2021-05-27 16:00:16 +09:00
Masataka SUMI
8cba3ba71a mv MaterialImportParam MaterialDescriptor 2021-05-27 15:56:51 +09:00
Masataka SUMI
570cef700d mv TextureImportParam TextureDescriptor 2021-05-27 15:43:57 +09:00
Masataka SUMI
f2495f61b5 mv TextureImportParamSet TextureDescriptorSet 2021-05-27 15:38:40 +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
6ebd030f3a Ignore enumerating if vrm is 0 2021-05-26 21:50:23 +09:00
Masataka SUMI
7aecbc7949 Use Vrm10TextureSetImporter in Vrm10Importer 2021-05-26 21:32:13 +09:00
Masataka SUMI
a6d730d15f Refactor Texture enumeration to TextureSetImport 2021-05-26 21:22:34 +09:00
Masataka SUMI
f1a640be61 Rename 2021-05-26 17:28:08 +09:00
Masataka SUMI
e5d0e927b4 Define IMaterialExporter, IMaterialImporter 2021-05-26 17:19:17 +09:00
Masataka SUMI
5664c7586a mv func about importing texture 2021-05-26 16:31:11 +09:00
ousttrue
502895c56e ClearScene 2021-05-25 19:30:50 +09:00
ousttrue
c2c7467e12
Merge pull request #975 from ousttrue/fix10/fix_expression_editor 
Fix10/fix expression editor
 2021-05-25 19:24:14 +09:00
Masataka SUMI
6e85b42d65 Fix error of extracting 2021-05-25 18:22:44 +09:00
Masataka SUMI
44eead7f67 make extracted asset replacement work 2021-05-25 17:01:38 +09:00
Masataka SUMI
34e5e4689c Ignore considering gltf external textures 2021-05-25 16:43:47 +09:00
ousttrue
e40fd2296a preview scene の破棄タイミングを変更 2021-05-25 16:03:36 +09:00
Masataka SUMI
b7593254d9 Strict SubAssetKey constructor 2021-05-25 15:44:20 +09:00
ousttrue
3e16a2f492 LoadDivided に BlendShape import の実装が無かった 2021-05-25 14:55:35 +09:00
ousttrue
ea796cd342 fix GetPrefab 2021-05-25 14:28:36 +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
Masataka SUMI
82106f6c64 Rename, Comment 2021-05-20 21:24:30 +09:00
Masataka SUMI
ef929de895 rename & use interface 2021-05-20 20:55:51 +09:00
Masataka SUMI
f88e8d7286 Refactoring Serializing Textures 2021-05-20 18:23:26 +09:00
ousttrue
bc1cd34114
Merge pull request #953 from ousttrue/feature10/aim_object_space 
[1.0] aim constraint の up vector の目標空間 model/local を実装
 2021-05-19 17:12:09 +09:00
ousttrue
3395bff90f public Source get set 2021-05-19 17:10:20 +09:00
ousttrue
67558710d6
Merge pull request #955 from Santarh/exportMtoon10 
Implements exporting VRM 1.0 MToon
 2021-05-19 16:03:13 +09:00
ousttrue
c211199cf3 fix Source 2021-05-19 14:00:33 +09:00
ousttrue
297b585012 source position 2021-05-19 13:56:30 +09:00
ousttrue
8c12ab5661 SourceInitialCoords, DestinationInitialCoords を整理、修正 2021-05-19 13:52:54 +09:00
Masataka SUMI
3f13fdde05 ignore freeze while exportings vrm10 2021-05-18 21:01:19 +09:00
Masataka SUMI
7062bffb04 migration しわすれ 2021-05-18 20:41:19 +09:00
Masataka SUMI
d33b928eeb Implements VRM10 MToon Exporter 2021-05-18 20:40:36 +09:00
ousttrue
75eed7434f green 2021-05-18 18:21:08 +09:00
ousttrue
b3cbe06c6e implement aim up space 
aim のUPVectorを評価する空間を world から model/local に修正
 2021-05-18 18:14:04 +09:00
ousttrue
00814c0274 コード整理。m_destinationCoordinate, ModelRoot を追加 2021-05-18 17:36:05 +09:00
Masataka SUMI
44145bc6ca Merge branch 'master' of https://github.com/vrm-c/UniVRM into exportMtoon10 2021-05-18 17:25:07 +09:00
Masataka SUMI
5212cf6ce7
Merge pull request #952 from ousttrue/feature10/impl_constraint 
[1.0] constraitn の実装
 2021-05-18 17:23:30 +09:00
ousttrue
6d82fc188c 桁数 2021-05-18 17:06:32 +09:00
ousttrue
f1e0a2f3f9 fix 2021-05-18 17:04:16 +09:00
ousttrue
9a2fb090d6 fix aim logic 2021-05-18 17:01:22 +09:00
ousttrue
2bb6d10861 rename 2021-05-18 17:01:21 +09:00
ousttrue
607d0e07b2 fix postition and rotation 2021-05-18 17:01:19 +09:00
ousttrue
a6f4e1cc52 GetDstCoords 2021-05-18 17:01:19 +09:00
ousttrue
b99b66f47b GetSourceCoords 2021-05-18 17:01:18 +09:00
ousttrue
51d5144e34 remove IVRM10ConstraintSourceDestinationExtensions 2021-05-18 17:01:18 +09:00
ousttrue
962ee32385 ApplyDelta 2021-05-18 17:01:18 +09:00
ousttrue
cf1b684c56 fix 2021-05-18 17:01:17 +09:00
ousttrue
c2641b2fb4 Delta 2021-05-18 17:01:17 +09:00
ousttrue
da4ae3f0e5 UpdateDelta 2021-05-18 17:01:17 +09:00
ousttrue
cc3568da14 Inverse 2021-05-18 17:01:17 +09:00
ousttrue
253846698c position/rotation constraint の共通部分を VRM10PostionRotationConstraintEditorBase にまとめた 2021-05-18 17:01:16 +09:00
ousttrue
1e80c61af6 impl rotationConstraint DestinationOffset 2021-05-18 17:01:16 +09:00
ousttrue
79465de4ad impl rotationConstraint SourceOffset 2021-05-18 17:01:16 +09:00
ousttrue
a1af1a943d CalcYawPitch 2021-05-18 17:01:07 +09:00
ousttrue
f95123e208 euler 2021-05-18 17:01:07 +09:00
ousttrue
12e0cc0406 WIP aim 2021-05-18 17:01:07 +09:00
ousttrue
ce8e0bff16 CalcYawPitch 2021-05-18 17:01:06 +09:00
ousttrue
673aac40e3 DrawAimUp 2021-05-18 17:01:06 +09:00
ousttrue
720bb3ed59 WIP aim 2021-05-18 17:01:06 +09:00
ousttrue
61920922d4 VRM10PositionConstraintEditor 2021-05-18 17:01:06 +09:00
ousttrue
2469d65cb2 IVRM10SourceDestination 2021-05-18 17:01:05 +09:00
ousttrue
b3dd5dc1f3 fix operator* 2021-05-18 17:00:25 +09:00
ousttrue
46add88112 fix GetSourceCurrent local 2021-05-18 17:00:24 +09:00
ousttrue
c806dc6186 GetSourceCurrent 2021-05-18 17:00:24 +09:00
ousttrue
22b3613df9 refactoring 2021-05-18 17:00:24 +09:00
ousttrue
43fc06c715 TR 2021-05-18 17:00:23 +09:00
ousttrue
8dd9ef6a0a rename Write to Draw 2021-05-18 17:00:23 +09:00
ousttrue
864415f614 impl DstDrawModelCoords 2021-05-18 17:00:23 +09:00
ousttrue
e7fe9af5b0 SrcDrawCurrent, DstDrawCurrent 2021-05-18 17:00:23 +09:00
ousttrue
bb9d9136c3 Coords 2021-05-18 17:00:22 +09:00
ousttrue
9dd707134b DrawDstLocal 2021-05-18 17:00:22 +09:00
ousttrue
60737fb030 Clamp180 2021-05-18 17:00:22 +09:00
ousttrue
d8836717cb VRM10RotationConstraintEditor 2021-05-18 17:00:21 +09:00
ousttrue
20431dad6d RotationOffset 2021-05-18 17:00:21 +09:00
Masataka SUMI
b5f18cd2a0 Merge branch 'master' of https://github.com/vrm-c/UniVRM into exportMtoon10 2021-05-17 17:40:43 +09:00
ousttrue
ece63736ad skip non mtoon material 2021-05-17 14:14:30 +09:00
Masataka SUMI
2d6adb080c Warning when importing not implemented MToon property. 2021-05-14 17:04:47 +09:00
Masataka SUMI
b8f2d37ccf Export Texture with specified Color Space. 2021-05-13 20:57:35 +09:00
ousttrue
c6bdc4f4ee
Merge pull request #938 from Santarh/vrm10MToon1 
VRM1.0 で MToon の Import ができる
 2021-05-11 12:26:08 +09:00
Masataka SUMI
2794638c31 Migrate MToon RenderQueue with heuristic conversion. 2021-05-10 22:02:17 +09:00
Masataka SUMI
95414d4a61 fix mtoon migration. 2021-05-10 21:01:41 +09:00
Masataka SUMI
d9bde2ff57 Import MToon textures. 2021-05-10 20:59:51 +09:00
Masataka SUMI
7bf9399710 fix 2021-05-10 20:59:18 +09:00
Masataka SUMI
93d4389d78 Import all MToon properties in VRM 1.0 2021-05-10 20:14:32 +09:00
Masataka SUMI
cd26109977 Rename 2021-05-10 15:58:59 +09:00
ousttrue
a19e737662 vrm1 の Extract 先を vrm0 と別になるように修正。VRm10ExpressionAvatar が MonoBehaviour になった修正 2021-05-10 15:33:35 +09:00
Masataka SUMI
c6a0540a53 Import all of VRM10 MToon textures. 2021-05-07 22:05:24 +09:00
Masataka SUMI
e8728845ca Define Vrm10MToon Texture importer 2021-05-07 21:34:01 +09:00
Masataka SUMI
db336970c9 Separate Vrm10 Texture Enumerator 2021-05-07 20:34:01 +09:00
Masataka SUMI
139625f5a6 Specify color space in exporting VRM10 Material. 2021-05-07 19:57:42 +09:00
Masataka SUMI
472fbc8b04 Specify color space in importing VRM10 & migrating VRM0 to VRM10. 2021-05-07 19:31:02 +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
02bd1fe6b2 Generate format and serializer/deserializer. 2021-05-06 18:59:50 +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
871f57e8fd regenerate 2021-05-06 16:30:46 +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
1e851de121 generate menu #if VRM_DEVELOP 2021-05-06 16:28:54 +09:00
ousttrue
8629531284 MeshExportValidator.Validate 2021-05-06 15:18:17 +09:00
ousttrue
3d4b10da12 VRM10SpringBoneColliderGroup の null 防御 2021-05-06 13:45:01 +09:00
ousttrue
9274c84c01 collider group の仕様変更 2021-04-30 14:08:36 +09:00
ousttrue
c4dd9e0404 fix MigrationTests 2021-04-30 13:34:44 +09:00
ousttrue
a507266df4 VRM10SpringBoneCollider is MonoBehaviour 2021-04-30 13:30:23 +09:00
ousttrue
f5a1c1e537 remove unused Format/NodeCollider 2021-04-30 13:21:36 +09:00
ousttrue
693eb982fa generate cs from JsonSchema 2021-04-30 13:02:58 +09:00
ousttrue
161381b235 update JsonSchema. VRMC_node_collider is removed. 2021-04-30 12:47:06 +09:00
PoChang007
eb47884c3e
Merge pull request #917 from ousttrue/feature10/update_meta_migration 
otherPermissionUrl と otherLiceneseUrl の両方が有効で内容が異なる場合はマイグレーションできない
 2021-04-27 15:13:10 +09:00
ousttrue
22871e992d
ExpressionAvatar は 独立した ScriptableObject をやめる (#916) 
* ExpressionAvatar is MonoBehaviour

* fix controller editor
 2021-04-27 15:12:29 +09:00
ousttrue
8457f06ebb otherPermissionUrl と otherLiceneseUrl の両方が有効で内容が異なる場合はマイグレーションできない 2021-04-27 14:39:15 +09:00
ousttrue
06559cf188
Feature10/export divided vertex buffer (#913) 
* MeshExportUtil

* MeshWriter.ExportMesh implement divided vertex buffer

* MeshImporterDivided

* WIP divided

* conflict restore VertexBuffer
 2021-04-26 19:25:39 +09:00
ousttrue
6d6e812f3a null check 2021-04-26 14:07:28 +09:00
ousttrue
74cae0eec7 rename 2021-04-26 13:59:37 +09:00
ousttrue
64077a4ab1 rename 2021-04-26 13:55:06 +09:00
ousttrue
438ccc62db remove not used 2021-04-26 13:43:07 +09:00
ousttrue
948b3d9278 Vrm10Importer 2021-04-26 13:39:56 +09:00
ousttrue
10e44ed8a8 ModelReader, ModelWriter 2021-04-26 13:38:48 +09:00
ousttrue
843fa8fd28 MeshWriter 2021-04-26 13:25:02 +09:00
ousttrue
839f0b27ce MeshReader 2021-04-26 13:12:41 +09:00
ousttrue
e9c94de242 export position constraint 2021-04-23 17:40:23 +09:00
ousttrue
fde77865f7 clear m_constraints 2021-04-23 14:54:45 +09:00
ousttrue
440a8f0e6f VrmExporter.ExportConstraints 2021-04-23 14:43:34 +09:00
ousttrue
abafd14ff2 WIP ObjectSpace.model 2021-04-23 14:17:05 +09:00
ousttrue
744d0e54bc add constraints selector 2021-04-23 14:16:44 +09:00
ousttrue
e4adfdec88 colliders.Add(nodeIndex); 2021-04-23 13:39:33 +09:00
ousttrue
8068227f48 rename VRM10SpringSelectorWindow　to VRM10SelectorWindow. add humanoid bone selector 2021-04-23 13:31:32 +09:00
ousttrue
81a4b1ffea SkinningBake 2021-04-22 20:50:59 +09:00
ousttrue
5beba7c647 VRM10ExportSettings.cs 2021-04-22 20:25:00 +09:00
ousttrue
ab0e3a4b80 UniGLTF.MeshExportValidatorEditor 2021-04-22 20:11:31 +09:00
ousttrue
b636771d24 構築時に meta と expression が ExternalObjectMap を利用する 2021-04-22 17:09:06 +09:00
ousttrue
8c7113bd53 EditorにMetaObjectの参照を表示 2021-04-22 16:41:30 +09:00
ousttrue
5a3f7d7b13 種類毎に別のフォルダにExtract 2021-04-22 16:24:41 +09:00
ousttrue
9dfab64d0e fix VrmScriptedImporterEditorGUI.m_vrm 2021-04-22 16:18:43 +09:00
ousttrue
366ea016f7 fix primitive.material 2021-04-21 16:44:45 +09:00
ousttrue
b90e781773 mtoon material export 実装 2021-04-21 16:39:22 +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
8e8ee5cf65 MeshExportValidator 2021-04-20 21:02:47 +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
25ea39cd87 SaveFileDialog 2021-04-19 18:48:42 +09:00
ousttrue
8d9de7a9d4 Validation, 多言語化を UniGLTF 配下に移動 2021-04-19 15:37:50 +09:00
ousttrue
042d5cde16 VRM10 VrmPreference を VRM に移動 2021-04-19 15:16:15 +09:00
ousttrue
1582cd1c24 TextureImporterConfigurator を VRMShaders.GLTF.IO.Editor に移動 2021-04-19 15:13:15 +09:00
ousttrue
61314cd398
Merge pull request #882 from ousttrue/fix10/fix_collider_offset 
[1.0] Importerを修正
 2021-04-16 19:33:05 +09:00
ousttrue
14abb5ff65 x と y の比較を追加 2021-04-16 19:30:27 +09:00
ousttrue
1204d83ddc RuntimeUnityBuilder の VRM部分で、必要な座標変換(x反転)が無かった。 
Mesh, Node　は、VrmLib.Model を介して座標変換されている。
 2021-04-16 19:13:38 +09:00
ousttrue
f14186068c Migrate_SpringBoneTest を追加。正しく migration できている。 2021-04-16 19:11:50 +09:00
ousttrue
4e486ebb95 SpringBoneWindow が見切れるのを修正。初期選択も実装 2021-04-16 18:26:48 +09:00
ousttrue
cff9dfadd8 VRM10SpringBone.m_center を VRM10Controller.SpringBoneCenter に移動 (SpringごとではなくModel全体の設定に) 
springの設定ではなくて、springが動く環境の設定。アプリが任意に設定する想定。
 2021-04-16 17:12:46 +09:00
ousttrue
a03f423213 auto reload 2021-04-16 17:05:53 +09:00
ousttrue
fc5e767680 OnDrawGizmosSelected 2021-04-16 17:00:36 +09:00
ousttrue
83c407a42f VRM10SpringSelectorWindow 2021-04-16 16:29:13 +09:00
ousttrue
52f516d443 test 追加. VRMMaterialImporterの interface を調整 2021-04-16 13:24:46 +09:00
ousttrue
36bba50914 Testを追加 2021-04-16 13:14:10 +09:00
ousttrue
b1184e9b0b rename 2021-04-16 12:39:10 +09:00
ousttrue
6ff0e6a34f SpringBoneManager 廃止 2021-04-15 19:45:16 +09:00
ousttrue
a13258785f VRM10SpringBone を SpringBone にした。 2021-04-15 19:26:15 +09:00
ousttrue
596651f551 Merge branch 'master' into feature10/update_jsonschema 2021-04-15 17:50:55 +09:00
ousttrue
99e2ac8a83 vrm-specification を更新して、コードを再生成 2021-04-15 14:50:27 +09:00
ousttrue
ed0cfb1f27
Merge pull request #872 from ousttrue/feature/extract_key 
Feature/extract key
 2021-04-14 20:12:05 +09:00
ousttrue
aedfe98974 mod TextureImportName.GetExtractName to GetUnityObjectName 2021-04-14 20:09:30 +09:00
ousttrue
7d561a6be0
Merge pull request #870 from ousttrue/fix10/import_collider 
colliderの重複を考慮していなかった
 2021-04-14 19:41:47 +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
03c0ad69c6 HashSet<SubAssetKey> 2021-04-14 14:25:21 +09:00
ousttrue
56b7f1ae20 SubAssetKey 2021-04-14 13:50:09 +09:00
ousttrue
405188f737 remove VRM10SpringBoneColliderGroup.Reset. importer が誤動作する 2021-04-13 20:48:56 +09:00
ousttrue
ac5662f61f colliderの重複考慮 2021-04-13 20:42:56 +09:00
ousttrue
81b8e5a012
Merge pull request #866 from ousttrue/fix/model_toglb 
vrm1 の Export インタフェースを整理
 2021-04-12 21:49:03 +09:00
ousttrue
f79736f0be Model.ToGlb を廃止。Vrm10Exporter.Export を追加 2021-04-12 20:28:37 +09:00
ousttrue
443001957b Model から VRM　情報が除去されたので、ToGlb に追加の引数が必用になった 2021-04-12 20:01:11 +09:00
ousttrue
7889f759c7 fix lookAtType migration 2021-04-12 19:49:24 +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
3127ace0e1 ExportSpringBone 2021-04-09 17:11:51 +09:00
ousttrue
63dc77e354 WIP ReverseX 2021-04-09 16:55:18 +09:00
ousttrue
37eb014228 fix ExportFirstPerson 2021-04-09 16:55:14 +09:00
ousttrue
5a86d036bf conflict 2021-04-09 16:55:10 +09:00
ousttrue
20af5606a0 ExportFirstPerson 2021-04-09 16:55:05 +09:00
ousttrue
7d15c0bb04 ExportLookAt 2021-04-09 16:55:00 +09:00
ousttrue
50078af9bc ExportExpression 2021-04-09 16:54:55 +09:00
ousttrue
4bf461a226 Vrm10Exporter.ExportMeta 2021-04-09 16:54:50 +09:00
ousttrue
45503b4b31 Vrm10Exporter.Export 2021-04-09 16:54:44 +09:00
ousttrue
44447822c0 m_debugCount 2021-04-09 16:54:39 +09:00
ousttrue
a207729d09 Vrm10MaterialExporter 2021-04-09 16:54:34 +09:00
ousttrue
90d6f49c24 Vrm10Exporter.Export 2021-04-09 16:54:27 +09:00
ousttrue
a5bb8c1d43 migration error message 2021-04-09 16:54:20 +09:00
ousttrue
bbb5b0384c 2018仕様に修正 2021-04-08 21:12:17 +09:00
ousttrue
cc2ed680a5
Merge pull request #855 from Santarh/vrmShadersRefactor2 
VrmShaders の asmdef から 不要な参照を除去
 2021-04-08 21:02:32 +09:00