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,608 Commits 3 Branches 219 Tags 124 MiB
85fb330c8b
Commit Graph

547 Commits

Author SHA1 Message Date
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
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
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
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
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
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
cff9dfadd8 VRM10SpringBone.m_center を VRM10Controller.SpringBoneCenter に移動 (SpringごとではなくModel全体の設定に) 
springの設定ではなくて、springが動く環境の設定。アプリが任意に設定する想定。
 2021-04-16 17:12:46 +09:00
ousttrue
fc5e767680 OnDrawGizmosSelected 2021-04-16 17:00:36 +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
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
cc2ed680a5
Merge pull request #855 from Santarh/vrmShadersRefactor2 
VrmShaders の asmdef から 不要な参照を除去
 2021-04-08 21:02:32 +09:00
Masataka SUMI
2103487341
Merge pull request #853 from ousttrue/fix10/migration_lookat_firstperson 
implement MigrationVrmLookAtAndFirstPerson. fix MigrateVector3
 2021-04-08 21:00:16 +09:00
Masataka SUMI
71fb834364 refactoring vrm shaders asmdef 2021-04-08 20:59:43 +09:00
ousttrue
a021dced62 vrm1 の仕様変更をコメント 2021-04-08 20:57:50 +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
36fec84806 implement MigrationVrmLookAtAndFirstPerson. fix MigrateVector3 2021-04-08 19:10:00 +09:00
ousttrue
b62c123b66 meta, expressionAvatar, expression の extract を復旧 2021-04-06 15:08:37 +09:00
ousttrue
d28f700997 移動 VRMShaders.TextureExporter 
#726 separate AssetTextureUtil
 2021-04-02 18:14:27 +09:00
ousttrue
fa25c0f23b コード整理 2021-04-01 20:47:10 +09:00
ousttrue
8784f78ed0 implement MToon 2021-04-01 20:22:27 +09:00
ousttrue
99091a5027 fix test 2021-04-01 17:49:47 +09:00
ousttrue
c94a43ebe5 implement MigrationMToon 2021-04-01 17:37:28 +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
82ef39e56d remove VRM10Controller.ModelAsset 2021-04-01 12:16:47 +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
ousttrue
c789364981 remove MaterialAdapter for import 2021-04-01 12:16:44 +09:00
ousttrue
a8039d46c8 WIP LoadVrm 2021-04-01 12:16:44 +09:00
ousttrue
818453652b WIP ExportVrm 2021-04-01 12:16:43 +09:00
ousttrue
75a12cbe87 remove non used 2021-04-01 12:16:43 +09:00
ousttrue
323a816024 WIP RuntimeUnityBuilder 2021-04-01 12:16:43 +09:00
ousttrue
1c4b0e6392 WIP Vrm10MToonMaterialImporter 2021-04-01 12:16:42 +09:00
ousttrue
fec118d788 WIP UniGLTF with VrmLib.Model 2021-04-01 12:16:42 +09:00
ousttrue
8629f4df5c VrmLoader.CreateVrmModel use GltfParser 2021-04-01 12:16:42 +09:00
ousttrue
d4777e17a4 Vrm10Storage(GltfParser) 2021-04-01 12:16:41 +09:00
ousttrue
8a07b1c4a4 use UniGLTF.IBytesBuffer 2021-04-01 12:16:41 +09:00
ousttrue
06013474cf remove stride 2021-04-01 12:16:41 +09:00
ousttrue
ef6e161d82 remove IVrmExporter 2021-04-01 12:16:41 +09:00
ousttrue
57581467c9 remove IVrmStorage 2021-04-01 12:16:40 +09:00
ousttrue
6116a6cac1 rename 2021-04-01 12:16:40 +09:00
Masataka SUMI
5b6b6985de Consider the sparse accessor while migration. 2021-03-16 17:02:10 +09:00
ousttrue
69974d7ba1 fix Migrate0to1 2021-03-03 13:00:12 +09:00
ousttrue
06674b8de8 fix RotateY180Test 2021-03-03 12:45:45 +09:00
ousttrue
59129af006
Merge pull request #727 from ousttrue/feature10/z_plus_forward 
VRM1 は、XYZ_RightUpForward_RH にする
 2021-02-19 20:23:36 +09:00
