Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-27 13:32:46 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,681 Commits 3 Branches 219 Tags 124 MiB
67d00a496a
Commit Graph

280 Commits

Author SHA1 Message Date
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
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
ousttrue
13c445f882 vrm0 の時だけ migration checkbox 2021-06-22 15:12:41 +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
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
cb59024f8e WIP VRM10Object 2021-06-15 19:10:54 +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
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
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
ousttrue
44b9652d6f null check 2021-06-09 15:50:16 +09:00
ousttrue
e7d461fac1 Vrm10Parser を導入して、ここで extension の取り出しと migrate を呼び出すようにした。 2021-06-09 13:16:04 +09:00
ousttrue
bf3f4416a8 Vrm10Importer.OpenOrMigrate 2021-06-08 19:24:17 +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
80abc5d7ce implement BlendShapeExporter.Export 2021-06-04 15:40:44 +09:00
ousttrue
7e42a8bd12 BlendShapeExporter を準備中 2021-06-04 13:39:28 +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
b2f342d7e1 rename VRM10SpringJoint to VRM10SpringBoneJoint 2021-06-01 16:55:34 +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
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
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
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
34e5e4689c Ignore considering gltf external textures 2021-05-25 16:43:47 +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
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
67558710d6
Merge pull request #955 from Santarh/exportMtoon10 
Implements exporting VRM 1.0 MToon
 2021-05-19 16:03:13 +09:00
Masataka SUMI
3f13fdde05 ignore freeze while exportings vrm10 2021-05-18 21:01:19 +09:00
Masataka SUMI
d33b928eeb Implements VRM10 MToon Exporter 2021-05-18 20:40:36 +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
ousttrue
720bb3ed59 WIP aim 2021-05-18 17:01:06 +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
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
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
3d4b10da12 VRM10SpringBoneColliderGroup の null 防御 2021-05-06 13:45:01 +09:00
ousttrue
9274c84c01 collider group の仕様変更 2021-04-30 14:08:36 +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
22871e992d
ExpressionAvatar は 独立した ScriptableObject をやめる (#916) 
* ExpressionAvatar is MonoBehaviour

* fix controller editor
 2021-04-27 15:12:29 +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
440a8f0e6f VrmExporter.ExportConstraints 2021-04-23 14:43:34 +09:00
ousttrue
e4adfdec88 colliders.Add(nodeIndex); 2021-04-23 13:39:33 +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
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
1204d83ddc RuntimeUnityBuilder の VRM部分で、必要な座標変換(x反転)が無かった。 
Mesh, Node　は、VrmLib.Model を介して座標変換されている。
 2021-04-16 19:13:38 +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
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
ac5662f61f colliderの重複考慮 2021-04-13 20:42:56 +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
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
a207729d09 Vrm10MaterialExporter 2021-04-09 16:54:34 +09:00
ousttrue
90d6f49c24 Vrm10Exporter.Export 2021-04-09 16:54:27 +09:00
ousttrue
b62c123b66 meta, expressionAvatar, expression の extract を復旧 2021-04-06 15:08:37 +09:00
ousttrue
8784f78ed0 implement MToon 2021-04-01 20:22:27 +09:00
ousttrue
dbc6d45832 Nodes 2021-04-01 15:35:02 +09:00
ousttrue
b3b7712b31 param.Sampler.WrapModes != null 2021-04-01 15:15:25 +09:00
ousttrue
ca559b526e implement Constraint 2021-04-01 15:00:17 +09:00
ousttrue
572354079d implement SpringBone 2021-04-01 14:15:24 +09:00
ousttrue
009fcabba9 implement firstPerson 2021-04-01 13:56:57 +09:00
ousttrue
c3fc7797ec implement LookAt 2021-04-01 13:46:52 +09:00
ousttrue
5df1576a70 implement build meta 2021-04-01 13:37:05 +09:00
ousttrue
4b9a140277 ModelAsset を縮小 2021-04-01 12:16:48 +09:00
ousttrue
fd7f09fece remove RuntimeUnityBuilder.Asset 2021-04-01 12:16:48 +09:00
ousttrue
0b65eebc87 MaterialColorBind, TextureTransformBind 2021-04-01 12:16:47 +09:00
ousttrue
339b2f6f9e MorphTargetBinding 2021-04-01 12:16:47 +09:00
ousttrue
d57cf4c747 expression 2021-04-01 12:16:47 +09:00
ousttrue
9a29eac013 humanoid 2021-04-01 12:16:46 +09:00
ousttrue
ce6090f1d7 LoadGeometryAsync 2021-04-01 12:16:46 +09:00
ousttrue
bf73c96847 Migration 2021-04-01 12:16:46 +09:00
ousttrue
a15b497b85 use Vrm10MToonMaterialImporter 2021-04-01 12:16:45 +09:00
ousttrue
ad62835604 remove Texture and Material from VRM10(use VRMShaders) 2021-04-01 12:16:45 +09:00
ousttrue
c8d90c1adb remove Material and VRM from VrmLib 2021-04-01 12:16:45 +09:00
ousttrue
ce4d393013 Submesh.Material to int 2021-04-01 12:16:45 +09:00
ousttrue
0a11bd1568 WIP Model.Vrm 2021-04-01 12:16:44 +09:00
ousttrue
2336a28067 WIP vrm, material 2021-04-01 12:16:44 +09:00