Commit Graph

3918 Commits

Author SHA1 Message Date
ousttrue
68019df691 abs, name 2024-09-03 18:15:36 +09:00
ousttrue
31f2b5eb0c SpringBone を scaling に連動させる ScalingParams パラメーター 2024-09-03 16:31:45 +09:00
ousttrue
1de2149802
Merge branch 'master' into fix/springbone_refactoring 2024-09-03 16:03:50 +09:00
ousttrue
014530b400 readonly
SceneInfo に ColliderGroups を投入するの忘れていた
2024-09-03 15:59:16 +09:00
ousttrue
8ffbd7751a
Merge branch 'master' into fix/samples_urp_scene 2024-09-03 15:20:09 +09:00
ousttrue
dba1788c23 TryCollide 2024-08-30 17:58:36 +09:00
ousttrue
fc1b2a80fd comment 2024-08-30 17:37:30 +09:00
ousttrue
2cc166f193 collision 2024-08-30 17:32:27 +09:00
ousttrue
ee68e48f0f rename 2024-08-30 17:09:21 +09:00
ousttrue
c270da62e1 SpringBoneSystem 2024-08-30 16:29:37 +09:00
ousttrue
ee61629c1a sample の URP 対応 2024-08-30 14:47:27 +09:00
ousttrue
159c89af8c rename public fields 2024-08-29 21:44:21 +09:00
ousttrue
76850ba67c 回転・拡縮に対応するべく SpringBone joint の TRS を質点の位置に解決するように整理する
vrm0 > vrm0.fast > vrm1.fast の順に作業する。3つとも処理内容は同じ
2024-08-29 21:40:45 +09:00
ousttrue
40c4777361 [vrm-1.0][editor][play] call SpringBone.ReconstructSpringBone when changed
#2410
2024-08-28 17:28:41 +09:00
ousttrue
bae7c17fe4 [vrm-1.0] ScriptedImporter で対象Assetにアイコンをセットする 2024-08-27 16:21:28 +09:00
ousttrue
4e429e1be5
Merge branch 'master' into fix/vrm1_bytelength_test 2024-08-27 14:00:59 +09:00
ousttrue
5e8f59661f
Merge branch 'master' into feature/add-importer-context-settings 2024-08-26 20:57:19 +09:00
ousttrue
5d3c66513c mesh export 時の byteLength 確認テスト。
#2413
2024-08-26 20:41:06 +09:00
二酸化カメレオン
5a24145e86 Fix Buffer ByteLength field Value when glTF exporting 2024-08-25 20:01:02 +09:00
tsgcpp
a500e433bb fix typo in Vrm10RuntimeSpringBone.cs 2024-08-17 22:04:45 +09:00
tsgcpp
643742dcf9 remove a space in a path "Vrm10RuntimeSpringBone.cs" 2024-08-17 22:02:07 +09:00
iruca3
8881882873
Introduce ImporterContextSettings for handling loading animation and
axes conversion.