ousttrue
ff19712591 comment 2021-02-19 20:15:04 +09:00
ousttrue
f7f845304a fix Matrix byte order 2021-02-19 19:55:25 +09:00
ousttrue
9a651e08b4 fix boolean 2021-02-19 19:33:09 +09:00
Masataka SUMI
91418e0f7a エラー部分を暫定的に対処 2021-02-18 20:07:58 +09:00
Masataka SUMI
9a2017c6f9 schema からシリアライザを生成 2021-02-18 20:07:22 +09:00
ousttrue
a6ac0668b9 やっぱ要る 2021-02-17 14:05:30 +09:00
ousttrue
383bfa4f68 fix 2021-02-16 18:26:24 +09:00
ousttrue
9086021258 implement RotateY180 2021-02-16 18:21:50 +09:00
ousttrue
65ee54543a update 2021-02-16 18:21:50 +09:00
ousttrue
dadf45865c fix sparse export 2021-02-16 18:21:50 +09:00
ousttrue
79f137db32 SceneRotator 2021-02-16 18:21:50 +09:00
ousttrue
f2e9e96fdf MigrationVrm 2021-02-16 18:21:49 +09:00
ousttrue
871ca8c7a2 Separate MigrationVrmExpression 2021-02-16 18:19:55 +09:00
ousttrue
d587577da0 Separate MigrationVrmSpringBone 2021-02-16 18:18:41 +09:00
ousttrue
b36f23105b separate MigrationVrmMeta 2021-02-16 18:17:19 +09:00
ousttrue
87a9dcb920 separate MigrationCheck 2021-02-16 18:15:39 +09:00
ousttrue
5f86ffe842 VrmLib.Coordinates.Vrm1 
https://github.com/vrm-c/vrm-specification/issues/205
 2021-02-16 18:06:16 +09:00
ousttrue
c2ffda92dc MsgPack と Json を共用にするための Generics ListTreeNode を 単純な型 JsonNode で置き換え 2021-02-09 15:15:38 +09:00
ousttrue
80938f0121 fix UNITY_EDITOR 2021-02-03 15:42:08 +09:00
PoChang007
53f9cb54f5
Merge pull request #722 from ousttrue/feature10/add_surprised 
Implemented VrmLib.ExpressionPreset.Surprised
 2021-02-03 15:08:15 +09:00
ousttrue
3bbe81e725 new list 2021-02-03 14:05:11 +09:00
ousttrue
e4ad2dda11 Implemented VrmLib.ExpressionPreset.Surprised 2021-02-03 13:58:47 +09:00
ousttrue
f42ab7a172
Merge pull request #714 from Santarh/expressionImpl3 
Implements expression overriding
 2021-02-02 15:03:51 +09:00
Masataka SUMI
18850bb04c remove redundant access. 2021-02-02 14:10:35 +09:00
Masataka SUMI
ae1bec1e95 sum expression override rate method is changed from max to muladd. 2021-02-02 14:10:12 +09:00
Masataka SUMI
f36f70674e Follow updates of BlendShapeKey 2021-02-02 00:02:08 +09:00
Masataka SUMI
d9a8278df9 fix ExpressionPreset conversion problem in migration. 2021-02-01 23:37:55 +09:00
Masataka SUMI
e8bbbc849d ExpressionKey.IsBinary evaluates in ExpressionValidator. 2021-02-01 23:28:24 +09:00
Masataka SUMI
dd34a1e615 Suppress GC to zero about Expression functions. 2021-02-01 23:17:17 +09:00
Masataka SUMI
4ebcbb1ab9 Consider block. 2021-02-01 22:50:05 +09:00
Masataka SUMI
aec86eae4c Remove unused classes. 2021-02-01 22:45:50 +09:00
Masataka SUMI
0341725770 Implements expression overriding https://github.com/vrm-c/vrm-specification/pull/196 2021-02-01 22:29:42 +09:00
Masataka SUMI
0c5d6aae17 Restore eye bone when ExpressionController was disposed. 2021-02-01 20:32:06 +09:00
Masataka SUMI
7986638c82 Refactoring reference between Expression and LookAt. 2021-02-01 19:27:22 +09:00
Masataka SUMI
349fd06645 Rename 2021-02-01 16:04:24 +09:00
Masataka SUMI
a3afd483d0 Define ExpressionValidator instead of ExpressionAccumulator 2021-02-01 15:54:13 +09:00
Masataka SUMI
5241f79927 make Expression classes sealed. 2021-01-29 22:06:46 +09:00
Masataka SUMI
144ee3fd67 make Expression merger classes internal. 2021-01-29 19:12:01 +09:00
Masataka SUMI
740cd023d0 Fix case. 2021-01-29 18:49:01 +09:00
Masataka SUMI
4b5346bb41 Complete meta "violentUssageName" & "sexualUssageName" migration. 2021-01-29 18:43:30 +09:00
Masataka SUMI
832d715a91 Complete meta CommercialUsageType migration. 2021-01-29 18:31:01 +09:00
Masataka SUMI
85ef1ef9b3 Remove invalid mesh load algorithm. 2021-01-29 18:25:15 +09:00
Masataka SUMI
579fc5ea89 complete "allowedUserName" switch cases. 2021-01-29 18:24:33 +09:00
ousttrue
e6a02a90f0 Add Component するので Runtime にいる必要があった。 
ビルドは後でなおす
 2021-01-29 16:34:34 +09:00
