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
5,486 Commits 3 Branches 219 Tags 124 MiB
0f9be690a5
Commit Graph

380 Commits

Author SHA1 Message Date
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
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
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
Masataka SUMI
e7b5d23690 Add a LookAtOrigin transform to ControlRig. 2023-02-17 17:43:20 +09:00
Masataka SUMI
95ef1b839f rename and add comment 2023-02-15 00:07:05 +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
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
3f9071f679 feature (VRM1, SpringBone): add limit break slider to spring bone joint properties 2022-12-08 20:27:57 +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
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
Masataka SUMI
f8ac8075e7 use static getter instead of preprocessors. 2022-11-03 20:58:14 +09:00
ousttrue
f7696a3fd5
Merge pull request #1887 from mkc1370/feature/preview_unsupported_shader 
サポートされていないシェーダーが含まれるモデルのプレビューをできるように
 2022-10-27 14:07:24 +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
mkc1370
949265226f Make unsupported shaders visible 2022-10-26 15:56:36 +09:00
ousttrue
b18e5cd63b VRM10Object を作成するステップ 
* VRM10Object が無いときにエラー表示
* VRM10Object が無ければ VRM10Instance を停止させる
 2022-10-26 14:27:36 +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
0b2e9b7707 gizmo 色変更 
* Joint => wires yellow(0.xと同じ)
* collider sphere => magenta(0.xと同じ)
* collider capsule => orange 赤系
 2022-10-24 15:24:01 +09:00
ousttrue
b2c3d14942 親指のガイド表示 2022-10-20 16:58:43 +09:00
ousttrue
d2b4ad1964
Merge pull request #1868 from notargs/external_force 
SpringBoneに対して外力を渡すインターフェースを実装する
 2022-10-20 15:57:07 +09:00
notargs
46e3ec70d5 外力をキャラクターごとに設定するように変更 2022-10-20 15:31:59 +09:00
ousttrue
0a1b55ec1e meta のバリデーション。文言 2022-10-20 15:15:00 +09:00
ousttrue
91a8ef2045 implement Joint gizmo 2022-10-06 21:09:28 +09:00
Masataka SUMI
ec627fba5e follow matcapFactor in material color binding 2022-09-21 19:17:06 +09:00
Masataka SUMI
59b88c3f6e Fix a bug of incorrect pose set when EnforceTPose called 2022-09-21 17:34:31 +09:00
Masataka SUMI
7ef5c7be54 remove unnecessary value of ControlRigGenerationOption 2022-09-21 16:22:59 +09:00
Masataka SUMI
16049b4c49 The FirstPerson method must reference the raw head bone instead of the control rig bone. 2022-09-20 13:40:52 +09:00
Masataka SUMI
be4f7847b4 Bone name must be unique in the vrm instance. 2022-09-16 18:28:45 +09:00
Masataka SUMI
902ed67335 Add ControlRigGenerationOption 2022-09-16 17:02:29 +09:00
Masataka SUMI
ae8d4db6b9 Fix bug of null access when loading vrm1.0 prefab placed in the scene. 2022-09-12 17:55:34 +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
Masataka SUMI
9c88a9761c Add generateControlRig option to VRM 1.0 Importer 2022-09-07 18:51:23 +09:00
Masataka SUMI
f06d4bdd35 Create the ControlRig at a child of the VRM instance root. 2022-09-07 16:36:29 +09:00
Masataka SUMI
0dfa783406 mv CachedEnum namespace to UniGLTF.Utils 2022-09-07 15:59:35 +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
e4041895f4 add EnforceTPose method to ControlRig 2022-09-06 21:19:27 +09:00
Masataka SUMI
3753c6cde7 make IVrm10Constraint access public 2022-09-06 20:12:10 +09:00
Masataka SUMI
1e52889cc2 make Runtime Process methods internal. 2022-09-06 20:04:16 +09:00
Masataka SUMI
4649f7aa60 Merge branch 'master' of https://github.com/vrm-c/UniVRM into controlRig2 2022-09-06 19:52:34 +09:00
ousttrue
aedfd5c850
Merge pull request #1774 from Santarh/contolRig 
Rename class names about FKRetarget into ControlRig
 2022-09-06 19:51:33 +09:00
