Commit Graph

514 Commits

Author SHA1 Message Date
notargs
449cdf29df コメントを追加 2023-04-26 16:41:04 +09:00
notargs
6cdfc7fe86 UrpVrm10MaterialDescriptorGeneratorを更新 2023-04-26 16:38:24 +09:00
notargs
d756e3487d MToon URPの読み込み処理を追加 2023-04-26 16:24:23 +09:00
ousttrue
144df734f2 copyright が抜けてる 2023-03-07 19:41:48 +09:00
ousttrue
e9f981c0ee keep controlRigGenerationOption argument
remove ControlRigGenerationOption.Vrm0XCompatibleWithXR_EXT_hand_tracking and Vrm0XCompatibleWithXR_FB_body_tracking
2023-02-20 14:20:53 +09:00
ousttrue
a82dfd4611 Vrm10RuntimeControlRig は、正規化されたTPoseを受け取る責務に特化して単純化する。
初期回転を持つポーズの受付は、Vrm10BoneInitialRotation を使う別クラスに委譲する。
(次で作ります)
2023-02-20 13:54:12 +09:00
amamagi
e663091fee feat: Add ITextureDeserializer parameter to Vrm10.LoadXXXAsync() and VrmUtility.LoadXXXAsync() 2023-01-11 11:43:58 +09:00
Masataka SUMI
0a7ac08dac specify a Shader instead of a string in MaterialDescriptor. 2022-12-05 17:21:20 +09:00
Masataka SUMI
2f915b4777 Take off responsibility of determining shaders from ImporterContext. 2022-12-05 16:30:43 +09:00
ousttrue
02ea223822 controlRigInitialRotations = null
* 順番
* null 引き数の省略
2022-11-28 17:06:31 +09:00
ousttrue
7af375cf34 Vrm10Importer の引き数を整理
* controlRigGenerationOption を削除
* controlRigInitialRotations に一本化
* IReadOnlyDictionary<HumanBodyBones, Quaternion> を使う
* XR_EXT_hand_tracking の親指のロールを修正
2022-11-28 15:44:25 +09:00
ousttrue
4a4dbb447a initialRotations 2022-11-25 20:29:02 +09:00
Masataka SUMI
62085d255a rename vrm10 material importer class names 2022-11-10 21:41:01 +09:00
Masataka SUMI
bd63c7e14f mv function of importing material name 2022-11-10 21:30:13 +09:00
Masataka SUMI
9f16a268a6 rename 2022-11-10 21:26:02 +09:00
Masataka SUMI
36e9ca8605 fix directory name cases 2022-11-04 16:28:04 +09:00
Masataka SUMI
6fe4f9ac24 stop inheritance 2022-11-04 16:11:45 +09:00
Masataka SUMI
907ecf74bd suppress unnecessary diffs 2022-11-04 16:06:33 +09:00
Masataka SUMI
28f7045418 format directory structure about VRM10 material io 2022-11-04 15:50:42 +09:00
Masataka SUMI
77272ac6e7 rename glTF material exporters 2022-11-04 15:37:52 +09:00
Masataka SUMI
326bdf9efc Merge branch 'master' of https://github.com/vrm-c/UniVRM into refactorMaterialExporter 2022-11-04 14:28:16 +09:00
ousttrue
1ca2d14100
Merge pull request #1904 from Santarh/suppressPreprocessor
Use static getter instead of preprocessors.
2022-11-04 14:06:37 +09:00
Masataka SUMI
f8ac8075e7 use static getter instead of preprocessors. 2022-11-03 20:58:14 +09:00
Masataka SUMI
dbdb147e2a Consider thumbnail image's mimeType when loading the vrm10 model. 2022-11-03 18:27:13 +09:00
Masataka SUMI
6446b7b0fa mv 2022-11-03 02:14:31 +09:00
Masataka SUMI
8af4eaecf5 Refactoring Material Exporters 2022-11-03 02:01:47 +09:00
ousttrue
c6dcbc9cf4 add MigrateExporter 2022-10-20 13:59:29 +09:00
0b5vr
8a45292f6c feature: add third argument vrmMeta to static Vrm10Exporter.Export 2022-10-11 18:17:50 +09:00
ousttrue
85f4e22a98 typo 2022-10-04 17:55:49 +09:00
Masataka SUMI
64f7c3faaf invert uv rotation direction of mtoon 1.0 2022-10-04 15:47:32 +09:00
Masataka SUMI
51f80bde73 Fix uv animation rotation direction of vrm-1.0 2022-09-26 17:34:42 +09:00
Masataka SUMI
5656214f72 Fix uv animation speed unit of vrm-1.0 2022-09-22 21:17:14 +09:00
Masataka SUMI
6f441acbfd Add implementation of matcapFactor 2022-09-21 18:12:44 +09:00
ousttrue
ea660c68dc
Merge pull request #1803 from Santarh/controlRigOptions
Replace control rig generation option with enum in vrm 1.0
2022-09-21 16:33:24 +09:00
Masataka SUMI
7ef5c7be54 remove unnecessary value of ControlRigGenerationOption 2022-09-21 16:22:59 +09:00
ousttrue
8ef6e53c4f
Merge pull request #1811 from ousttrue/fix10/version_10
[1.0] update SpecVersion to 1.0
2022-09-21 15:56:23 +09:00
ousttrue
4a5cf395bb update SpecVersion to 1.0 2022-09-21 15:16:04 +09:00
ousttrue
4168ae302d SpringBone のカプセルコライダーの座標変換漏れ 2022-09-21 14:13:58 +09:00
Masataka SUMI
902ed67335 Add ControlRigGenerationOption 2022-09-16 17:02:29 +09:00
notargs
2673380776 Issue #1789に対応 2022-09-14 19:04:30 +09:00
ousttrue
bc1d972311
Merge pull request #1785 from 0b5vr/mtoon-1-beta
Fix specVersion of MToon `1.0-draft` -> `1.0-beta`
2022-09-09 13:41:16 +09:00
0b5vr
244e7b1947 refactor: update constraint spec URL on comments 2022-09-09 12:06:45 +09:00
0b5vr
d058be96f6 fix: Fix specVersion of MToon 1.0-draft -> 1.0-beta 2022-09-09 11:35:01 +09:00
Masataka SUMI
9c88a9761c Add generateControlRig option to VRM 1.0 Importer 2022-09-07 18:51:23 +09:00
Masataka SUMI
e7ed265d67 refactoring 2022-09-07 18:22:11 +09:00
Masataka SUMI
0dfa783406 mv CachedEnum namespace to UniGLTF.Utils 2022-09-07 15:59:35 +09:00
Masataka SUMI
894ba1ecec Use CachedEnum instead of EnumUtil 2022-09-07 15:42:41 +09:00
Masataka SUMI
29163a43b1 Use CachedEnum 2022-09-07 15:38:02 +09:00
Masataka SUMI
f8fe9daa1e Remove the VRM 1.0 importer option about the normalization of node transforms. 2022-09-07 14:19:04 +09:00
ousttrue
20be242bfa
Merge pull request #1776 from Santarh/controlRIg4
Change access modifiers, Add methods, about ControlRig
2022-09-06 21:38:23 +09:00
Masataka SUMI
3753c6cde7 make IVrm10Constraint access public 2022-09-06 20:12:10 +09:00
ousttrue
41e8628ae8
Merge pull request #1765 from ousttrue/fix/use_optional_for_index
glTFTexture.source type to int?
2022-09-05 19:05:26 +09:00
ousttrue
d974ddfa57 out (SubAssetKey, TextureDescriptor) を 2つの out に展開 2022-09-05 18:41:12 +09:00
ousttrue
f2d587e09f glTFTexture.source type to int? 2022-08-05 21:13:32 +09:00
ousttrue
cc304f3b90 fix importer / exporter 2022-08-01 19:35:01 +09:00
ousttrue
3510c54fc3 VRM-1.0 の targetName を Mesh.extras のみに修正 2022-07-12 17:51:53 +09:00
Masataka SUMI
9640f05a70 Consider KHR_materials_emissive_strength extension while exporting mtoon materials as vrm1.0. 2022-07-12 17:20:24 +09:00
ousttrue
9c92be5f3e glTFAccessor.byteOffset to Nullable
* fix no byteoffset when sparse
2022-07-11 20:14:03 +09:00
ousttrue
80761cc01a add NullableSerialization
* Nullable<int> only
2022-07-11 20:03:59 +09:00
ousttrue
045c690b08
Merge pull request #1715 from ousttrue/fix10/vertex_attribute_nullable
Other than position is nullable
2022-06-28 16:07:26 +09:00
ousttrue
bb88086825 Other than position is nullable 2022-06-24 19:52:59 +09:00
ousttrue
f19389c03a Animator じゃなくて Vrm10Instance から bone を得る 2022-06-24 18:10:42 +09:00
ousttrue
65c78681e4 JsonSchema からコード生成。Metacarpal に関する修正。 2022-06-24 17:33:49 +09:00
ousttrue
4998d6946e vrm-1.0 に対する boneWeight の付与 2022-06-22 13:19:40 +09:00
ousttrue
b59e1bfa62 MeshContext を MeshData と MeshUploader に責務分離 2022-06-09 15:12:42 +09:00
ousttrue
706d4d5f41 rename 2022-06-09 14:35:11 +09:00
ousttrue
5758f12a88 Move Vrm10Instance.SpringBoneCenter to Vrm10InstanceSpringBone.Spring.Center. Update exporter and importer. 2022-05-30 22:15:00 +09:00
ousttrue
a1c5e77626 UNSIGNED_SHORT の index buffer に対応。エラーメッセージを追加。 2022-05-19 13:24:28 +09:00
Masataka SUMI
ef7fc457a8 Show stacktrace at failed in migration. 2022-05-18 17:23:28 +09:00
ousttrue
f4ef947607 update vrm-specification. NODE_CONSTRAINT_SPEC_VERSION has been upgraded from draft to beta. 2022-05-13 13:27:31 +09:00
ousttrue
5360b44b0a RecalculateNormals 2022-05-12 16:47:47 +09:00
ousttrue
0be79c4dbc index フォーマット uint8 に対応 2022-05-12 16:43:41 +09:00
ousttrue
bf872c962f new Matrix4x4 が転置しているエラー。引数名の column の意味を勘違い 2022-05-12 16:43:10 +09:00
ousttrue
e61f29b89e primitive.indices が無いときに、連番を補う 2022-05-12 16:22:16 +09:00
ousttrue
e327ebc9bc ReverseX. #1532 2022-05-11 14:49:22 +09:00
ousttrue
ce22c6e8ed fix weight nullable 2022-04-21 12:48:20 +09:00
ousttrue
5b815a874b joint が複数の chain に所属する場合に AddComponent に失敗する 2022-04-19 15:36:26 +09:00
ousttrue
87c3bff866
Merge pull request #1607 from ousttrue/fix10/update_constraint_spec
Fix10/update constraint spec
2022-04-19 14:27:49 +09:00
ousttrue
3637898efb
Merge pull request #1609 from ousttrue/fix10/fix_byte4
Byte4型の ~~BoneWeight~~ SkinJoint に対応
2022-04-19 14:27:04 +09:00
ousttrue
a12ce042fb IVRM10Constraint.cs abstract class to interface 2022-04-19 14:19:45 +09:00
ousttrue
325fe98980 新仕様に合わせて旧コンポーネントを整理。Vrm10AimConstraint, Vrm10RollConstraint, VRM10RotationConstraint のコンポーネント(placeholder), Import, Export を実装 2022-04-19 14:19:44 +09:00
ousttrue
54998b3a3e 仕様を更新、コードを再生成 2022-04-19 14:19:44 +09:00
ousttrue
c0d1fa840d GetAsSkinJointsArray と GetAsVector4Array を使う 2022-04-19 14:17:16 +09:00
ousttrue
d1fb39bb3b GetAsVector4Array 2022-04-19 14:09:50 +09:00
ousttrue
30996cb03c otherLicenseUrl != otherPermissionUrl をエラーとしない 2022-04-15 17:47:33 +09:00
ousttrue
8f6e6d689a catch migration exception 2022-04-15 17:42:42 +09:00
ousttrue
9a394ea842 Byte4型のBoneWeightに対応 2022-04-12 15:39:01 +09:00
ousttrue
19f47a7d1c RuntimeOnlyAwaitCaller if isPlaying 2022-02-24 19:22:59 +09:00
ousttrue
3c873cdbaa fix await caller. ハイレベルAPI で awaitCaller=null 引き数を受ける関数が、new ImmediateCaller する 2022-02-24 19:15:59 +09:00
ousttrue
bd97a4f47f
Merge pull request #1545 from ousttrue/fix/new_immediatecaller
remove `awaitCaller ?? new ImmediateCaller()`
2022-02-22 18:20:20 +09:00
ousttrue
f49e651590
Merge pull request #1542 from ousttrue/fix10/skip_empty_mesh
skip empty mesh
2022-02-22 18:17:04 +09:00
ousttrue
faebd43771 remove awaitCaller ?? new ImmediateCaller()
上流の awaitCaller を下流に使ってないことも修正
2022-02-21 16:47:44 +09:00
ousttrue
3156d0c74c skip empty mesh 2022-02-21 15:01:26 +09:00
ousttrue
c6b53148c4 remove unused 2022-02-16 16:52:27 +09:00
ousttrue
37de8f2199 Replace System.Numerics to UnityEngine 2022-02-16 16:38:18 +09:00
ousttrue
b044dc99a0 merge BufferAccessorAdapter to BufferAccessor. remove unused. 2022-02-15 20:34:23 +09:00
ousttrue
115ca18b51 BufferAccessor を UniGLTF に移動 2022-02-15 17:13:26 +09:00
ousttrue
951f22796c
Merge pull request #1523 from ousttrue/fix10/spanlike_to_nativearray
SpanLike を NativeArray で置き換える
2022-02-14 20:14:47 +09:00
ousttrue
b9d81d2cc1 use INativeArrayManager 2022-02-14 19:56:34 +09:00
ousttrue
6585ad0a98 null index check 2022-02-14 16:42:49 +09:00
ousttrue
21ac603a31 use INativeArrayManager 2022-02-14 13:22:13 +09:00
ousttrue
ae96708943 remove SpanLike 2022-02-14 13:16:09 +09:00
ousttrue
b98c2f852f BufferAccessor use NativeArray 2022-02-10 22:23:39 +09:00
ousttrue
abc9bfbe09 Vrm10ImportData use NativeArray 2022-02-10 21:03:22 +09:00
ousttrue
293a49fd31 remove ArraySegmentByteBuffer 2022-02-10 20:39:50 +09:00
ousttrue
bccad49a27 GLTF to Gltf 2022-02-10 18:53:18 +09:00
ousttrue
8d80c32a11 Merge Vrm10ExportData to ExportingGltfData 2022-02-10 18:49:48 +09:00
ousttrue
d183364687
Merge pull request #1519 from ousttrue/fix10/separate_vrm10storage
Vrm10Storageを分解
2022-02-10 16:49:03 +09:00
ousttrue
7483033bc0
Merge pull request #1520 from Santarh/updateHlapi
Define & Implements error & cancel handling explicitly about High-level VRM1.0 Loader API.
2022-02-10 14:53:58 +09:00
Masataka SUMI
6e4ef560fa throw if necessary. 2022-02-10 00:43:15 +09:00
Masataka SUMI
24f6184823 Vrm10.LoadAsync passthrough OperationCanceledException. 2022-02-10 00:26:58 +09:00
Masataka SUMI
9e06e955c3 add behaviours about function loading vrm10 has cancelled. 2022-02-09 23:14:29 +09:00
Masataka SUMI
0b77833b49 add comment 2022-02-09 20:44:29 +09:00
Masataka SUMI
23d440829e consider IAwaitCaller on VRM1.0 HLAPI 2022-02-09 20:41:13 +09:00
ousttrue
05928872cd Vrm10Storage を Vrm10ImportData と Vrm10ExportData に分解 2022-02-09 20:36:41 +09:00
Masataka SUMI
a22b4b6f52 fix cancel handling 2022-02-09 20:33:49 +09:00
Masataka SUMI
a6945d79f9 Add a minimum cancellation handling to VRM1.0 HLAPI. 2022-02-09 20:10:15 +09:00
ousttrue
720f011ae2
Merge pull request #1499 from ousttrue/fix10/simplify_vrmlib
VrmLib の整理
2022-02-09 18:28:00 +09:00
ousttrue
48e4d71c43
Merge pull request #1504 from Santarh/fixHlapi
Refactor High-level VRM-1.0 Loading API.
2022-02-04 19:52:58 +09:00
Masataka SUMI
d5c0d5a484 change name 2022-02-04 19:11:12 +09:00
ousttrue
080f05ef72
Merge pull request #1498 from 0b5vr/constraint-axes
[1.0] Constraint, freezeAxes -> axes
2022-02-04 19:01:41 +09:00
Masataka SUMI
4fefbc38c3 Change High-level VRM-1.0 loading API. 2022-02-04 18:54:58 +09:00
ousttrue
e67448c817
Merge pull request #1503 from ousttrue/fix/gltfdata_dispose
GltfData.Dispose の呼び忘れを修正
2022-02-04 17:45:53 +09:00
ousttrue
ea53893a52
Merge pull request #1501 from 0b5vr/springbone-null
[1.0] don't export the springBone extension if there are no colliders and springs
2022-02-04 17:44:01 +09:00
ousttrue
7ce3df2a66
Merge pull request #1500 from 0b5vr/specversion
fix: add specVersion to spring bone and node constraint
2022-02-04 17:42:18 +09:00
Masataka SUMI
5d9368f919 mv Vrm10Utility to Vrm10 2022-02-04 17:22:58 +09:00
Masataka SUMI
02427e630e VRM10Utility can receive CancellationToken 2022-02-04 17:13:47 +09:00
Masataka SUMI
bb1c3d4cc1 fix comments 2022-02-04 17:12:03 +09:00
ousttrue
0d93bab539 using 2022-02-04 16:33:54 +09:00
0b5vr
14d8aeeece fix (1.0, springBone): don't export the springBone extension if there are no colliders and springs 2022-02-04 15:47:19 +09:00
0b5vr
ede3a4143c fix: add specVersion to spring bone and node constraint 2022-02-04 15:32:46 +09:00
ousttrue
4bb2cfaf59 remove unused 2022-02-04 15:04:56 +09:00
0b5vr
d9d9e13901 change (1.0, constraint): freezeAxes -> axes
See: https://github.com/vrm-c/vrm-specification/pull/352
2022-02-04 12:33:01 +09:00
ousttrue
02c320f374 Vrm10Data.ParseOrMigrate を Parse と Migrate の別関数に分割
* Migrateの返り値は呼び出し側にDisposeの責務がある
* Vrm10Utility を Vrm10Data.ParseOrMigrate の代わりに使う
2022-02-03 22:06:06 +09:00
ousttrue
d492118f25 separate MigrationData.cs 2022-02-03 20:32:40 +09:00
ousttrue
b72dce24c2
Merge pull request #1487 from ousttrue/fix10/fix_neutral
Fix10/fix neutral
2022-02-03 20:22:02 +09:00
ousttrue
88fd397148
Merge pull request #1485 from ousttrue/fxi10/update_vrm10data_api
Fxi10/update vrm10data api

