Commit Graph

4284 Commits

Author SHA1 Message Date
ousttrue
1086db9be0 Occlusion 2025-02-05 15:42:11 +09:00
ousttrue
3b3da89a77 BaseColor, BaseMap 2025-02-05 15:32:24 +09:00
ousttrue
fc769f02ed load glb 2025-02-05 15:09:27 +09:00
ousttrue
7732955ca0 editor, sample 2025-02-05 13:56:13 +09:00
ousttrue
94e242b31f
Merge branch 'vrm-c:master' into fix/use_UniGLTFLogger 2025-02-05 13:02:58 +09:00
ousttrue
5885004730 UniGLTFLogger 2025-02-05 03:47:56 +09:00
ousttrue
1f6ffa5eb6 vrm の root 以外にアタッチするスクリプトはアイコン取りやめ
- VRMSpringBone
- Vrm10XXXConstraint
- VRM10SpringBoneColliderGroup
2025-02-04 21:58:27 +09:00
ousttrue
ebe8ae6969
Merge branch 'master' into fix/custom_material 2025-02-04 16:51:19 +09:00
ousttrue
ffbbd63311 TinyPbr 2025-02-04 16:38:40 +09:00
ousttrue
5137c15051 CustomMaterial to TinyPbr 2025-02-04 16:34:28 +09:00
ousttrue
dae0b716b9 _urpMaterialForGrayscale 2025-02-04 16:12:14 +09:00
ousttrue
647f5c0a71 BoxMan use custom material 2025-02-03 19:13:38 +09:00
ousttrue
a1e5c854c9 fix UV_PROPERTY hard coding(_MainTex_ST) 2025-02-03 19:02:07 +09:00
Isamu Mogi
dc8b841f1e Unity6でGraphicsSettings.renderPipelineAssetがObsolete警告を出すのに対応
Unity6でGraphicsSettings.renderPipelineAssetがObsoleteになり、次のような警告が出ていました。

```
Assets/VRM/Editor/BuildClass.cs(31,13): warning CS0618: 'GraphicsSettings.renderPipelineAsset' is obsolete: 'renderPipelineAsset has been deprecated. Use defaultRenderPipeline instead (UnityUpgradable) -> defaultRenderPipeline'
```

Unity6以降では、代わりとして推奨されるフィールド defaultRenderPipeline を使うようにしました。
2025-01-29 19:45:42 +09:00
ousttrue
cbf5f33666 UNITY_EDITOR first 2025-01-29 13:39:38 +09:00
ousttrue
91594fae01 fix order. "UNITY_EDITOR" first 2025-01-29 13:36:54 +09:00
ousttrue
217abf20e9 201 2025-01-28 20:05:21 +09:00
ousttrue
de8444bbea build VRM10Viewer and SimpleViewer 2025-01-28 19:15:00 +09:00
ousttrue
b19222ba1e remove meta 2025-01-28 12:54:00 +09:00
ousttrue
721f007e7d
Merge branch 'master' into fix/webgl_build 2025-01-27 19:47:49 +09:00
ousttrue
6536238722 jslib 2025-01-27 19:34:28 +09:00
ousttrue
e48867cfea WebGLFileDialog to UniVRM_Sample_WebGLFileDialog 2025-01-27 17:05:53 +09:00
ousttrue
7a65c4d1a4
Merge branch 'master' into vrm_itimecontrol 2025-01-27 17:02:42 +09:00
ousttrue
6ecc22f0ee interface 2025-01-27 16:26:23 +09:00
RDAG
f67b4d7269 fix compile error in unity 2021 2025-01-27 00:18:22 +09:00
ousttrue
e1db312203 menu "Build 10 WebGL for CI". Update sample 2025-01-25 02:14:18 +09:00
ousttrue
1080729d0b fix WebGL build VRM10Viewer 2025-01-25 01:43:34 +09:00
ousttrue
fe511a5211 BuildWebGLForCi 2025-01-24 23:38:37 +09:00
ousttrue
8108583f3e fix SimpleViewer WebGL build 2025-01-24 22:45:42 +09:00
ousttrue
10dafaab49 springboneRuntime 2025-01-24 22:00:02 +09:00
ousttrue
de4c357f09 impl ITimeControl to Vrm10AnimationInstance 2025-01-23 19:04:39 +09:00
Isamu Mogi
f69e60e5f0 MToon10Meta.URPUnityShaderNameがObsolete警告を出すのに対応
MToon10Meta.URPUnityShaderNameがObsoleteになり、次のような警告が出ていました。