Masataka SUMI
411db43ad7 remove unused 2022-09-06 19:43:59 +09:00
Masataka SUMI
072031973c Refactoring about RuntimeControlRig 2022-09-06 19:26:40 +09:00
Masataka SUMI
beb37abe3b Remove unused variables 2022-09-06 18:33:17 +09:00
Masataka SUMI
6f67676fe9 rename class name 2022-09-06 18:22:25 +09:00
ousttrue
e73840aec1
Merge pull request #1768 from ousttrue/feature10/fk_retarget 
Feature10/fk retarget
 2022-09-06 18:02:19 +09:00
ousttrue
98bed36d20
Merge pull request #1763 from ousttrue/fix10/aim_axis_reversex 
[1.0] AimConstraint の修正
 2022-09-05 16:20:59 +09:00
ousttrue
2eb64b5f24 FkRetarget の初期実装。vrm-1.0 で 正規化をやめるので、従来の正規化済みTPoseに対する localRotation を変換して適用する機能です 2022-08-23 15:53:21 +09:00
ousttrue
64f5a05bc3 Vrm10FkRetarget 2022-08-23 15:06:19 +09:00
ousttrue
ea9aa5afe6 world を local に修正 2022-08-05 16:07:20 +09:00
ousttrue
95dddde143 m_lookAtSpace へのアクセスを局所化。OffsetFromHead はちゃんと使っていることを確認 2022-08-05 15:59:32 +09:00
ousttrue
a3ee9b44b8 pitch の正方向を vrm-0.x と同じにする 2022-08-05 15:52:43 +09:00
ousttrue
996ff6e03b lookat bone方式の初期姿勢を実装 2022-08-02 20:14:46 +09:00
ousttrue
3ab946f8ac euler 角の正の方向。ロジックをドキュメントに合わせる。 2022-08-02 19:58:27 +09:00
ousttrue
29df3f89da aim gizmo 2022-08-01 20:38:43 +09:00
ousttrue
cc304f3b90 fix importer / exporter 2022-08-01 19:35:01 +09:00
ichi23
692ccfee49 fix procedural expression weights 2022-07-21 15:06:40 +09:00
ousttrue
9dc582150b implement PositionHandle for VRM10SpringBoneCollider 2022-07-06 17:28:29 +09:00
Masataka SUMI
289e9e90b9 Fix vrm10 springbone initializing problem. 2022-07-05 21:49:47 +09:00
ousttrue
6ba7499a2f
Merge pull request #1713 from ousttrue/fix/rename_metacarpal 
[1.0] 親指のボーン名を metacarpal, proximal, distal に変更
 2022-06-28 16:06:46 +09:00
amamagi
b8ae94ddea use cached local rotation for spring bone calculation 2022-06-27 13:26:36 +09:00
amamagi
b537a4a3ea add default transform states 2022-06-27 12:53:21 +09:00
amamagi
63eb58d6b7 Revert "Vrm10Runtime.ReconstructSpringBoneを呼んだ時点のSpringBoneの形状を維持する方向に剛性が働いてしまう問題を修正" 
This reverts commit 904b82c114.
 2022-06-27 10:43:21 +09:00
ousttrue
f19389c03a Animator じゃなくて Vrm10Instance から bone を得る 2022-06-24 18:10:42 +09:00
amamagi
904b82c114 Vrm10Runtime.ReconstructSpringBoneを呼んだ時点のSpringBoneの形状を維持する方向に剛性が働いてしまう問題を修正 2022-06-22 19:46:18 +09:00
ousttrue
e1162479e7 Awake で初期化するのが早すぎて Runtime ロードで動作しない 2022-06-17 20:25:20 +09:00
ousttrue
5758f12a88 Move Vrm10Instance.SpringBoneCenter to Vrm10InstanceSpringBone.Spring.Center. Update exporter and importer. 2022-05-30 22:15:00 +09:00
Masataka SUMI
b12b4c95ad the UV transform is needed to update _MainTex_ST only. 2022-05-18 17:38:59 +09:00
ousttrue
d02bdd3d5f
Merge pull request #1629 from notargs/feature/use_gizmo_selected 
OnDrawGizmosではなくOnDrawGizmosSelectedを利用する
 2022-04-22 19:54:07 +09:00