ousttrue
4173d00c9a generate expression 
OverrideBlink, OverrideLookAt, OverrideMouth
 2021-01-29 16:26:13 +09:00
ousttrue
78bd0aafb9 コード整理 2021-01-29 14:05:04 +09:00
ousttrue
feff04d3a6 trs 2021-01-28 20:03:19 +09:00
ousttrue
3720fb1341 fix expression editor and migration 2021-01-28 20:03:19 +09:00
ousttrue
a57e30e3ba MorphTargetBinding 2021-01-28 20:03:19 +09:00
ousttrue
015f5e3881 move 2021-01-28 20:03:18 +09:00
ousttrue
24e16077b5 MigrateExpression 2021-01-28 20:03:18 +09:00
ousttrue
b2fd1dc8ce IExpressionAccumulator 2021-01-28 20:03:18 +09:00
ousttrue
9c56c7561c update VRM10ControllerExpression 2021-01-28 20:03:17 +09:00
ousttrue
16e4bcab44 fix build error in vrm10 
#701
 2021-01-28 18:33:49 +09:00
ousttrue
43c46fbf18 fix SpringBoneAdapter.ToGltf 2021-01-27 16:56:29 +09:00
ousttrue
f6babc46e0 fix ApiSampleTests.cs 2021-01-27 16:27:24 +09:00
ousttrue
9b45fb9f72 exclude checkbox 2021-01-22 15:55:55 +09:00
ousttrue
a61c3f92df restore spring gizmo 2021-01-22 15:45:02 +09:00
ousttrue
1a28a18e29 fix comment 2021-01-22 15:34:58 +09:00
ousttrue
178c51ddec Joint別パラメーターを実装 2021-01-22 15:31:14 +09:00
ousttrue
79b302ec38 udpate schema 2021-01-22 12:52:07 +09:00
ousttrue
562b3a771a MigrateSpringBone 2021-01-21 21:51:39 +09:00
ousttrue
c79d3d838c GetExtension 2021-01-21 18:20:32 +09:00
ousttrue
e39f93436e Migration.Check 2021-01-21 18:10:34 +09:00
ousttrue
ca8359954f CheckMeta 2021-01-21 15:26:18 +09:00
ousttrue
7a9714fff5 MigrateMeta 2021-01-21 14:29:04 +09:00
ousttrue
564727e0f5 fix 2021-01-20 21:47:38 +09:00
ousttrue
0c8161d4ef implement humanoid migration 2021-01-20 21:47:26 +09:00
ousttrue
2d5b5a4cfd WIP MigrateHumanoid 2021-01-20 21:09:17 +09:00
ousttrue
00b3c26834 init Migration 
#652
 2021-01-20 18:36:39 +09:00
ousttrue
505417a964 merge VrmLib.GLb to UniGLTF.Glb 2021-01-20 18:36:39 +09:00
ousttrue
0484f02198 VRM10SpringBoneManager.cs 2021-01-20 18:36:39 +09:00
ousttrue
e05daa1524 WIP SpringBone 
* JsonSchema更新
* シリアライザ修正

#635
 2021-01-20 18:36:39 +09:00
ousttrue
2e067a92f5 gizmo 2021-01-20 18:36:38 +09:00
ousttrue
3b0cccdfab prefix VRM10 2021-01-20 18:36:38 +09:00
ousttrue
114ee76bdf Authors 2021-01-20 18:36:38 +09:00
ousttrue
0d9ca4c905 fix semicolon 2021-01-14 20:41:11 +09:00
ousttrue
ff31a01e7d update menu 2021-01-14 19:26:33 +09:00
PoChang007
c53b63f001 clean unused .meta 2021-01-13 18:20:54 +09:00
ousttrue
d53942a7bd merge vrm10 
* MeshUtility を UniGLTF　下に移動
* Assets/VRM10 を追加
* JsonSchemaからのコード生成 UniGLTF/Editor/Generator を追加
 2021-01-07 13:37:24 +09:00