Commit Graph

3311 Commits

Author SHA1 Message Date
ousttrue
3187078011 private 2023-02-09 19:01:50 +09:00
ousttrue
7572ce5ded Func<(Texture2D, bool IsDisposable)> 2023-02-09 19:01:29 +09:00
ousttrue
2c4d344902 remove unused tests 2023-01-26 21:54:17 +09:00
ousttrue
d8456e0480 PlayMode テストの修正 2023-01-26 16:25:58 +09:00
ousttrue
04f409aa1f (Texture2D Texture, bool IsDisposable) 2023-01-26 15:24:25 +09:00
ousttrue
6d42ba01e3 remove IDisposableResourceList
* UnityEngine.Object => UnityEngine.Texture2D
2023-01-26 15:18:07 +09:00
ousttrue
b1825e8968 IDisposableResourceList
Dispose a texture if `TextureConverter.CopyTexture` is used.
2023-01-25 18:45:20 +09:00
ousttrue
a79e6b4a5b ITextureExporter inherit IDisposable
update ITextureExporter interface
2023-01-25 18:23:55 +09:00
ousttrue
51c2275f4b
Merge pull request #1976 from virtual-cast/fix-Fast-Spring-Bone-Execution-Order
Change FastSpringBoneService ExecutionOrder To 11010
2023-01-25 15:27:20 +09:00
ousttrue
0c3aa0cd9e
Merge pull request #1955 from mttbrnnr/master
Disabled renderers no longer get exported
2023-01-25 15:23:50 +09:00
ousttrue
d44fa6d308
Merge pull request #1975 from HoloLabInc/arcsin16/fix-concurrent-access-error
ランタイムロードの非同期アクセスで例外が発生する問題の修正
2023-01-25 15:20:24 +09:00
T-Kuhn
b8445abf1f Changed FastSpringBoneService ExecutionOrder to make sure FastSpringBoneService executes after Vrm10Instance 2023-01-25 12:56:15 +09:00
danno
65e3c3e41a Fixed concurrent access error at glTFExtensions::IsGeneratedUniGLTFAndOlder. 2023-01-23 18:11:06 +09:00
Masataka SUMI
ac97d693ad Add defines of VRM-1.0 humanoid bone specification 2023-01-18 20:12:30 +09:00
amamagi
e663091fee feat: Add ITextureDeserializer parameter to Vrm10.LoadXXXAsync() and VrmUtility.LoadXXXAsync() 2023-01-11 11:43:58 +09:00
ousttrue
983a66471b
Merge pull request #1957 from ousttrue/feature10/openxr_fb_body_tracking
Feature10/openxr fb body tracking
2022-12-13 12:48:13 +09:00
ousttrue
3e5535cb72 fix hand rotation 2022-12-09 21:37:55 +09:00
ousttrue
30a2262104 Add XR_FB_body_tracking rig. 2022-12-09 21:20:58 +09:00
0b5vr
e8942a4f42 fix: Add [CanEditMultipleObjects] to VRM10SpringBoneJointEditor
Addressing https://github.com/vrm-c/UniVRM/pull/1952#discussion_r1044140952
2022-12-09 16:05:39 +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
0b5vr
3f9071f679 feature (VRM1, SpringBone): add limit break slider to spring bone joint properties 2022-12-08 20:27:57 +09:00
Matthias Brenner
2ba96d4a29 Disabled renderers no longer get exported 2022-12-07 19:00:20 +01: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
ousttrue
3b73ba2e9b Implement interleaved vertex layout with byteStride 2022-12-05 20:06:49 +09:00
ousttrue
fcb4f1841f
Merge pull request #1945 from Santarh/shaderInsteadOfString2
Specify a Shader instead of a string in MaterialDescriptor.
2022-12-05 18:02:21 +09:00
ousttrue
421cd6bf5b fix test
#1941
2022-12-05 17:23:16 +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
Masataka SUMI
aed1d170d4 make MaterialDescriptor class 2022-12-05 16:05:20 +09:00
ousttrue
44b2e0330d FastStartsWith 2022-12-05 15:43:34 +09:00
ousttrue
8ab3bc28dd comment 2022-12-05 15:15:00 +09:00
ousttrue
7ebea43654 前の挙動 2022-12-05 15:11:36 +09:00
ousttrue
431fe58f80 IsUnderWritableFolder を以前の IsUnderAssetsFolder の挙動に戻す
* "Assets" => true
2022-12-05 15:11:18 +09:00
ousttrue
d28688e9b8 fix typo. pp 2022-12-05 14:53:43 +09:00
ousttrue
1add059e82 テスト時の Asset 生成を回避
* あとで。ゴミ掃除問題
2022-12-05 14:52:55 +09:00
ousttrue
97def6a8c5 fix EnsureFolder
"Assets" に対して EnsureFolder すると例外
2022-12-05 14:48:40 +09:00
ousttrue
e390f2ea39 add test 2022-12-05 14:47:48 +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
675060175b 修正漏れ 2022-11-29 20:16:54 +09:00
ousttrue
432dfb60f0 fix comment 2022-11-29 19:17:55 +09:00
ousttrue
d72f004cd4 fix NormalizedLocalRotation logic 2022-11-29 18:54:08 +09:00
ousttrue
7f275062ab 親指の左右が逆 2022-11-29 18:52:05 +09:00
ousttrue
5353ef14ef 小文字 2022-11-28 17:20:40 +09:00
ousttrue
dd646cabb0 private readonly 2022-11-28 17:08:37 +09:00
ousttrue
b24f06e106 comment 2022-11-28 17:07:16 +09:00
ousttrue
02ea223822 controlRigInitialRotations = null
* 順番
* null 引き数の省略
2022-11-28 17:06:31 +09:00
ousttrue
60ecc165c8 internal 2022-11-28 17:03:45 +09:00
ousttrue
7af375cf34 Vrm10Importer の引き数を整理
* controlRigGenerationOption を削除
* controlRigInitialRotations に一本化
* IReadOnlyDictionary<HumanBodyBones, Quaternion> を使う
* XR_EXT_hand_tracking の親指のロールを修正
2022-11-28 15:44:25 +09:00
ousttrue
18c4b2c904 NormalizedLocalRotation 2022-11-27 23:07:08 +09:00
ousttrue
a0d4621547 WIP OpenXRHandTracking 2022-11-25 22:22:12 +09:00
ousttrue
4a4dbb447a initialRotations 2022-11-25 20:29:02 +09:00
ousttrue
3b9827c9a1
Merge pull request #1925 from saturday06/remove-detectinvalidcharacters-test
Windows以外でDetectInvalidCharactersテストが失敗する。テスト対象メソッドがもう使われていないのでテスト自体を削除
2022-11-22 15:03:48 +09:00
ousttrue
bbfe94eae4
Merge pull request #1924 from saturday06/non-windows-build
Fix the compilation error on a non-windows environment
2022-11-22 15:00:17 +09:00
T-Kuhn
89e610afab async suffix 2022-11-21 19:09:03 +09:00
T-Kuhn
dbff886b9b refactor 2022-11-21 17:14:58 +09:00
T-Kuhn
66716a84b0 added frame dispersion to animationImporterUtil 2022-11-21 16:59:20 +09:00
Masataka SUMI
7cdd1306a4 rename 2022-11-16 18:33:10 +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
Isamu Mogi
7e3f17fe1d Fix the compilation error on a non-windows environment
Fixed the following compilation error:

```
Assets/UniGLTF_Samples/GltfViewer/OpenFileDialog/OpenFileDialog.cs(10,13): error CS0103: The name 'Debug' does not exist in the current context
```
2022-11-15 17:35:08 +09:00
Masataka SUMI
62085d255a rename vrm10 material importer class names 2022-11-10 21:41:01 +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
Masataka SUMI
848dfe4597 import emissiveFactor correct in urp lit 2022-11-10 20:24:15 +09:00
Masataka SUMI
ec5b5cea03 mv 2022-11-10 20:12:32 +09:00
ousttrue
a278ea882f UnityPath.FromUnityPath
* "" => Application.dataPath / ..
* "." => Application.dataPath / ..
* null => invalid
2022-11-09 17:39:32 +09:00
ousttrue
82574f5024 UnityPath のテスト追加 2022-11-09 17:36:40 +09:00
ousttrue
d25f6d3f24 UniVRM-0.107.0 2022-11-09 16:27:28 +09:00
ousttrue
870318b2ce
Merge pull request #1915 from ousttrue/fix/VRM10Viewer_commandline
コマンドライン引き数のエラーを防止
2022-11-09 15:48:44 +09:00
ousttrue
f0d6af93c5 hide box man 2022-11-09 15:08:23 +09:00
ousttrue
8c078c82ae コマンドライン引き数のエラーを防止 2022-11-09 14:38:22 +09:00
ousttrue
59a2d74ffd VRM-1.0 向けの ReduceBlendshape と ReduceBlendshapeClip の実装は v0.108 以降でやります。 2022-11-09 14:21:15 +09:00
ousttrue
7c9fb5ea1d add sparse check box 2022-11-09 14:10:42 +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
00d7f8e27b fix 2022-11-08 13:25:44 +09:00
Masataka SUMI
763d0b516b fix tests 2022-11-07 21:30:00 +09:00
Masataka SUMI
ac880243d3 convert gamma to linear before division. 2022-11-07 21:00:01 +09:00
Masataka SUMI
f63d03475a comment 2022-11-07 20:31:43 +09:00
Masataka SUMI
61041a5b7d Add test 2022-11-07 19:23:09 +09:00
Masataka SUMI
2eefacbde3 satisfy emissiveFactor spec 2022-11-07 19:21:47 +09:00
Masataka SUMI
5b95b6e1ae comment 2022-11-07 18:16:40 +09:00
Masataka SUMI
3ae3c2aef5 Support in vrm 1.0 migration. 2022-11-07 18:14:06 +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
a22c212a85
Merge pull request #1908 from Santarh/removeOlderShaderExporter
Stop supporting to export legacy vrm shaders.
2022-11-07 13:57:46 +09:00
Masataka SUMI
6503493438 Migrate materials when importing a VRM 0.x model. 2022-11-04 23:39:57 +09:00
Masataka SUMI
8521e98817 Convert emissiveFactor's color space into gamma with Built-in RP Standard shader. 2022-11-04 22:52:34 +09:00
Masataka SUMI
d0d845ab2a Remove supporting legacy vrm shaders. 2022-11-04 21:48:54 +09:00
Masataka SUMI
da66cf768f Set externalData as initial value. 2022-11-04 21:38:58 +09:00
Masataka SUMI
36e9ca8605 fix directory name cases 2022-11-04 16:28:04 +09:00
Masataka SUMI
b6744a653a Implements fallbacked behaviour. 2022-11-04 16:20:55 +09:00
Masataka SUMI
04c14a2b86 Stop inheritance 2022-11-04 16:12:22 +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
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
ousttrue
bc2131a3f1
Merge pull request #1903 from Santarh/thumbFIx
Consider thumbnail image's mimeType when loading the VRM 1.0 model.
2022-11-04 14:00:47 +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
fd293b5f4c fix 2022-11-03 18:34:13 +09:00
Masataka SUMI
29c4686af4 Suppress warning logs when loading vrm10 models. 2022-11-03 18:30:09 +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
5dbb9c25ab meta update 2022-11-03 17:44:28 +09:00
Masataka SUMI
0255f17ca5 Remove warning code & suppress file size in Resources 2022-11-03 17:40:58 +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
9f8459653d follow 2022-11-03 02:02:08 +09:00
Masataka SUMI
8af4eaecf5 Refactoring Material Exporters 2022-11-03 02:01:47 +09:00
Masataka SUMI
18b9b1a285 mv Built-in RP's Importer code. 2022-11-02 23:56:38 +09:00
Masataka SUMI
4bb04ff317 Update MToon to v3.9 2022-11-02 18:13:22 +09:00
notargs
359a308e09 Merge remote-tracking branch 'upstream/master' into fix_rimlight_nan 2022-11-02 17:32:34 +09:00
notargs
6b02280c19 RimLightの計算時にNaNが紛れ込む問題を修正 2022-11-02 17:32:17 +09:00
ousttrue
21425fd5cf ビルドエラーを修正 2022-10-27 15:39:34 +09:00
ousttrue
04622046b9
Merge pull request #1892 from ousttrue/fix10/ShaderVariants
ShaderVariant
2022-10-27 15:18:47 +09:00
ousttrue
79dd54ef8f ShaderVariant 2022-10-27 15:10:47 +09:00
ousttrue
f7696a3fd5
Merge pull request #1887 from mkc1370/feature/preview_unsupported_shader
サポートされていないシェーダーが含まれるモデルのプレビューをできるように
2022-10-27 14:07:24 +09:00
ousttrue
c9bd20d4d1 UniVRM-0.106.0
Samples~へのコピー発生
2022-10-26 21:38:27 +09:00
mkc1370
84b7e0e953 Show error in PreviewGUI 2022-10-26 20:55:28 +09:00
mkc1370
6d0aa9ee9f To be able to display errors as much as possible 2022-10-26 20:53:31 +09:00
0b5vr
76ebf0ef73
fix: Fix outdated exception message
`UpdateTypes` は `LateUpdate` か `Manual` しかなく、 `None` はこれは `Manual` の変更忘れでしょうか?
2022-10-26 18:48:02 +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
mkc1370
949265226f Make unsupported shaders visible 2022-10-26 15:56:36 +09:00
ousttrue
917f4e953e prefab は GameObject から得る 2022-10-26 14:27:41 +09:00
ousttrue
43f78eac12 add prefab assignment when asset created 2022-10-26 14:27:41 +09:00
ousttrue
b18e5cd63b VRM10Object を作成するステップ
* VRM10Object が無いときにエラー表示
* VRM10Object が無ければ VRM10Instance を停止させる
2022-10-26 14:27:36 +09:00
ousttrue
f33b8dbb46 ヒューマノイドボーン割り当て補助
1番目の子孫GameObjectがヒューマノイドの子孫であると見做して自動代入(指とか、足など枝分かれしないところの簡易な補助)
2022-10-26 14:24:39 +09:00
ousttrue
b1a545f987 元のスタイルに戻し 2022-10-26 13:31:19 +09:00
ousttrue
f17bac5b03 FastSpringBoneService.ManualUpdate に deltaTime 引き数を追加 2022-10-25 21:52:19 +09:00
ousttrue
11b6689c01 local 変数の使いまわしやめ 2022-10-25 21:50:59 +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
e6f0369eda UnityEngine.Object?. 2022-10-25 16:30:17 +09:00
ousttrue
a334a78f21 deltaTime 2022-10-25 16:17:20 +09:00
ousttrue
5d43f4b79e
Merge pull request #1878 from ousttrue/feature10/migrate_mod
modGltf 引き数を追加
2022-10-25 15:26:56 +09:00
ousttrue
8644aabd1e
Merge pull request #1884 from ousttrue/fix/may_fixed_1866
remove ThisType? field.
2022-10-25 13:05:14 +09:00
ousttrue
5c2d685a32
Merge pull request #1882 from ousttrue/fix/osx_multi_extensions
Fix/osx multi extensions
2022-10-24 21:27:54 +09:00
ousttrue
e1e4bfde78 FastSpringBoneService manual update 2022-10-24 19:12:52 +09:00
0b5vr
7a93206a94 feature: 親指の向き・爪の向きのギズモを更新
ousttrueさんによる元コミット: b2c3d14942
2022-10-24 18:24:54 +09:00
ousttrue
2b8ee17c4e add SpringBoneUpdateType.Manual 2022-10-24 18:11:06 +09:00
ousttrue
05a7cda9e1 remove ThisType? field. #1866 2022-10-24 17:56:22 +09:00
ousttrue
9ab1d15084 Add spring ref to validation 2022-10-24 17:38:59 +09:00