Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-27 05:27:53 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5,401 Commits 3 Branches 219 Tags 124 MiB
ad712ce1ce
Commit Graph

374 Commits

Author SHA1 Message Date
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
ousttrue
b0de928791 UNITY_EDITOR 2021-08-17 21:02:50 +09:00
ousttrue
9592905e57 VRM10Expression.Preset と ExpressionName を廃止 
* VRM10Expression.Preset は VRM10ObjectExpression　の度のスロットにセットされているかで判定
* VRM10Expression.ExpressionName は VRM10Expression.name を使う
 2021-08-10 19:49:48 +09:00
PoChang007
8f31f32d68
Merge pull request #1136 from ousttrue/fix1/fix_firstperson_editor 
Fix1/fix firstperson editor
 2021-08-06 18:28:48 +09:00
ousttrue
081dbae6ff first person set default button 2021-08-06 17:42:20 +09:00
ousttrue
93bb449548 remove log message 2021-08-06 16:42:33 +09:00
ousttrue
fa460f0031 JsonSchema を更新してコードを再生成した 
https://github.com/vrm-c/vrm-specification/pull/296
 2021-07-02 19:57:37 +09:00
ousttrue
1e958ae408 impl custom editor 
renderer を pulldown で選択できるようになった
 2021-06-18 18:52:14 +09:00
ousttrue
4e91e16901 null check 2021-06-16 18:01:30 +09:00
ousttrue
9fa1517a57 update Expression 2021-06-16 17:40:12 +09:00
ousttrue
ca4bab658e update RendererFirstPersonFlags。文字列で保持 2021-06-16 17:03:41 +09:00
ousttrue
a35db5cf36 Spring on Controller 2021-06-16 15:57:37 +09:00
ousttrue
43ee6595c4 rename 2021-06-16 15:42:42 +09:00
ousttrue
2664a773e0 DrawLookAtGizmo 2021-06-16 15:38:10 +09:00
ousttrue
8a01eae5f1 Gaze to VRM10Controller 2021-06-16 15:00:02 +09:00
ousttrue
872a0ddc97 Export VRM10ObjectMeta 2021-06-16 14:51:36 +09:00
ousttrue
cb59024f8e WIP VRM10Object 2021-06-15 19:10:54 +09:00
ousttrue
671b333673 aim constraint Yaw, Pitch freeze 2021-06-15 14:51:20 +09:00
ousttrue
ceed241abd avoid editor error if not playing 2021-06-15 14:16:52 +09:00
ousttrue
048ce04ebd runtime 変数置き場を隔離して、初期化を遅延。Editor 用の変数の初期化を分離。 2021-06-15 13:43:16 +09:00
ousttrue
3b1f3fb52c add SubAssetKey to TakeResponsibilityForDestroyObjectFunc 2021-06-10 20:39:11 +09:00
ousttrue
83654b447d OnEnable is run when Attached. 2021-06-08 19:24:46 +09:00
ousttrue
098d0458a1 remove waning 2021-06-08 18:22:06 +09:00
ousttrue
fd18413d67
Merge pull request #996 from ousttrue/feature10/update_spring_bone_tail_spec 
Feature10/update spring bone tail spec
 2021-06-01 19:43:45 +09:00
ousttrue
56db0e2e54 rename namespace MeshUtility to UniGLTF.MeshUtility 
* MeshUtility と UniGLTF に重複していたクラスを削除
 2021-06-01 18:09:41 +09:00
ousttrue
e3ffffbd6f SpringBone 末端の仕様変更 
https://github.com/vrm-c/vrm-specification/pull/255
 2021-06-01 17:03:56 +09:00