Refs: https://github.com/vrm-c/UniVRM/pull/1719#discussion_r908105469
2024-08-17 13:35:27 +09:00
ousttrue
79caa1096d HideInCallstackAttribute is from 2021.3.23f1 2024-08-05 15:46:37 +09:00
ousttrue
aa119a3b25
Merge branch 'master' into animNullShader 2024-08-05 13:10:54 +09:00
Masataka SUMI
6842cd933c
VrmAnimation depends on IMaterialDescriptorGenerator instead of "Standard" 2024-08-03 03:01:45 +09:00
Masataka SUMI
de9713a768
refactor 2024-08-03 02:45:54 +09:00
Masataka SUMI
d17f03c45d
null check 2024-08-03 02:06:51 +09:00
Masataka SUMI
7a801071bd
refactoring 2024-08-03 01:47:21 +09:00
Masataka SUMI
0e0455f7d8
Implements UrpUnlitContext 2024-08-03 01:38:34 +09:00
Masataka SUMI
5f7a38989c
Implements Universal Render Pipeline/Unlit Material Exporter 2024-08-03 01:12:54 +09:00
Masataka SUMI
39c01b2966
Refactoring 2024-08-03 01:02:33 +09:00
Masataka SUMI
ee1bdc701f
add exporting support UniUnlit in URP 2024-08-03 01:02:12 +09:00
Masataka SUMI
d3439abc52
Implements UrpFallbackMaterialExporter 2024-08-03 01:00:53 +09:00
Masataka SUMI
182fdbe8b0
Implements UrpUniUnlitMaterialExporter 2024-08-03 01:00:21 +09:00
ousttrue
786541e735 breaking ! 2024-08-02 19:46:48 +09:00
Masataka SUMI
8bffa2f571
remember instance assigning 2024-08-02 18:37:26 +09:00
Masataka SUMI
e27a20b348 not make UrpLitContext sealed 2024-08-02 13:43:12 +09:00
Masataka SUMI
30756a2fb5 remember new 2024-08-02 01:29:04 +09:00
Masataka SUMI
67e008a984 Refactor BuiltIn MaterialDescriptorGenerator 2024-08-02 01:23:01 +09:00
Masataka SUMI
9667f2cfb8 Implements UrpGltfDefaultMaterialImporter 2024-08-02 01:19:50 +09:00
Masataka SUMI
ee1b4a0490 add an argument to IMaterialDescriptorGenerator.GetGltfDefault 2024-08-02 01:17:35 +09:00
Masataka SUMI
3900e01b49 importing SmoothnessTextureChannel is always SpecularMetallicAlpha 2024-08-01 01:34:22 +09:00
Masataka SUMI
ad712ce1ce fix emission internal flag 2024-08-01 01:09:35 +09:00
Masataka SUMI
6170074faa set emission flag 2024-08-01 00:57:22 +09:00
Masataka SUMI
f95d06b291 remove unused 2024-08-01 00:47:41 +09:00
Masataka SUMI
3d3a919319 UrpGltfPbrMaterialImporter use UrpLitContext 2024-08-01 00:47:19 +09:00
Masataka SUMI
88bbe42f20 Merge branch 'master' of https://github.com/vrm-c/UniVRM into urpExport 2024-07-31 23:19:55 +09:00
ousttrue
885adb7138
Merge branch 'master' into extended-collider-spec-version 2024-07-31 13:25:46 +09:00
Masataka SUMI
76ec8e3f98 Implements URP/Lit material exporter 2024-07-31 04:48:43 +09:00
Masataka SUMI
c7518579be Add UrpLitContext.UnsafeEditMode 2024-07-31 01:38:33 +09:00
Masataka SUMI
bb68702c0c Complete UrpLitContext 2024-07-31 00:36:17 +09:00
Masataka SUMI
7fa6e894ac remove experimental 2024-07-30 23:12:33 +09:00
Masataka SUMI
6dba5bdf71 VRM10 ScriptedImporter can detect project's RenderPipeline or select manually. 2024-07-30 23:12:02 +09:00
Masataka SUMI
d5cffceca0 glTF ScriptedImporter can detect project's RenderPipeline or select manually. 2024-07-30 23:11:35 +09:00
Masataka SUMI
dc6f3605a2 Can export baseColor & texture of URP/Lit 2024-07-30 22:47:39 +09:00
Masataka SUMI
072dcba638 Add URP/Lit material handler class 2024-07-30 22:41:58 +09:00
0b5vr
40a14d2c24 fix: Add spec version 1.0 to VRMC_springBone_extended_collider
spec versionが `1.0` の `VRMC_springBone_extended_collider` が出力されるようになるため、拡張コライダー仕様の正式リリースに合わせてマージ・リリースをお願いします。
2024-07-30 13:32:52 +09:00
Masataka SUMI
9171280dff Fix GLTF tests 2024-07-30 00:46:08 +09:00
Masataka SUMI
ccf3a16b98 Fix VRM0X Tests 2024-07-30 00:30:22 +09:00
Masataka SUMI
eff55a9465 Fix Vrm10 Tests 2024-07-30 00:05:24 +09:00
Masataka SUMI
c4e3f53d5d Move Test Assets 2024-07-29 23:52:55 +09:00
Masataka SUMI
3fa8ec8a07 Fixed an issue where unnecessary files were left behind after running tests. 2024-07-29 23:34:39 +09:00
Masataka SUMI
78a99fb9e9 use default arguments 2024-07-29 22:33:51 +09:00
Masataka SUMI
23f387a7c8 add RenderPipeline considering to gltf/vrm/vrm10 exporters 2024-07-29 22:28:35 +09:00
Masataka SUMI
f5d40b4d85 Refactor about detecting the RenderPipeline 2024-07-29 21:59:14 +09:00
Masataka SUMI
c59b009cae
Merge branch 'master' into ignoreResources 2024-07-29 20:18:46 +09:00
Masataka SUMI
f5f468444c Remove incomplete shadervariants files 2024-07-29 20:06:38 +09:00
Masataka SUMI
c8f8330f90 Extract MToon10 shaders from the Resources directory 2024-07-29 20:05:32 +09:00
Masataka SUMI
1499e25aec Extract MToon0X shaders from the Resouces directory 2024-07-29 20:02:58 +09:00
Masataka SUMI
a9742c48bf Extract UniUnlit shader from the Resources directory 2024-07-29 20:01:30 +09:00
Masataka SUMI
2e3a60f81e Ignore using Task<T>.Wait() 2024-07-28 19:23:07 +09:00
ousttrue
488da95aa8
Merge branch 'master' into fix/no_vrm1 2024-07-26 13:19:46 +09:00
Kaio Duarte
f37cba6215
fix: add missing System namespace on Unity 6 2024-07-25 17:26:48 +01:00
ousttrue
0b565233d2 fix VRM10SpringBoneJointEditor 2024-07-25 17:28:57 +09:00
ousttrue
d43ebaef5f
Merge branch 'master' into fix/null_component 2024-07-25 17:25:23 +09:00
ousttrue
7ef4f50558 Humanoid.Get_GetBoneTransform を追加
Animator.GetBoneTransform のために GetComponent しているところの Export Error を修正するついでに、
Animator.GetBoneTransform と Humanoid.GetBoneTransform 両対応とした(vrm-0.x と vrm-1.0 両方)。
2024-07-25 14:28:59 +09:00
ousttrue
cc6eea567b Vrm10Instance が無い状態で Export を通す 2024-07-25 14:08:21 +09:00
ousttrue
b852819b70 error message 2024-07-25 14:07:36 +09:00
ousttrue
be20563059 GetComponent を置き換え。
TryGetComponent
GetComponentOrThrow(拡張関数)
GetComponentOrNull(拡張関数)