notargs
247b9347e9 OnDrawGizmos -> OnDrawGizmosSelected 2022-04-22 19:51:35 +09:00
0b5vr
610048cdcf change (1.0, constraint): Change max range of weights to 1.0 
現状、仕様ではweightの最大値は1.0となっているので、UI上もこれに従うのが良いと思います。
 2022-04-21 12:18:18 +09:00
ousttrue
83c16805d9 prefix VRM10 の表記ブレ 2022-04-19 14:19:45 +09:00
ousttrue
a12ce042fb IVRM10Constraint.cs abstract class to interface 2022-04-19 14:19:45 +09:00
ousttrue
d2f17b9257 仕様に準拠 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
7729a3fe2b
Merge pull request #1601 from ousttrue/fix10/Vrm10Runtime 
Fix10/vrm10 runtime
 2022-04-19 13:26:38 +09:00
ousttrue
f9fa1752eb simple 2022-04-11 17:39:20 +09:00
ousttrue
36d697fdb4 copy settings 2022-04-11 17:13:38 +09:00
ousttrue
d9280d0aa5 [ContextMenu("AddJointsToAllChild0")] 2022-04-11 17:09:43 +09:00
ousttrue
e33d5357fd Vrm10RuntimeLookAt 2022-04-11 16:16:43 +09:00
ousttrue
4483a57784 Vrm10RuntimeExpression 2022-04-11 16:03:22 +09:00
ousttrue
eb71863d6d Vrm10Instance と Vrm10Runtime で責務を整理する 
* Vrm10Instance シーンヒエラルキーでの表現
* Vrm10Runtime プレイ時のインタフェース
 2022-04-11 15:50:53 +09:00
ousttrue
faebd43771 remove awaitCaller ?? new ImmediateCaller() 
上流の awaitCaller を下流に使ってないことも修正
 2022-02-21 16:47:44 +09:00
0b5vr
c5d330626d refactor (1.0, constraint): rename AxesMaskExtensions.Freeze -> Mask 2022-02-04 18:51:47 +09:00
0b5vr
67d00a496a change (1.0, constraint): default value of axes should enable all axes 2022-02-04 13:27:21 +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
b72dce24c2
Merge pull request #1487 from ousttrue/fix10/fix_neutral 
Fix10/fix neutral
 2022-02-03 20:22:02 +09:00
ousttrue
62d217993a 同じ対象に対する設定が複数ある場合に先頭のものを採用する 2022-02-02 19:55:28 +09:00
ousttrue
945873a5b3 neutral 関連個所(シリアライズ周り)を修正 2022-02-01 14:31:51 +09:00
ousttrue
8136543161
Merge pull request #1473 from ousttrue/fix10/expression_migration_fallback 
vrm-0.x の仕様で、preset: unknown のときに name を preset として解釈するに対応
 2022-01-18 21:33:52 +09:00
ousttrue
bc7b6ffda1 Vrm10Importer で Neutral を　Custom から救出するコードを追加 2022-01-18 21:07:26 +09:00
ousttrue
8ba9fa5555 gizmo color 2022-01-12 18:12:54 +09:00
ousttrue
3ef65aab5a SpringBone gizmo 2022-01-11 14:48:41 +09:00
ousttrue
fcfe82588d constraint rotation:local to local only に縮小。 
その他のものは後に。
 2021-12-28 16:39:17 +09:00
ousttrue
5ed63e6aef warning message use MAX_WEIGHT 2021-11-24 21:56:10 +09:00
ousttrue
4533a7f0bf const 2021-11-24 21:52:47 +09:00
ousttrue
b0d8cfa567 GetBlendShapeWeight, SetBlendShapeWeight 前後で100倍する 2021-11-24 21:10:58 +09:00
ousttrue
9ce7cabc17 ScriptableObject に 100倍された値を保持するのをやめる 
* SetBlendShapeWeight 時に 100 倍する
 2021-11-24 20:17:51 +09:00