ousttrue
b2f342d7e1 rename VRM10SpringJoint to VRM10SpringBoneJoint 2021-06-01 16:55:34 +09:00
ousttrue
f97bbc1ea5 new m_colliderList 2021-06-01 16:42:36 +09:00
ousttrue
3f09717236
Feature10/spring bone editor (#994) 
* SceneView switch

* VRM10ControllerEditor を分割

* VRM10/Editor/Components/VRM10ControllerSceneView.cs

* LookAtEditor, SpringBoneEditor

* VRM10SpringBoneColliderGroup and VRM10SpringBone to VRM10ControllerSpringBone. not MonoBehaviour

* ReorderableList

* VRM10Window.cs

* SpringBoneTreeView

* ScrollView

* rename

* VRM10SpringBoneColliderEditor

* SelectedGUIBase

* spring name

* VRM10SpringBoneCollider gizmo to handle

* SelectedGUI

* 再度、VRM10SpringBoneColliderGroup を MonoBehaviour へ。SerializedObject の参照の都合
 2021-06-01 16:00:49 +09:00
Masataka SUMI
9cd3288e4d mv SubAssetKey 2021-05-24 20:12:19 +09:00
ousttrue
3395bff90f public Source get set 2021-05-19 17:10:20 +09:00
ousttrue
c211199cf3 fix Source 2021-05-19 14:00:33 +09:00
ousttrue
297b585012 source position 2021-05-19 13:56:30 +09:00
ousttrue
8c12ab5661 SourceInitialCoords, DestinationInitialCoords を整理、修正 2021-05-19 13:52:54 +09:00
ousttrue
b3cbe06c6e implement aim up space 
aim のUPVectorを評価する空間を world から model/local に修正
 2021-05-18 18:14:04 +09:00
ousttrue
00814c0274 コード整理。m_destinationCoordinate, ModelRoot を追加 2021-05-18 17:36:05 +09:00
ousttrue
f1e0a2f3f9 fix 2021-05-18 17:04:16 +09:00
ousttrue
9a2fb090d6 fix aim logic 2021-05-18 17:01:22 +09:00
ousttrue
2bb6d10861 rename 2021-05-18 17:01:21 +09:00
ousttrue
607d0e07b2 fix postition and rotation 2021-05-18 17:01:19 +09:00
ousttrue
a6f4e1cc52 GetDstCoords 2021-05-18 17:01:19 +09:00
ousttrue
b99b66f47b GetSourceCoords 2021-05-18 17:01:18 +09:00
ousttrue
962ee32385 ApplyDelta 2021-05-18 17:01:18 +09:00
ousttrue
cf1b684c56 fix 2021-05-18 17:01:17 +09:00
ousttrue
c2641b2fb4 Delta 2021-05-18 17:01:17 +09:00
ousttrue
da4ae3f0e5 UpdateDelta 2021-05-18 17:01:17 +09:00
ousttrue
cc3568da14 Inverse 2021-05-18 17:01:17 +09:00
ousttrue
253846698c position/rotation constraint の共通部分を VRM10PostionRotationConstraintEditorBase にまとめた 2021-05-18 17:01:16 +09:00
ousttrue
1e80c61af6 impl rotationConstraint DestinationOffset 2021-05-18 17:01:16 +09:00
ousttrue
79465de4ad impl rotationConstraint SourceOffset 2021-05-18 17:01:16 +09:00
ousttrue
a1af1a943d CalcYawPitch 2021-05-18 17:01:07 +09:00
ousttrue
f95123e208 euler 2021-05-18 17:01:07 +09:00
ousttrue
12e0cc0406 WIP aim 2021-05-18 17:01:07 +09:00
ousttrue
ce8e0bff16 CalcYawPitch 2021-05-18 17:01:06 +09:00
ousttrue
673aac40e3 DrawAimUp 2021-05-18 17:01:06 +09:00
ousttrue
720bb3ed59 WIP aim 2021-05-18 17:01:06 +09:00
ousttrue
61920922d4 VRM10PositionConstraintEditor 2021-05-18 17:01:06 +09:00
ousttrue
2469d65cb2 IVRM10SourceDestination 2021-05-18 17:01:05 +09:00
ousttrue
b3dd5dc1f3 fix operator* 2021-05-18 17:00:25 +09:00
ousttrue
46add88112 fix GetSourceCurrent local 2021-05-18 17:00:24 +09:00
ousttrue
c806dc6186 GetSourceCurrent 2021-05-18 17:00:24 +09:00
ousttrue
22b3613df9 refactoring 2021-05-18 17:00:24 +09:00
ousttrue
43fc06c715 TR 2021-05-18 17:00:23 +09:00
ousttrue
864415f614 impl DstDrawModelCoords 2021-05-18 17:00:23 +09:00
ousttrue
e7fe9af5b0 SrcDrawCurrent, DstDrawCurrent 2021-05-18 17:00:23 +09:00
ousttrue
9dd707134b DrawDstLocal 2021-05-18 17:00:22 +09:00
ousttrue
d8836717cb VRM10RotationConstraintEditor 2021-05-18 17:00:21 +09:00
ousttrue
20431dad6d RotationOffset 2021-05-18 17:00:21 +09:00
ousttrue
4d3e24d49c gltf, vrm0, vrm1 でMeshExportValidatorを共通部品化 2021-05-06 20:03:55 +09:00
ousttrue
8629531284 MeshExportValidator.Validate 2021-05-06 15:18:17 +09:00
ousttrue
3d4b10da12 VRM10SpringBoneColliderGroup の null 防御 2021-05-06 13:45:01 +09:00
ousttrue
a507266df4 VRM10SpringBoneCollider is MonoBehaviour 2021-04-30 13:30:23 +09:00
ousttrue
22871e992d
ExpressionAvatar は 独立した ScriptableObject をやめる (#916) 
* ExpressionAvatar is MonoBehaviour

* fix controller editor
 2021-04-27 15:12:29 +09:00
ousttrue
e9c94de242 export position constraint 2021-04-23 17:40:23 +09:00
ousttrue
abafd14ff2 WIP ObjectSpace.model 2021-04-23 14:17:05 +09:00
ousttrue
8c7113bd53 EditorにMetaObjectの参照を表示 2021-04-22 16:41:30 +09:00
ousttrue
cff9dfadd8 VRM10SpringBone.m_center を VRM10Controller.SpringBoneCenter に移動 (SpringごとではなくModel全体の設定に) 
springの設定ではなくて、springが動く環境の設定。アプリが任意に設定する想定。
 2021-04-16 17:12:46 +09:00
ousttrue
fc5e767680 OnDrawGizmosSelected 2021-04-16 17:00:36 +09:00
ousttrue
6ff0e6a34f SpringBoneManager 廃止 2021-04-15 19:45:16 +09:00
ousttrue
a13258785f VRM10SpringBone を SpringBone にした。 2021-04-15 19:26:15 +09:00
ousttrue
596651f551 Merge branch 'master' into feature10/update_jsonschema 2021-04-15 17:50:55 +09:00
ousttrue
99e2ac8a83 vrm-specification を更新して、コードを再生成 2021-04-15 14:50:27 +09:00
ousttrue
ed0cfb1f27
Merge pull request #872 from ousttrue/feature/extract_key 
Feature/extract key
 2021-04-14 20:12:05 +09:00
ousttrue
aedfe98974 mod TextureImportName.GetExtractName to GetUnityObjectName 2021-04-14 20:09:30 +09:00
ousttrue
66a7cfc768 TextureImportParam の　GltfName, ConvertedName を UnityObjectName に単純化 2021-04-14 16:41:15 +09:00
ousttrue
56b7f1ae20 SubAssetKey 2021-04-14 13:50:09 +09:00
ousttrue
405188f737 remove VRM10SpringBoneColliderGroup.Reset. importer が誤動作する 2021-04-13 20:48:56 +09:00
ousttrue
44447822c0 m_debugCount 2021-04-09 16:54:39 +09:00
ousttrue
b62c123b66 meta, expressionAvatar, expression の extract を復旧 2021-04-06 15:08:37 +09:00
ousttrue
ca559b526e implement Constraint 2021-04-01 15:00:17 +09:00
ousttrue
572354079d implement SpringBone 2021-04-01 14:15:24 +09:00
ousttrue
c3fc7797ec implement LookAt 2021-04-01 13:46:52 +09:00
ousttrue
5df1576a70 implement build meta 2021-04-01 13:37:05 +09:00
ousttrue
82ef39e56d remove VRM10Controller.ModelAsset 2021-04-01 12:16:47 +09:00
ousttrue
9a29eac013 humanoid 2021-04-01 12:16:46 +09:00
ousttrue
c8d90c1adb remove Material and VRM from VrmLib 2021-04-01 12:16:45 +09:00
ousttrue
80938f0121 fix UNITY_EDITOR 2021-02-03 15:42:08 +09:00
Masataka SUMI
18850bb04c remove redundant access. 2021-02-02 14:10:35 +09:00
Masataka SUMI
ae1bec1e95 sum expression override rate method is changed from max to muladd. 2021-02-02 14:10:12 +09:00
Masataka SUMI
f36f70674e Follow updates of BlendShapeKey 2021-02-02 00:02:08 +09:00
Masataka SUMI
e8bbbc849d ExpressionKey.IsBinary evaluates in ExpressionValidator. 2021-02-01 23:28:24 +09:00
Masataka SUMI
dd34a1e615 Suppress GC to zero about Expression functions. 2021-02-01 23:17:17 +09:00
Masataka SUMI
4ebcbb1ab9 Consider block. 2021-02-01 22:50:05 +09:00
Masataka SUMI
aec86eae4c Remove unused classes. 2021-02-01 22:45:50 +09:00
Masataka SUMI
0341725770 Implements expression overriding https://github.com/vrm-c/vrm-specification/pull/196 2021-02-01 22:29:42 +09:00
Masataka SUMI
0c5d6aae17 Restore eye bone when ExpressionController was disposed. 2021-02-01 20:32:06 +09:00
Masataka SUMI
7986638c82 Refactoring reference between Expression and LookAt. 2021-02-01 19:27:22 +09:00
Masataka SUMI
349fd06645 Rename 2021-02-01 16:04:24 +09:00
Masataka SUMI
a3afd483d0 Define ExpressionValidator instead of ExpressionAccumulator 2021-02-01 15:54:13 +09:00
Masataka SUMI
5241f79927 make Expression classes sealed. 2021-01-29 22:06:46 +09:00
Masataka SUMI
144ee3fd67 make Expression merger classes internal. 2021-01-29 19:12:01 +09:00
ousttrue
e6a02a90f0 Add Component するので Runtime にいる必要があった。 
ビルドは後でなおす
 2021-01-29 16:34:34 +09:00
ousttrue
4173d00c9a generate expression 
OverrideBlink, OverrideLookAt, OverrideMouth
 2021-01-29 16:26:13 +09:00
ousttrue
78bd0aafb9 コード整理 2021-01-29 14:05:04 +09:00
ousttrue
3720fb1341 fix expression editor and migration 2021-01-28 20:03:19 +09:00
ousttrue
a57e30e3ba MorphTargetBinding 2021-01-28 20:03:19 +09:00
ousttrue
015f5e3881 move 2021-01-28 20:03:18 +09:00
ousttrue
b2fd1dc8ce IExpressionAccumulator 2021-01-28 20:03:18 +09:00
ousttrue
9c56c7561c update VRM10ControllerExpression 2021-01-28 20:03:17 +09:00
ousttrue
16e4bcab44 fix build error in vrm10 
#701
 2021-01-28 18:33:49 +09:00
ousttrue
9b45fb9f72 exclude checkbox 2021-01-22 15:55:55 +09:00
ousttrue
a61c3f92df restore spring gizmo 2021-01-22 15:45:02 +09:00
ousttrue
1a28a18e29 fix comment 2021-01-22 15:34:58 +09:00
ousttrue
178c51ddec Joint別パラメーターを実装 2021-01-22 15:31:14 +09:00
ousttrue
0484f02198 VRM10SpringBoneManager.cs 2021-01-20 18:36:39 +09:00
ousttrue
e05daa1524 WIP SpringBone 
* JsonSchema更新
* シリアライザ修正

#635
 2021-01-20 18:36:39 +09:00
ousttrue
2e067a92f5 gizmo 2021-01-20 18:36:38 +09:00
ousttrue
3b0cccdfab prefix VRM10 2021-01-20 18:36:38 +09:00
ousttrue
114ee76bdf Authors 2021-01-20 18:36:38 +09:00
PoChang007
c53b63f001 clean unused .meta 2021-01-13 18:20:54 +09:00
ousttrue
d53942a7bd merge vrm10 
* MeshUtility を UniGLTF　下に移動
* Assets/VRM10 を追加
* JsonSchemaからのコード生成 UniGLTF/Editor/Generator を追加
 2021-01-07 13:37:24 +09:00