sample と test は据え置き
2024-07-24 22:09:30 +09:00
ousttrue
652ac53cc9 fix AnimationValidator
#2319 これかも
2024-07-24 20:30:44 +09:00
ousttrue
ca0e062e9c use TryGetComponent 2024-07-24 20:18:44 +09:00
ousttrue
6c929f67f0 attach されていない場合でも is 演算子が true になって後続で例外になる 2024-07-24 19:42:34 +09:00
Masataka SUMI
aa20ab6479 VRM10Viewer supports both Built-in and URP 2024-07-23 21:13:52 +09:00
Masataka SUMI
315071d636 Add non-public package for development & use urp 2024-07-23 20:47:06 +09:00
Masataka SUMI
da1d48ac22 update package.json management 2024-07-23 20:21:41 +09:00
Masataka SUMI
6339cf2237 Delete VRMShaders (com.vrm-c.vrmshaders) Package 2024-07-23 20:14:42 +09:00
Masataka SUMI
2778a696f1 remove unused usings 2024-07-23 20:02:47 +09:00
Masataka SUMI
47681f7677 Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders6 2024-07-23 20:00:33 +09:00
Masataka SUMI
05a1e7a9cc
Merge branch 'master' into disassemblyVrmShaders5 2024-07-23 19:56:12 +09:00
Masataka SUMI
4ff82c9130
Merge branch 'master' into disassemblyVrmShaders4 2024-07-23 19:55:46 +09:00
Masataka SUMI
c0d2ca06cf
Merge branch 'master' into disassemblyVrmShaders3 2024-07-23 19:55:14 +09:00
Masataka SUMI
4291c38981
Merge branch 'master' into disassemblyVrmShaders2 2024-07-23 19:54:39 +09:00
Masataka SUMI
57c8ae932b
Merge branch 'master' into disassemblyVrmShaders 2024-07-23 19:51:41 +09:00
ousttrue
0f704c7142 URP プロジェクトで matcap を含むモデルを Editor import するとエラーになるのを回避(暫定)
とりえあずエラー回避。
`Exception: UnityEngine.Texture.Sphere is not converted`
mtoon URP "MToon" shader is not ready. import fallback to unlit
2024-07-23 15:34:10 +09:00
ousttrue
2f38b0a902 UniVRM-0.124.2 2024-07-23 12:41:47 +09:00
Masataka SUMI
9abb41e51a
Merge branch 'master' into disassemblyVrmShaders4 2024-07-21 00:48:01 +09:00
Masataka SUMI
8a06ad1c0d
Merge branch 'master' into disassemblyVrmShaders3 2024-07-21 00:47:53 +09:00
Masataka SUMI
9ba33bb923
Merge branch 'master' into disassemblyVrmShaders2 2024-07-21 00:47:44 +09:00
Masataka SUMI
bc22a84527
Merge branch 'master' into disassemblyVrmShaders 2024-07-21 00:47:33 +09:00
Masataka SUMI
e9da5e2b7b mv VRMShaders namespace to UniGLTF 2024-07-20 23:47:45 +09:00
Masataka SUMI
d0dcdf09fc UniHumanoid can't depends on UniGLTF 2024-07-20 23:20:37 +09:00
Masataka SUMI
99467dbe70 remove unused directories 2024-07-20 23:15:08 +09:00
Masataka SUMI
5f8c930031 mv AwaitCaller definitions from VRMShaders to UniGLTF 2024-07-20 23:14:40 +09:00
Masataka SUMI
00c74f684f mv top level IO definitions from VRMShaders to UniGLTF 2024-07-20 23:13:34 +09:00
Masataka SUMI
5cdec669a0 mv TextureIO from VRMShaders to UniGLTF 2024-07-20 23:08:55 +09:00
Masataka SUMI
45cb2a04fe mv MaterialIO from VRMShaders to UniGLTF 2024-07-20 23:00:12 +09:00
Masataka SUMI
246e926b95 mv AnimationIO from VRMShaders to UniGLTF 2024-07-20 22:55:53 +09:00
Masataka SUMI
6845641478 Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders5 2024-07-20 22:15:46 +09:00
Masataka SUMI
f544ac8041 remove prefix VRMShaders.* from UniUnlit asmdef files. 2024-07-20 22:12:06 +09:00
Masataka SUMI
73bca6447b mv UniUnlit from VRMShaders to UniGLTF 2024-07-20 22:07:49 +09:00
ousttrue
deff52b7a7 root の子孫に再帰的に joint を設定するボタン 2024-07-19 17:29:54 +09:00
Masataka SUMI
c7a7ab3066 rename MToon/Script with MToon/Runtime 2024-07-19 17:06:36 +09:00
Masataka SUMI
7ce7d63a2a mv MToon0X from VRMShaders.VRM to VRM 2024-07-19 17:00:09 +09:00
Masataka SUMI
f8fff30995 Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders3 2024-07-19 13:25:43 +09:00
Masataka SUMI
4e0356929b Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders2 2024-07-19 13:25:31 +09:00
Masataka SUMI
0c48ec5eab Merge branch 'master' of https://github.com/vrm-c/UniVRM into disassemblyVrmShaders 2024-07-19 13:24:38 +09:00
Masataka SUMI
a5f75194c0 mv VRM0.X material io files from VRMShaders.VRM.IO.Runtime to VRM 2024-07-18 23:51:13 +09:00
Masataka SUMI
8a7d0a82f3 mv namespace from VRMShaders.VRM10.MToon10 to VRM10.MToon10 2024-07-18 23:24:50 +09:00
Masataka SUMI
7449207ae8 remove prefix "VRMShaders.*" from MToon10 asmdef files. 2024-07-18 22:58:20 +09:00
Masataka SUMI
5d8134bf87 mv MToon10 from VRMShaders to VRM10 2024-07-18 22:55:02 +09:00
Masataka SUMI
36dd65c57b mv generated Vrm10Material format from VRMShaders.VRM10.Format.Runtime to VRM10 2024-07-18 22:44:05 +09:00
Masataka SUMI
12ef83638f Add MToon v3.9 2024-07-18 22:13:01 +09:00
Masataka SUMI
5d8d3175d1 remove mtoon submodule 2024-07-18 22:11:29 +09:00
ousttrue
4dc5aae73c AddLogic to LogicFromTransform 2024-07-18 18:46:26 +09:00
ousttrue
1d2fed7e18 remove unsafe 2024-07-18 18:46:26 +09:00
ousttrue
02db0d3ba0 setter 2024-07-18 18:46:25 +09:00
ousttrue
7f089f1dd8 FastSpringBoneBufferBuilder を FastSpringBoneBuffer.FastSpringBoneBuffer に合体 2024-07-18 18:46:25 +09:00
ousttrue
80c2bb921c TransformIndexMap to Array.IndexOf 2024-07-18 18:46:25 +09:00
ousttrue
3d00753c83 remove simulateLastBone 2024-07-18 18:46:25 +09:00
ousttrue
d8735d8952 internal Vrm10RuntimeSpringBone.Vrm10RuntimeSpringBone 2024-07-18 18:46:25 +09:00
ousttrue
a9d645d4ff impl Vrm10RuntimeSpringBone.RestoreInitialTransform 2024-07-18 18:46:25 +09:00
ousttrue
b69b3760e3 private FastSpringBoneBufferBuilder m_initialData 2024-07-18 18:46:25 +09:00
ousttrue
7f856bf945 separate FastSpringBoneBufferBuilder 2024-07-18 18:46:25 +09:00
ousttrue
3a37f35883 Vrm10Runtime から SpringBone 関連を Vrm10RuntimeSpringBone に分離 2024-07-18 18:46:25 +09:00
ousttrue
5b47fab89f SpringBonePaused to IsSpringBoneEnabled. invert boolean 2024-07-18 18:46:25 +09:00
ousttrue
af9e18c09c add BlittableExternalData.Paused 2024-07-18 18:46:25 +09:00
ousttrue
2b4f4bc343 とりあえず ILogHandler に対応。更なる拡張は使うときに。 2024-07-16 16:18:26 +09:00
ousttrue
42a3014e7a UniGLTFLogger を追加
[System.Diagnostics.Conditional("VRM_DEVELOP")] により呼び出しが消滅する。
2024-07-16 15:48:50 +09:00
ousttrue
5269bb9b8a remove unused 2024-07-11 19:12:28 +09:00
ousttrue
2ff310a070 VRM10SpringBoneJoint.s_activeForGizmoDraw to InternalsVisibleTo
"DrawColliders"
2024-07-11 19:09:35 +09:00
ousttrue
5b954dbb7c add toggle DrawCollider 2024-07-11 18:20:32 +09:00
ousttrue
57af53c221 comment 2024-07-11 15:19:00 +09:00
ousttrue
7d3aa056ce collider のカスタムエディターで無効なパラメーターを表示しない 2024-07-11 15:11:34 +09:00
ousttrue
5500fd5051 fix plane offset. magenta 2024-07-11 14:12:07 +09:00
ousttrue
a30dfd363b spring と 関連のある collider も描画する 2024-07-11 14:12:07 +09:00
ousttrue
8c09ff60df isLastTail 2024-07-11 14:12:07 +09:00
ousttrue
e8f84d95e6 show collider groups 2024-07-11 14:12:07 +09:00
ousttrue
a87ceb0fd4 VRM10SpringBoneJoint の Gizmo を Spring 単位にまとめて描画するようにした
末端の joint を選択していても 根元から一連の joint を描画し、
末端を別色で highlight する。
2024-07-11 14:12:07 +09:00
ousttrue
e85b246ce4 remove Vrm10Instance.OnDrawGizmosSelected
https://github.com/vrm-c/UniVRM/issues/2325
2024-07-11 14:12:07 +09:00
ousttrue
2effde9c1f show spring info on VRM10SpringBoneJointEditor 2024-07-11 14:12:07 +09:00