Commit Graph

1330 Commits

Author SHA1 Message Date
ousttrue
abf5aba3ce UniVRM-0.116.0 2023-12-12 13:58:38 +09:00
ousttrue
6e13c87c00 add renderer without firstperson setting 2023-12-08 17:47:34 +09:00
ousttrue
f31b2f8e69 implement vrm-1.0 integration 2023-12-06 18:20:43 +09:00
ousttrue
3ed0f17410 VrmBlendShapeUpdater 2023-12-05 18:29:32 +09:00
ousttrue
b12c9ed87c WriteAssets and WritePrefab 2023-12-05 16:21:35 +09:00
ousttrue
fb7cb163b1 fix VrmMeshIntegratorWizard.WriteAssets 2023-12-04 17:55:36 +09:00
ousttrue
b5a7c1b13b remove GltfMeshUtility.ForceUniqueName.
automatically force when createAvatar
2023-12-04 17:04:44 +09:00
ousttrue
e3404e1f16 refactor MeshUtility.Process params 2023-12-04 17:00:15 +09:00
ousttrue
00e1278123 fix NormalizeNoneSkinnedMesh 2023-12-01 17:17:48 +09:00
ousttrue
f84a6ccb73 fix GltfMeshUtility.WriteAssets 2023-12-01 17:06:31 +09:00
ousttrue
f8f27d0619 prefab と runtime で整合性。
- prefab 時は instance 化する。統合グループをの内容をインスタンス後のもので置き換える
- 未使用削除
2023-11-29 20:02:46 +09:00
ousttrue
32af053a62 vrm-0.x firstperson 2023-11-28 18:20:43 +09:00
ousttrue
4ec5d54588 bake mesh inplace 2023-11-27 20:05:01 +09:00
ousttrue
ff68649036 MeshAttachInfo 2023-11-27 18:58:50 +09:00
ousttrue
6d251c5993 fix menu priority 2023-11-27 14:53:14 +09:00
ousttrue
6dd4320656 TargetIsPrefab and DialogMessage 2023-11-21 19:36:40 +09:00
ousttrue
b216a5bbc0 メニューの表記、順番調整
- `-1.0` => ` 1.0`
- `Import` and `Export`
- `Export < Import < MeshUtility` order
2023-11-15 18:24:02 +09:00
ousttrue
90a1192be2 menu 名と dialog 名を整理
- menu 名を関連クラスの `public const string MENU_NAME` にした(特に validate=true で2回同名で呼ぶところ)
- menu 表示名と dialog のタイトルを同じ文字列にした
2023-11-15 16:01:21 +09:00
ousttrue
8deb17d18c WIP split by blendshape 2023-11-07 19:21:03 +09:00
ousttrue
0f62aeffa1 impl inplace MeshFreeze and MeshIntegration 2023-10-27 16:18:07 +09:00
ousttrue
16d17a7951 separate file 2023-10-26 16:28:51 +09:00
ousttrue
787dada27e AvatarDescription.AddAnimator to CreateAvatarForCopyHierarchy 2023-10-26 14:56:23 +09:00
ousttrue
ced5dc8918 implement FreezeScaling 2023-10-25 21:50:06 +09:00
ousttrue
c43f86bca4
Merge pull request #2172 from ousttrue/fix/not_export_uv2
TEXCOORD_1 は export しない
2023-10-23 17:48:28 +09:00
ousttrue
f4a2150c8a add ExportUvSecondary.ExportUvSecondary. but always false 2023-10-20 19:35:29 +09:00
ousttrue
8ff3faa857 rename UniVrmPackageVersion to PackageVersion 2023-10-20 19:16:20 +09:00
ousttrue
443e0048bd VRMVersionをリネームして場所移動。VRM10から参照できるようになる。 assets.generator に使う。 2023-10-20 18:10:42 +09:00
ousttrue
4896e783da UniVRM-0.115.0 2023-10-12 13:38:35 +09:00
ousttrue
ebb7ef67c0
Merge pull request #2148 from Santarh/vrm0xBlendshapePreview
[VRM0.x] Fix wrong preview results in editor inspector when a vrm blendshape material target is "*_ST_S" or "*_ST_T"
2023-10-11 20:03:45 +09:00
Masataka SUMI
1360834711 [VRM0.x] Fix wrong preview results in editor inspector when a material target is "*_ST_S" or "*_ST_T" 2023-08-30 17:00:58 +09:00
ousttrue
f79adbda3d 記述が古いところを修正 2023-08-23 15:21:58 +09:00
ousttrue
0d8d6c538d UniVRM-0.114.0 2023-08-21 18:47:27 +09:00
Masataka SUMI
15f9de1101
Merge pull request #2114 from CrucibleNetworksLtd/auto-detect-render-pipelines
Auto detect render pipelines
2023-08-15 12:33:52 +09:00
thoxey
88588bf111 Adds a new trio of utility classes
These allow for the creation of materialdescriptorgenerators that use the current render pipeline
2023-07-25 12:23:25 +01:00
ousttrue
760a4aee3c UniVRM-0.113.0 2023-07-24 20:45:26 +09:00
ousttrue
4d78f864e8 impl VRMSampleCopy.Validate 2023-07-05 14:08:30 +09:00
ousttrue
5a87e0a4bf SampleCopy 済みか確認する 2023-07-05 13:44:32 +09:00
ousttrue
e8861704d2 UniVRM-0.112.0 2023-06-09 17:13:42 +09:00
ousttrue
48ebe7e081
Merge pull request #2064 from ousttrue/fix/broken_springbone_no_throw
springbone の import で throw しない
2023-06-06 13:04:08 +09:00
ousttrue
3f3f97d4e9
Merge pull request #2075 from ousttrue/version/v0_111_0
UniVRM-0.111.0
2023-06-05 20:04:23 +09:00
ousttrue
32bc5d6d86 UniVRM-0.111.0
バージョン番号の更新。サンプルの更新による差分あり。
2023-06-05 17:07:50 +09:00
ousttrue
cd6db6d127 human bone の index が -1 になりうる? 2023-06-05 17:01:32 +09:00
ousttrue
70dbeb1291 add index -1 check 2023-05-15 13:18:47 +09:00
ousttrue
bd770f8b26 warning 2023-05-15 13:09:53 +09:00
ousttrue
69b952257a VRMSpringUtility.LoadSecondary 関数が throw しないように修正
fix #2023
SpringBone は不完全になるが throw しない。
2023-05-15 13:07:16 +09:00
ousttrue
4c3de71408 UniVRM-0.110.0
sample追加あり
2023-04-12 14:12:03 +09:00
Hans
17b095858d
Add missing menu register 2023-04-09 15:10:11 +08:00
ousttrue
7affa42bca
Merge pull request #2015 from ousttrue/version/update_samples
copy Samples to Samples~
2023-03-13 16:02:09 +09:00
ousttrue
9356a6f778 copy Samples to Samples~ 2023-03-13 15:55:49 +09:00
ousttrue
4bfd536e0e UniVRM-0.109.0 2023-03-10 13:58:43 +09:00
0b5vr
bf69c34cfc refactor: the same unityPath can be used for three of them 2023-02-20 17:02:14 +09:00
0b5vr
3c390fe0f3 fix: Fix vrmAssetPostprocessor
it was processing directories end with `.vrm` by mistake, which occurs with `Packages/com.vrmc.vrm`
2023-02-20 16:55:32 +09:00
amamagi
e663091fee feat: Add ITextureDeserializer parameter to Vrm10.LoadXXXAsync() and VrmUtility.LoadXXXAsync() 2023-01-11 11:43:58 +09:00
0b5vr
9c194d55e7 refactor: SpringBoneEditor, change FindProperty specifier from string literal to nameof
Addressing https://github.com/vrm-c/UniVRM/pull/1952#discussion_r1044133280
Addressing https://github.com/vrm-c/UniVRM/pull/1952#discussion_r1044133784
2022-12-09 16:03:45 +09:00
0b5vr
a56bdbb3fe fix: Add [CanEditMultipleObjects] to VRMSpringBoneEditor
Addressing https://github.com/vrm-c/UniVRM/pull/1952#discussion_r1044140283
2022-12-09 15:59:56 +09:00
0b5vr
907f8ec33f fix: rename VRM10SpringBoneJointEditor -> VRMSpringBoneEditor
Addressing https://github.com/vrm-c/UniVRM/pull/1952#discussion_r1044132637
2022-12-09 15:59:17 +09:00
0b5vr
cd88d0744f feature (VRM0, SpringBone): add limit break slider to spring bone joint properties 2022-12-08 20:40:15 +09:00
ousttrue
e16dd2f8c0
Merge pull request #1943 from ousttrue/version/v0_108_0
UniVRM-0.108.0
2022-12-05 20:35:37 +09:00
Masataka SUMI
0a7ac08dac specify a Shader instead of a string in MaterialDescriptor. 2022-12-05 17:21:20 +09:00
Masataka SUMI
3ad42a262e fix 2022-12-05 17:05:21 +09:00
Masataka SUMI
847b2703bc Remove concrete VRM shader's info from UniGLTF. 2022-12-05 17:03:48 +09:00
ousttrue
92caf36471 UniVRM-0.108.0 2022-12-05 16:45:35 +09:00
Masataka SUMI
2f915b4777 Take off responsibility of determining shaders from ImporterContext. 2022-12-05 16:30:43 +09:00
Isamu Mogi
b2b11dc6f3 Use new ArraySegment<byte>(Array.Empty<byte>()) instead of default(ArraySegment<byte>)
`default(ArraySegment<byte>).ToArray()` throws `InvalidOperationException` since Unity 2021.
It fails `VRMTextureEnumerateTests`. Use `new ArraySegment<byte>(Array.Empty<byte>())` instead.