```
Assets/VRM10/Runtime/IO/Material/URP/Import/Materials/UrpVrm10MToonMaterialImporter.cs(30,29): warning CS0618: 'MToon10Meta.URPUnityShaderName' is obsolete: 'Use UnityUrpShaderName instead'
```

Obsoleteになった際のコミットはこちらです: cce076d324

代わりに、同内容の推奨されている定数 MToon10Meta.UnityUrpShaderName を使うようにしました。
2024-12-26 21:34:15 +09:00
ousttrue
a481f3287f fix description 2024-12-24 15:17:04 +09:00
ousttrue
0a5de465ad add sample package.json 2024-12-24 15:10:21 +09:00
ousttrue
c1f5356017 copy Samples~ 2024-12-24 14:12:00 +09:00
ousttrue
148b27846e clothsample の URP material 2024-12-24 14:11:00 +09:00
ousttrue
be1adeb031 package.json 2024-12-24 13:56:26 +09:00
ousttrue
4fe45ff1f6 update asmdef 2024-12-23 23:40:02 +09:00
ousttrue
d2b33e397e fix editor asmdef 2024-12-23 19:49:07 +09:00
ousttrue
38f228d558 UniVRM-0.128.1 2024-12-23 14:32:27 +09:00
Masataka SUMI
8d4b6d855c
The MToon10 URP shader follows the MToon10 Built-inRP shader 2024-12-23 14:15:23 +09:00
Masataka SUMI
5d116ee89d
MatCapColor value should be [1,1,1] when it isn't defined. 2024-12-23 14:05:54 +09:00
Masataka SUMI
76563cdebb
MatCap Texture should be 0.0 when it doesn't exist. 2024-12-23 14:04:26 +09:00
ousttrue
e3b2071877
Merge branch 'master' into fix/10_collider_editor_update 2024-12-23 13:39:59 +09:00
ousttrue
458aabdfe4
Merge branch 'master' into fix/10_show_select_springbone 2024-12-23 13:39:18 +09:00
ousttrue
a8925bbd10
Merge branch 'master' into use_maintexture_offset_scale 2024-12-20 15:52:38 +09:00
Yutaka Sato
3d6b3afe1f
Merge branch 'master' into use_maintexture_offset_scale 2024-12-20 15:48:40 +09:00
ousttrue
ceea9a294a Debug.Log 2024-12-20 15:43:35 +09:00
ousttrue
bd97ffd407 add VrmaScriptedImporter 2024-12-20 15:35:56 +09:00
Masataka SUMI
b8ab2bdf8f
Fix an error when importing a glTF file that does not contain materials. 2024-12-20 15:12:03 +09:00
notargs
6ba271705c Merge remote-tracking branch 'upstream/master' into use_maintexture_offset_scale 2024-12-13 21:30:09 +09:00
notargs
fc206b8225 Fix MaterialValueBindingMerger built-in RP lock-in 2024-12-13 20:20:28 +09:00
ousttrue
aad85295a4
Merge branch 'master' into fix/fix_cloth_sample 2024-12-13 17:42:50 +09:00
ousttrue
6eb9e589b9 set icon 2024-12-10 16:12:25 +09:00
ousttrue
554bdfec4d use Application.platform 2024-12-09 17:35:02 +09:00
ousttrue
267b080eac Editor の filedialog の platform 依存を隔離 2024-12-09 16:27:33 +09:00
ousttrue
9eb134fcf3
Merge branch 'master' into fix/gizmo_count 2024-12-09 15:22:44 +09:00
ousttrue
d4a8027144
Merge branch 'master' into fix/use_awaitcaller 2024-12-09 15:22:09 +09:00
ousttrue
5a882d76d1
Merge branch 'master' into #2525 2024-12-09 15:21:05 +09:00
Christian Petry
5d978f9c88 Refs #2525 - Using mesh topology to also process quads. Quads are being split into two triangles. 2024-12-04 12:51:32 +01:00
ousttrue
eade1b521f 初期設定時など空の時にエラーになる 2024-12-04 16:29:36 +09:00
Christian Petry
cc6acafcf3 cleaned up PR 2024-12-03 15:21:03 +01:00
Christian Petry
66f37ba2ce Refs #2521 - Improved exporting performance drastically by increasing allocated buffer more than needed to be able to skip extending chunk by chunk. No difference in export quality 2024-12-03 15:15:12 +01:00
Christian Petry
e5e731359f Fixed #2519 - progress being used when given 2024-12-03 12:44:06 +01:00
ousttrue
927008c1bf use awaitCaller 2024-12-03 13:19:49 +09:00
ousttrue
b53454c144 impl branch 2024-12-02 17:22:45 +09:00
ousttrue
22556171a2 fix tree index 2024-12-02 17:12:03 +09:00
ousttrue
a3a15e34ae particle.Branch 2024-12-02 16:35:26 +09:00
ousttrue
7113e62166 pin cd 2024-12-02 15:00:08 +09:00
ousttrue
4c6f5ebb48 ParticleSettings 2024-12-02 14:48:36 +09:00
ousttrue
3d07d160ce _impulsiveForces 2024-12-02 14:03:59 +09:00
ousttrue
be5b857489 use warp.BaseSettings 2024-12-02 13:57:55 +09:00
ousttrue
8551e2d55b resilience_force 2024-12-02 10:27:57 +09:00
ousttrue
7fccb941f6 RectCollisionReduceJob 2024-12-01 01:55:44 +09:00
ousttrue
4f40c44fea CollisionMove 2024-11-30 23:28:31 +09:00
ousttrue
6ebf6a779b fix TryCollideCapsuleAndSphere 2024-11-30 00:14:45 +09:00
ousttrue
7fe84e533e ColliderGroupRefRange 2024-11-29 23:55:47 +09:00
ousttrue
c2cab1c68c ArrayRange 2024-11-29 23:55:47 +09:00
ousttrue
c871f04a1e batch count 1 2024-11-29 23:55:47 +09:00
ousttrue
b16ea01ede max delta 2024-11-29 23:55:47 +09:00
ousttrue
9455b530b7 warp attach validation 2024-11-29 23:55:47 +09:00
ousttrue
27276e74bc skip duplicate joint 2024-11-29 23:55:47 +09:00
ousttrue
b3dc6b45fa fix stiffness. normalized 2024-11-29 23:55:46 +09:00
ousttrue
9f1977d76f fix factor. add cloth to hips 2024-11-29 23:55:46 +09:00
ousttrue
d21ac212d9 Replace split to Load and Clear 2024-11-29 23:55:46 +09:00
ousttrue
95d5576cc8 fix StrandCollisionJob 2024-11-29 23:55:46 +09:00
ousttrue
9773b0c915 rename 2024-11-29 23:55:46 +09:00
ousttrue
6018af0a4e fix ClothWarpRoot.OnValidate 2024-11-29 23:55:46 +09:00
ousttrue
ffb1f54bdd update RotateParticleRuntimeProviderEditor 2024-11-29 23:55:46 +09:00
ousttrue
c75dd199a5 UseJob default true 2024-11-29 23:55:46 +09:00
ousttrue
6cee7b3b70 capsule の頭側も drag できるようにした 2024-11-29 19:00:09 +09:00
ousttrue
1087bfe79d static 変数に別モデルの参照が残る場合あり 2024-11-29 17:59:34 +09:00
ousttrue
6b1314c242 play 中の collider 変更で ReconstructSpringBone を呼ぶ 2024-11-29 17:56:34 +09:00
ousttrue
0abe403afe
Merge branch 'master' into fix/collider_editor 2024-11-29 17:31:53 +09:00
ousttrue
7ec1951f37 highlight selected spring 2024-11-28 20:06:57 +09:00
ousttrue
1f55d0dcfb GUISpringBone use VisualElement 2024-11-28 19:41:39 +09:00
ousttrue
97355c6f86 VisualElement TabView もどき 2024-11-28 16:10:18 +09:00
ousttrue
7234430424 m_Script 2024-11-28 14:00:47 +09:00
ousttrue
f155a15c7e 0.x は default true 2024-11-28 13:30:49 +09:00
ousttrue
7e91b1b4d5 gui に checkbox つけわすれ 2024-11-28 13:30:25 +09:00
ousttrue
5f5eaa641b VRM10SpringBoneColliderEditor に PositionHandle と "Fit head-tail capsule" ボタン追加 2024-11-26 22:24:33 +09:00
ousttrue
06c1da2e98 VRM10SpringBoneColliderGroupEditor 2024-11-26 21:56:31 +09:00
ousttrue
b75accf910 script gray 2024-11-26 21:56:17 +09:00
ousttrue
3c8d40277b rename namespace ClothWarpLib to UniVRM10.ClothWarp 2024-11-26 18:32:23 +09:00
ousttrue
13a0f4cad8 ClothWarpLib.Components.ClothWarp to ClothWarpRoot 2024-11-26 18:21:50 +09:00
ousttrue
1a54ed1b2c HeadWorldPosition 2024-11-26 15:58:49 +09:00
ousttrue
7ba7028f03 rename to ClothWarp 2024-11-26 15:38:47 +09:00
ousttrue
c04723fc36 fix GetDelta 2024-11-26 10:12:28 +09:00
ousttrue
f91c94aeb3 TODO 2024-11-26 02:36:54 +09:00
ousttrue
b710a82aff StrandCollisionJob capsule 2024-11-26 02:29:54 +09:00
ousttrue
4f41ed76f4 Cloth x Capsule 2024-11-26 02:09:42 +09:00
ousttrue
a8b998eb2b RotateParticleJobRuntime use ClothRectList 2024-11-25 18:40:23 +09:00
ousttrue
3dee7a4f9d ClothRectList 2024-11-25 16:36:30 +09:00
ousttrue
2c9808b077 remove IRotateParticleSystem.cs 2024-11-25 15:14:49 +09:00
ousttrue
b47ab9abb7 m_useJob 2024-11-25 14:38:25 +09:00
ousttrue
9f96479f16 WeftConstraintJob 2024-11-24 02:33:46 +09:00
ousttrue
fd7f6e47ba cloth collision 2024-11-24 00:49:32 +09:00
ousttrue
42e7819733 WIP cloth 2024-11-23 03:25:41 +09:00
ousttrue
2a6f71df88 index 2024-11-22 21:29:24 +09:00
ousttrue
1970b44cd7 _clothRects 2024-11-22 21:13:52 +09:00
ousttrue
67004592e7 _clothRects 2024-11-22 20:45:44 +09:00
ousttrue
895dba230b struct 2024-11-22 20:33:26 +09:00
ousttrue
9bb914c9b3 SpringConstraint 2024-11-22 20:17:09 +09:00
ousttrue
e79117a3a6 RectCloth.OnDrawGizmosSelected 2024-11-22 19:55:16 +09:00
ousttrue
41cc04a906 BindColumn 2024-11-21 20:38:45 +09:00
ousttrue
3bb9a637b4 bindCell 2024-11-21 19:53:44 +09:00
ousttrue
335beede4b WarpRoot 2024-11-21 15:25:00 +09:00
ousttrue
77ba330ba5 WIP table 2024-11-21 10:57:08 +09:00
ousttrue
2ad810d27d VisualElement 2024-11-21 02:18:46 +09:00
ousttrue
e2674dda41 ParentLengthConstraintJob 2024-11-20 20:57:08 +09:00
ousttrue
423830cc76 Sphere x Sphere 2024-11-20 20:42:39 +09:00
ousttrue
2100a04284 separate 2024-11-20 20:12:37 +09:00
ousttrue
b577c3bb9f WIP collider 2024-11-20 17:12:18 +09:00
ousttrue
d6bd6b5345 schedule 2024-11-20 16:40:35 +09:00
ousttrue
af24f798e5 stiffnessForce 2024-11-20 15:46:40 +09:00
ousttrue
716283dcc0 external 2024-11-20 15:34:17 +09:00
ousttrue
3ba6e82329 SetJointLevel 2024-11-20 15:24:54 +09:00
ousttrue
fbc4f98f9d reset, reconstruct 2024-11-20 14:46:11 +09:00
ousttrue
1824d2a3b7 basic springbone 2024-11-20 14:09:37 +09:00
ousttrue
c8010a86d6 remove not used 2024-11-20 12:31:23 +09:00
ousttrue
47a22c20d2 transforms 2024-11-20 02:40:04 +09:00
ousttrue
23ddea2ebe WIP parent length constraint 2024-11-19 22:15:01 +09:00
ousttrue
aba3114c9d WIP RotateParticleJobSystem 2024-11-19 20:03:27 +09:00
ousttrue
e339e2540b types 2024-11-19 20:03:26 +09:00
ousttrue
a39ed1594b IRotateParticleSystem.InitializeAsync 2024-11-19 20:03:26 +09:00
ousttrue
e78131413c WIP IRotateParticle 2024-11-19 20:03:26 +09:00
ousttrue
b278c3ab85 fix Triangle.GetClosest 2024-11-19 20:03:26 +09:00
ousttrue
57486cdc66 ColliderGroup to VRM10SpringBoneColliderGroup 2024-11-19 20:03:26 +09:00
ousttrue
0732779721 SphereCapsuleCollider to VRM10SpringBoneCollider 2024-11-19 20:03:25 +09:00
ousttrue
a249fc7f37 SphereCapsuleCollider._vrm 2024-11-19 20:03:25 +09:00
ousttrue
f2ad450dd5 HumanoidCollider, ClothGuess 2024-11-19 20:03:25 +09:00
ousttrue
19f8b07702 mv 2024-11-19 20:03:24 +09:00
ousttrue
29474d17c7 InitializeCloth 2024-11-19 20:03:24 +09:00
ousttrue
77188fb148 RotateParticleSystem use Warp 2024-11-19 20:03:24 +09:00
ousttrue
bcf1991259 useInheritSettings 2024-11-19 20:03:24 +09:00
ousttrue
894b00b805 RotateParticleRuntimeProvider 2024-11-19 20:03:23 +09:00
ousttrue
5a0e2be6c6 Converter.FromVrm10 2024-11-19 20:03:23 +09:00
ousttrue
c2b398f0e4 add component Warp and Cloth 2024-11-19 20:03:23 +09:00
ousttrue
9cca2a3c99 RotateParticleSpringboneRuntimeProvider 2024-11-19 20:03:23 +09:00
ousttrue
b0d6087272 RotateParticleSpringboneRuntime 2024-11-19 20:03:23 +09:00
ousttrue
3936ce5efa ClothViewer 2024-11-19 20:03:23 +09:00
ousttrue
bbcb74c4ed init cloth dev 2024-11-19 20:03:22 +09:00
ousttrue
0a3cff43d3
Merge branch 'master' into alpha-mode-warning 2024-11-19 13:43:36 +09:00
ousttrue
c7f311ba1a
Merge branch 'master' into fix-path-error 2024-11-19 13:39:15 +09:00
ousttrue
069ce370fe
Merge branch 'master' into alpha-mode-warning 2024-11-19 13:35:37 +09:00
ousttrue
0c6b99d25f
Merge branch 'master' into fix/spring_reconstruct_logic 2024-11-19 13:33:58 +09:00
ousttrue
c983367f40 update comment 2024-11-19 13:15:55 +09:00
ousttrue
bf9c438f1f use MonoBehaviour.OnValidate 2024-11-19 12:58:52 +09:00
ousttrue
eed18136be _nextTailsBackup 2024-11-19 10:17:30 +09:00
ousttrue
5bda6740ff buffer.BackupCurrentTails を buffer 増減の直前にする 2024-11-19 03:53:34 +09:00
ousttrue
e85d332e56 fix gizmo and assert 2024-11-19 03:41:07 +09:00
ousttrue
a78bf20884 FastSpringBoneBuffer._currentTailsBackup でバックアップ 2024-11-19 03:14:10 +09:00
ousttrue
32e004d821 Editor.OnValidate not work 2024-11-19 01:50:05 +09:00
ousttrue
a8bd641bae fix tailIndex 2024-11-18 16:44:15 +09:00
ousttrue
8e259e20dd comment 2024-11-18 16:38:17 +09:00
ousttrue
84b64c0be2 use spring.transformIndexOffset 2024-11-18 16:30:16 +09:00
ousttrue
ddf438edf7 RootBonesNonNullUnique 2024-11-18 14:18:08 +09:00
ousttrue
270fbae1ac avoid runtime exception. editor warning 2024-11-18 14:05:28 +09:00
Noeri Huisman
6c1ca75674 Don't log warning when alphaMode property is not set on glTFMaterial 2024-11-12 21:06:04 +01:00
Willem-Jan L. van Rootselaar
7fbb2f3bac Fix AnimationClipUtility to use empty string for curve path instead of null 2024-11-12 10:17:47 +01:00
ousttrue
e8017dcf8a copy してから unity version 更新しちゃった。
unity version 更新したのちに copy する必要あり。