この後で、 Parse と Migrate を分割します
2022-02-03 20:21:45 +09:00
ousttrue
945873a5b3 neutral 関連個所(シリアライズ周り)を修正 2022-02-01 14:31:51 +09:00
ousttrue
ab8c19060c コメント修正 2022-01-26 19:57:10 +09:00
ousttrue
ae25b13292 use Vrm10Utility 2022-01-26 19:36:13 +09:00
ousttrue
511aa89dcc Vrm10Data.TryParseOrMigrate の API 変更
* 関連する unittest で Dispose
2022-01-26 18:53:09 +09:00
ousttrue
f9a1c8cb83 null check 2022-01-26 18:04:55 +09:00
ousttrue
33384b5557 vrm-1.0 のマイグレート絡みの Dispose は別 Issue で修正します。API 変更が必用 2022-01-26 14:19:16 +09:00
ousttrue
163308e2f4 Dispose 上の方 2022-01-26 13:08:32 +09:00
ousttrue
ab0964293f GltfData.Bin を ArraySegment<byte> から NatriveArray<byte> に置き換え。Dispose の責務が発生したが、ImporterContext が Dispose することにした。 2022-01-25 18:03:10 +09:00
ousttrue
bc7b6ffda1 Vrm10Importer で Neutral を Custom から救出するコードを追加 2022-01-18 21:07:26 +09:00
ousttrue
19edf45302 空の collider group の null check 2022-01-12 13:06:18 +09:00
ousttrue
761537a2cf
Merge pull request #1446 from ousttrue/fix10/update_spec
[1.0][Constraint] rotation local to localのみに
2022-01-06 14:56:36 +09:00
ousttrue
fcfe82588d constraint rotation:local to local only に縮小。
その他のものは後に。
2021-12-28 16:39:17 +09:00
ousttrue
ff366ac9e7 JSONキー省略時にデフォルト値を補う 2021-12-27 18:11:47 +09:00