Confirmed to work with Unity 2020.3.34f1, 2021.3.13f1 and 2022.1.23f1.

fixes https://github.com/vrm-c/UniVRM/issues/1934
2022-11-30 02:47:21 +09:00
ousttrue
3b9827c9a1
Merge pull request #1925 from saturday06/remove-detectinvalidcharacters-test
Windows以外でDetectInvalidCharactersテストが失敗する。テスト対象メソッドがもう使われていないのでテスト自体を削除
2022-11-22 15:03:48 +09:00
Masataka SUMI
ecebd7b715 Add baseColorFactor migration of older vrm file 2022-11-16 18:32:51 +09:00
Isamu Mogi
d1cd273aa8 Windows以外でDetectInvalidCharactersテストが失敗する。テスト対象メソッドがもう使われていないのでテスト自体を削除
macOS上のUnity 2020.3.34f1でDetectInvalidCharactersテストが失敗していました。テスト対象メソッドの
Path.GetInvalidFileNameCharsの実装をUnityのレポジトリで確認したところ
https://github.com/Unity-Technologies/mono/blob/2020.3.34f1/mcs/class/corlib/System.IO/Path.cs#L560-L571
Windows以外の環境では、必ずテストに失敗することがわかりました。

調査したところ、Path.GetInvalidFileNameChars自体がUniVRMとそのサブモジュールですでに使われていないことが判明したため
テスト自体が不要になったと考え、削除しました。
2022-11-15 18:19:11 +09:00
Masataka SUMI
77e87eba38 rename vrm material importer class names 2022-11-10 21:38:36 +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
ousttrue
d25f6d3f24 UniVRM-0.107.0 2022-11-09 16:27:28 +09:00
ousttrue
1345972859
Merge pull request #1905 from mkc1370/feature/support_packages_directory
UnityPathでパッケージ管理下のファイルを扱えるように
2022-11-09 13:27:07 +09:00
Masataka SUMI
521f0e9871 Merge branch 'master' of https://github.com/vrm-c/UniVRM into fixEmissionColorSpace 2022-11-07 14:14:33 +09:00
Masataka SUMI
6503493438 Migrate materials when importing a VRM 0.x model. 2022-11-04 23:39:57 +09:00
Masataka SUMI
d0d845ab2a Remove supporting legacy vrm shaders. 2022-11-04 21:48:54 +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
1ff83272de format directory structure about VRM material IO 2022-11-04 15:45:05 +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
mkc1370
5043781ebf Added support for paths within editable Packages to UnityPath 2022-11-03 20:20:46 +09:00
Masataka SUMI
7a0745b5cd Remove Obsolete method 2022-11-03 17:33:16 +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
c9bd20d4d1 UniVRM-0.106.0
Samples~へのコピー発生
2022-10-26 21:38:27 +09:00
ousttrue
1dc3f21572
Merge pull request #1886 from ousttrue/feature/spring_manual_update
[1.0][0.x] SpringBone の手動更新
2022-10-26 17:16:23 +09:00
ousttrue
f4115cacd2
Merge pull request #1883 from ousttrue/fix/export_no_active
Fix/export no active
2022-10-25 19:38:37 +09:00
ousttrue
383ac4f7b4
Merge pull request #1876 from ousttrue/feature10/springbone_picker
[1.0] SpringBone の 設定 UI
2022-10-25 16:33:10 +09:00
ousttrue
a334a78f21 deltaTime 2022-10-25 16:17:20 +09:00
ousttrue
2b8ee17c4e add SpringBoneUpdateType.Manual 2022-10-24 18:11:06 +09:00
ousttrue
9ab1d15084 Add spring ref to validation 2022-10-24 17:38:59 +09:00
ousttrue
866e75243e get non active 2022-10-24 17:36:56 +09:00
ousttrue
028cd81c19 未使用削除 2022-10-21 18:57:34 +09:00
ousttrue
c6dcbc9cf4 add MigrateExporter 2022-10-20 13:59:29 +09:00
ousttrue
314fb6d901 UniGLTF_Samples 漏れ 2022-10-07 16:35:15 +09:00
ousttrue
38ef11367b
Merge pull request #1844 from mkc1370/feature/resize_to_reinitialize
Rename Texture2D.Resize to Reinitialize
2022-10-07 13:05:07 +09:00
ousttrue
4ca7df4d1c UniVRM-0.105.0.
サンプルの更新があるので差分多めです。XXX_Samples から XXX/Samples~ へのコピーが version 更新のついでに動作します。
2022-10-06 21:31:48 +09:00
mkc1370
d6472418c9 rename Texture2D.Resize to Reinitialize 2022-10-05 19:45:40 +09:00
ousttrue
85f4e22a98 typo 2022-10-04 17:55:49 +09:00
ousttrue
6e36862b1c Assets/UniGLTF/Samples~ を追加 2022-10-04 15:07:58 +09:00
ousttrue
b0e20b95e4 Revert "typo rename UnityObjectDestoyer to UnityObjectDestroyer"
This reverts commit a8d5704a0f.
2022-10-03 18:09:05 +09:00
ousttrue
a8d5704a0f typo rename UnityObjectDestoyer to UnityObjectDestroyer 2022-10-03 17:56:36 +09:00
ousttrue
7dd809fe23 UniVRM-0.104.2 2022-09-28 17:49:01 +09:00
ousttrue
e563a33d54 sample 更新あり 2022-09-26 18:09:53 +09:00
ousttrue
1d22f42e90
Merge pull request #1795 from matsutaka-pxv/add-awaitcaller-to-loadblendshapemaster
Add IAwaitCaller to VRMImporterContext.LoadBlendShapeMaster
2022-09-21 16:23:54 +09:00
ousttrue
864607023a UniVRM-0.104.0 2022-09-21 15:38:20 +09:00
Takayuki Matsuoka
fe0c3d756d 不要なコード整形を修正
See also:
https://github.com/vrm-c/UniVRM/pull/1795#discussion_r974879279
2022-09-20 23:25:20 +09:00
Takayuki Matsuoka
0029c1cd5f LoadBlendShapeBindの引数順を変更
IAwaitCallerを最後の引数にするように変更