ousttrue
fee1a2c091 update meta editor 2021-11-08 20:24:46 +09:00
ousttrue
674b9fe859 MaterialUVBindings の対象をテクスチャー 2021-10-28 15:51:05 +09:00
notargs
e9e4c9d5b6 コメントを追加 2021-10-15 16:57:09 +09:00
notargs
cfd246fce2 SpringBoneの内部構造を動的に変更するための仕組みを追加 2021-10-15 16:53:38 +09:00
ousttrue
80a238c9be !isSelf かつ firstPersonOnly のときに VisibleRenderers から除去する 2021-10-08 20:09:52 +09:00
PoChang007
5f1499862d
Merge pull request #1279 from ousttrue/fix10/mv_spanlike 
[Maintenance] mv VrmLib.SpanLike to UniGLTF.SpanLike
 2021-10-06 22:49:33 +09:00
ousttrue
bfbde174c4 mv VrmLib.SpanLike to UniGLTF.SpanLike 2021-10-06 20:44:02 +09:00
ousttrue
b0a1de9f74 Avoid FastSpringBone in UnitTest 2021-10-06 19:55:19 +09:00
ousttrue
f67e0975dd
Merge pull request #1273 from notargs/feature/spring_bone_10 
Improve buffer construction performance
 2021-10-06 15:55:14 +09:00
notargs
55d8bcbd1c rm fastSpringBoneScope 2021-10-06 14:56:50 +09:00
ousttrue
191ac777fe fix name 2021-10-05 19:19:12 +09:00
notargs
46bc49a343 Remove SpringBoneLogic & Vrm10InstanceSpringBone logics 2021-10-05 18:49:08 +09:00
notargs
59b4835996 Improve FSB10 collider 2021-10-05 18:38:22 +09:00
notargs
c588d81b4d Add FastSpringBone10 core logics 2021-10-05 16:20:54 +09:00
notargs
463b0096c1 Dispose Vrm10Instance 2021-10-04 19:38:59 +09:00
notargs
6bae0f5074 Fix FastSpringBone Reconstruction algorithm 2021-10-04 18:42:53 +09:00
notargs
5939f244cf Initialize fastspringBone on initialize vrm 2021-10-01 20:48:38 +09:00
ousttrue
d50de3f44d add self flag 2021-09-29 13:10:06 +09:00
ousttrue
50ffa89156 AddRenderer in SetupRendererAsync 2021-09-28 17:03:10 +09:00
ousttrue
0934d96228 rename_VRM10Controller_to_Vrm10Instance 2021-09-28 13:27:28 +09:00
ousttrue
f3292a749d add comment for DefaultExecutionOrder 2021-09-17 17:30:30 +09:00
ousttrue
6e384cc710 DefaultExecutionOrder 2021-09-17 17:18:52 +09:00
ousttrue
e1750c2e35 meta の bool の default 値の nullcheck. AllowAntisocialOrHateUsage 2021-09-16 18:33:08 +09:00
ousttrue
4d0684b269 preview の MaterialUVBindings 動作を修正 2021-09-16 15:08:09 +09:00
ousttrue
4adf95bab6 #if UNITY_EDITOR でビルドエラーを修正 
* PreviewSceneManager　が MonoBehaviour かつ Editor 専用なのが微妙
 2021-09-10 13:04:13 +09:00
PoChang007
80a45efa6c
Merge pull request #1209 from ousttrue/feature10/expression_uv_scale_offset_update 
初期値との差分を使うようにロジックを変更
 2021-09-09 23:00:55 +09:00
ousttrue
715006abf9 static 変数の管理はやめて、定数置き場になった 2021-09-09 21:14:31 +09:00
ousttrue
4d3cdf0670 Vrm10FirstPersonLayerSettings に隔離 2021-09-09 20:32:38 +09:00
ousttrue
6ecaef0a6e 初期値との差分を使うようにロジックを変更 2021-09-09 19:46:27 +09:00
ousttrue
d61b66f9c3 RuntimeGltfInstance.AddRenderers 2021-09-09 18:03:40 +09:00
ousttrue
fbcf4279bf fix SetupAsync 2021-09-09 17:45:27 +09:00
ousttrue
41c3bd64f9 SetupAsync 2021-09-09 17:17:34 +09:00
ousttrue
6cfab948a2 SetupAsync 2021-09-09 17:17:33 +09:00
ousttrue
cbc2e68967 ContainsKey 2021-09-07 14:08:54 +09:00
ousttrue
acc88719d3 add test 2021-09-07 14:06:20 +09:00