Commit Graph

3383 Commits

Author SHA1 Message Date
Masataka SUMI
451bee1b88 Fix shadow behaviour of MToon 1.0 when Single-Pass Stereo Rendering is enabled. 2023-04-11 01:42:40 +09:00
ousttrue
1913bd4932
Merge pull request #2036 from ousttrue/fix/force_unique_name
AvatarBuilder.BuildHumanAvatar
2023-04-10 16:55:02 +09:00
ousttrue
cc34d52846 LogWarning 2023-04-10 13:33:42 +09:00
ousttrue
51f3c1919b AvatarBuilder.BuildHumanAvatar の呼び出しがもう一か所あった。 2023-04-10 13:20:05 +09:00
Hans
17b095858d
Add missing menu register 2023-04-09 15:10:11 +08:00
ousttrue
c6d226304c 仕様に準じて、参照ノードの position.x を expression weight に適用しています。
humanoid が null で expression のみを格納したとき向けの nullcheck を追加。
2023-04-07 16:16:19 +09:00
ousttrue
af0a93853c implement vertex color of UShort3/4 and Byte3/4 2023-04-07 13:05:27 +09:00
notargs
d6b3ae8343 MSAAを適用 2023-03-22 19:38:57 +09:00
notargs
b557f69ece 以前読み込んだVRMを破棄する機構を追加 2023-03-22 19:33:50 +09:00
notargs
b4aea8b2c9 URPSampleを追加 2023-03-22 19:22:27 +09:00
notargs
027ef289be Settingsディレクトリへ移動 2023-03-22 13:53:09 +09:00
notargs
b84771364a URPSampleディレクトリを作成 2023-03-22 13:17:02 +09:00
notargs
19515bae8a URPAssetを追加 2023-03-22 13:04:25 +09: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
2ba557cfe5
Merge pull request #2014 from ousttrue/fix/simple_viewer
[sample] SimpleViewer を修復(BvhImporterContext の挙動変更に追随)
2023-03-13 15:51:37 +09:00
ousttrue
a37ae733f6 AddComponent HumanPoseTransfer 2023-03-13 15:39:59 +09:00
ousttrue
1bdf003ee1 BvhImporterContext did not create BoxMan and HumanPoseTransfer 2023-03-13 15:33:23 +09:00
ousttrue
4bfd536e0e UniVRM-0.109.0 2023-03-10 13:58:43 +09:00
ousttrue
10aead0b01
Merge pull request #2012 from ousttrue/fix/unknown_renderer_to_warning
to warning
2023-03-10 13:02:52 +09:00
ousttrue
f7718b514b context 2023-03-09 20:11:04 +09:00
ousttrue
222c735fad to warning 2023-03-09 19:53:35 +09:00
ousttrue
4b1991de7d vrm-1.0 runtime export sample 2023-03-09 19:20:32 +09:00
ousttrue
db152888d3
Merge pull request #2009 from ousttrue/fix10/meta_array_field_name
ArrayProperty name `Element 0` to `{Array.Name}[0]`
2023-03-08 18:31:06 +09:00
ousttrue
70f8afdd89 ArrayProperty name Element 0 to {Array.Name}[0] 2023-03-08 18:15:38 +09:00
ousttrue
b98ceda13d fix copyright 2023-03-07 19:50:25 +09:00
ousttrue
144df734f2 copyright が抜けてる 2023-03-07 19:41:48 +09:00
ousttrue
8b3b4b292e
Merge pull request #2000 from ousttrue/feature/experimental_vrm_animation
[experimental][vrm-animation] vrm animation の試験実装
2023-03-06 18:43:59 +09:00
ousttrue
ced136d1d8 ForceUniqueName を ToHumanDescription の外に追い出し。 2023-03-06 18:36:09 +09:00
ousttrue
c28bdcd212 revert 2023-03-06 18:30:04 +09:00
Masataka SUMI
358fd8b939 Fix for failed tests. 2023-03-06 17:53:07 +09:00
ousttrue
b108199bf3 UniqueName to GlbLowLevelParser 2023-03-06 17:52:16 +09:00
notargs
5f2d94e1fe rename VRN10/Tests/Resources -> TestAssets 2023-03-06 17:30:30 +09:00
ousttrue
82ef3edd71 UniqueName 2023-03-03 13:20:02 +09:00
ousttrue
3160585713 box man bindposes 2023-03-03 13:03:04 +09:00
ousttrue
4144b91b10 new box man 2023-03-02 22:43:46 +09:00
ousttrue
655adf3c8d vrm spec 更新。InitRotationPoseProvider 修正。ENDSITE 対策 2023-03-02 19:54:37 +09:00
ousttrue
29e885c0d7 生成コード UniGLTF.Extensions.VRMC_vrm_animation.GltfDeserializer.Deserialize 動いた 2023-02-28 19:21:56 +09:00
ousttrue
061c7e9acc generate 2023-02-28 17:29:21 +09:00
ousttrue
4f6ff8f798 明示的なインターフェイスの実装 2023-02-27 19:18:51 +09:00
ousttrue
18660498a5 mv EuclideanTransform to UniGLTF.Utils 2023-02-27 18:59:27 +09:00
ousttrue
ef80237782 ITPoseProvider を縮小。EuclideanTransform 導入 2023-02-27 18:51:09 +09:00
ousttrue
a182f8416e
Merge pull request #1992 from ousttrue/feature/vrm10viewer_use_controlrig
[sample] VRM10Retarget の実装
2023-02-27 17:39:05 +09:00
ousttrue
d329e3cb89 ITPoseProvider を修正
* bone, parent
* Quaternion?, Vector3? にして throw しない
* Vrm10RuntimeControlRig のインターフェース実装でない property を削り
2023-02-27 15:33:51 +09:00
ousttrue
1bd8cc4e63 Bvh.cs を分割 2023-02-22 21:08:26 +09:00
ousttrue
dbe33c3c1e 次の修正で使う。いったん削除 2023-02-21 17:35:38 +09:00
ousttrue
2e29b7da65 VRM10Retarget 実装実験から ITPoseProvider, INormalizedPoseProvider, INormalizedPoseApplicable を整理 2023-02-21 17:29:18 +09:00
ousttrue
a310e2dcf5 rename NormalizedPoseProvider to AnimatorPoseProvider. fix Bvh height 2023-02-21 17:21:50 +09:00
ousttrue
0502f30588 use VRM10Retarget.Retarget 2023-02-21 15:43:15 +09:00
ousttrue
be4c7e3968
Merge pull request #1991 from 0b5vr/vrm-postprocess
fix: Fix vrmAssetPostprocessor
2023-02-21 13:39:44 +09:00
ousttrue
437dc1b1b3 mv 2023-02-20 19:21:36 +09:00
ousttrue
4629a8b586 mv to Assets/VRM10/Runtime/Components/Vrm10RuntimeControlRig 2023-02-20 19:20:20 +09:00
ousttrue
33725cbab5 3 interfaces. ITPoseProvider, INormalizedPoseProvider and INormalizedPoseApplicable 2023-02-20 19:06:13 +09:00
ousttrue
360aa6fcf0 元の場所に 2023-02-20 18:20:04 +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
ousttrue
6dd2bb38cc IControlRigGetter と IControlRigSetter を追加
add ControlRigRetarget
impl InitialRotationRigGetter.cs
impl NormalizedRotationRigGetter.cs
mv Assets/Vrm10/Runtime/ControlRig/Vrm10ControlBone.cs => Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10ControlBone.cs
mv Assets/VRM10/Runtime/ControlRig/InitialRotations/ControlRigGenerationOption.cs => Assets/VRM10/Runtime/Components/Vrm10Runtime/ControlRigGenerationOption.cs
rename Vrm10BoneInitialRotation => BoneInitialRotation
remove Vrm0XCompatibleRig.cs
2023-02-20 15:49:50 +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
ousttrue
8e5a99eb7f mv Assets/VRM10/Runtime/Components/Vrm10Runtime/ControlRig to Assets/VRM10/Runtime/ControlRig 2023-02-20 13:02:53 +09:00
ousttrue
53b733ed88
Merge pull request #1985 from ousttrue/fix_vrm10viewer_bvh_load
sampler の bvh load の修正
2023-02-20 12:54:20 +09:00
Masataka SUMI
e7b5d23690 Add a LookAtOrigin transform to ControlRig. 2023-02-17 17:43:20 +09:00
ousttrue
9659354e9f API変更時の修正ミス 2023-02-15 17:01:40 +09:00
Masataka SUMI
95ef1b839f rename and add comment 2023-02-15 00:07:05 +09:00
Masataka SUMI
02aae32acb rename 2023-02-14 23:34:22 +09:00
Masataka SUMI
b25e58c3ff reorder 2023-02-14 23:05:12 +09:00
Masataka SUMI
b376a94d75 rename gaze to LookAt 2023-02-14 22:56:16 +09:00
Masataka SUMI
dbfd5212c7 make CalculateYawPitchFromGazePosition public 2023-02-14 22:14:48 +09:00
Masataka SUMI
a344a8d12b Refactoring about Vrm10 LookAtRuntime 2023-02-14 22:08:18 +09:00
ousttrue
563c6333c1 コード生成の更新。beta が取れた 2023-02-14 17:56:56 +09:00
ousttrue
0ac90179c5 コード生成フォルダから退避 2023-02-14 17:55:01 +09:00
ousttrue
d86730cd8b
Merge pull request #1978 from ousttrue/fix_exporter_texture_leak
Fix exporter texture leak
2023-02-09 19:04:34 +09:00
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