See also :
https://github.com/vrm-c/UniVRM/pull/1795#discussion_r974879093
2022-09-20 23:24:09 +09:00
ousttrue
184d0bdc74
Merge pull request #1796 from matsutaka-pxv/add-iawaitcaller-to-loadfirstperson
Add IAwaitCaller to VRMImporterContext.LoadFirstPerson
2022-09-20 15:20:33 +09:00
ousttrue
e34e06f98a UniVRM-0.103.2 2022-09-15 13:02:58 +09:00
Takayuki Matsuoka
799857bb8b Add IAwaitCaller to VRMImporterContext.LoadFirstPerson
Since we still don't have explicit rule/method to add NextFrameIfTimedOut, this change may seem random.

But we've conducted some benchmarks and profiled them before add these await-s.  These changes ease CPU spikes.
2022-09-14 13:11:23 +09:00
Takayuki Matsuoka
64286d8400 Add IAwaitCaller to VRMImporterContext.LoadBlendShapeMaster
Since VRMImporterContext.LoadBlendShapeMaster may take long time to complete,
change it to async Task method and pass IAwaitCaller as an argument.

This changeset also changes VRMImporterContext.LoadBlendShapeBind.
Because this method has long LINQ chain and we need to split it to ease
its CPU time spike.
2022-09-14 11:09:37 +09:00
ousttrue
7d6f835ffe UniVRM-0.103.1 2022-09-13 14:39:40 +09:00
ousttrue
b3a0cb3336
Merge pull request #1773 from ousttrue/version/v0_103_0
UniVRM-0.103.0
2022-09-08 18:07:01 +09:00
Masataka SUMI
0dfa783406 mv CachedEnum namespace to UniGLTF.Utils 2022-09-07 15:59:35 +09:00
Masataka SUMI
b986130817 Create an asmdef named UniGLTF.Utils 2022-09-07 15:53:59 +09:00
Masataka SUMI
29163a43b1 Use CachedEnum 2022-09-07 15:38:02 +09:00
Masataka SUMI
996bc91c93 Rename CacheEnum to CachedEnum 2022-09-07 15:04:23 +09:00
ousttrue
32f03781e4 UniVRM-0.103.0 2022-09-07 14:33:52 +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
4e6f66e5d9
Merge pull request #1756 from vrm-c/webgl_build
WebGLの動作確認
2022-08-30 20:00:01 +09:00
ousttrue
2efcf65e60 LoadBytesAsync 2022-08-22 13:00:05 +09:00
ousttrue
c9864efbf9
Merge pull request #1761 from mkc1370/fix/package_dependencies
Unity公式モジュールの依存関係が不足している問題を修正
2022-08-08 14:13:34 +09:00
ousttrue
f2d587e09f glTFTexture.source type to int? 2022-08-05 21:13:32 +09:00
mkc1370
8ac0bf8c4b Add Unity official package dependencies to VRMVersionMenu 2022-08-02 18:12:01 +09:00
mkc1370
24a32d3397 Add unity official module dependencies 2022-08-02 12:38:25 +09:00
mkc1370
8df51422ef add null check 2022-07-29 20:16:17 +09:00
mkc1370
f1de67b339 Revert "fixed BlendShapeAvatar.Clips not to contain null"
This reverts commit ef06850e17.
2022-07-29 18:23:03 +09:00
mkc1370
10256bd76e Revert "change RemoveNullClip to private"
This reverts commit 5522fa56f8.
2022-07-29 18:22:34 +09:00
mkc1370
5522fa56f8 change RemoveNullClip to private 2022-07-29 10:08:10 +09:00
mkc1370
ef06850e17 fixed BlendShapeAvatar.Clips not to contain null 2022-07-29 10:06:24 +09:00
ousttrue
1ca7a8684d WebGLの動作確認用 2022-07-26 14:30:51 +09:00
ousttrue
f3487badb7 UniVRM-0.102.1 2022-07-21 17:12:09 +09:00
ousttrue
bbf6ef2616
Merge pull request #1743 from ousttrue/version/v0_102_0
UniVRM-0.102.0
2022-07-19 18:22:09 +09:00
ousttrue
3c3587a5f9 UniVRM-0.102.0 2022-07-14 15:56:53 +09:00
ousttrue
ba83d65018 null check 2022-07-14 15:53:14 +09:00
ousttrue
3898b0a223 ありえる 2022-07-14 15:50:15 +09:00
ousttrue
92226ff8f8 remove unused UniJSON. JsonPointer 2022-07-07 15:10:31 +09:00
ousttrue
6aa92e8898 UniVRM-0.101.0 2022-06-29 13:17:13 +09:00
ousttrue
efdbef51d7
Merge pull request #1720 from ousttrue/feature/VRMBlendShapeProxy.Clear
runtime に BlendShapeProxy.m_merger を再初期化する
2022-06-29 13:10:44 +09:00
ousttrue
2f51b74274 Reinitialize 2022-06-29 13:07:58 +09:00
ousttrue
24acebd114 file extension of AnimationClip is ".anim" 2022-06-28 17:07:48 +09:00
ousttrue
06814c1a75 変更を破棄。改めて Restart メソッドを作成。 2022-06-28 17:02:18 +09:00
ousttrue
c2888f2521 runtime に BlendShapeProxy.m_merger を再初期化する 2022-06-28 14:29:36 +09:00
ousttrue
eca75c54a4 ImporterContext.LoadAnimation 2022-06-27 20:39:11 +09:00
ousttrue
2d1211e94b write AnimationClip in VRM editor load 2022-06-27 20:28:10 +09:00
ousttrue
933466169f VRMExportSettings.KeepAnimation 2022-06-27 19:20:40 +09:00