Assets\VRM\Editor\Format\VRMSampleCopy.cs:126
2024-11-12 18:17:41 +09:00
ousttrue
a4936617f6 Unlit/Color だと
var index = textureExporter.RegisterExportingAsSRgb(src.mainTexture, false); // GetTexture("_MainTex");

が例外を発生させる。
2024-11-12 17:55:57 +09:00
ousttrue
0bfef39e3c UniVRM-0.128.0
Unity 2022.3.52f1
2024-11-12 16:45:15 +09:00
ousttrue
29d6a0796e
Merge branch 'master' into fix/vrm10_editor 2024-11-12 15:00:05 +09:00
ousttrue
daff196277 上よせ 2024-11-12 14:56:17 +09:00
ousttrue
2d554fbf62 remove comment out 2024-11-12 13:47:05 +09:00
ousttrue
7e0e235147 FastSpringBoneCombinedBuffer.DrawGizmos 2024-11-12 13:47:05 +09:00
ousttrue
6ea8259304 IVrm10SpringBoneRuntime.DrawGizmos 2024-11-12 13:47:05 +09:00
ousttrue
8701fc4af3 OnDrawGizmosSelected 2024-11-12 13:47:05 +09:00
ousttrue
64b18efcd3 spring root は radius が無い。1cm 決め打ち。 2024-11-12 13:47:05 +09:00
ousttrue
41a86297de [1.0] joint gizmo simple 化
- joint は自身のSphere描画をする(radius 取得のみ vrm に問い合わせる)
- vrm は連結Lineの描画をする
2024-11-12 13:47:05 +09:00
ousttrue
d0701c6272
Merge branch 'master' into fix/vrm10_editor 2024-11-11 17:30:24 +09:00
ousttrue
153d3495ef
Merge branch 'master' into fix/skip_no_triangles_topology 2024-11-11 15:01:03 +09:00
ousttrue
2e1a073cf8
Merge branch 'master' into fix/vrm10_editor 2024-11-11 14:50:05 +09:00
ousttrue
e543f1fa9d
Merge branch 'master' into fix/gravitypower_typo 2024-11-11 14:37:33 +09:00
ousttrue
94c5219117 skip topology that is not MeshTopology.Triangles 2024-11-11 13:50:05 +09:00
ousttrue
8798af484a VRM10SpringBoneDrawer のボタン移植 2024-11-09 01:56:05 +09:00
ousttrue
01b34c4b89 update SpringBone editor 2024-11-09 01:42:08 +09:00
ousttrue
11a53c967a Vrm10InstanceEditor 3tabs. VrmInstance, LookAt, SpringBone 2024-11-09 00:37:28 +09:00
ousttrue
83c4cf97c4 typo 2024-11-08 20:36:59 +09:00