Commit Graph

3220 Commits

Author SHA1 Message Date
Masataka SUMI
6503493438 Migrate materials when importing a VRM 0.x model. 2022-11-04 23:39:57 +09:00
Masataka SUMI
8521e98817 Convert emissiveFactor's color space into gamma with Built-in RP Standard shader. 2022-11-04 22:52:34 +09:00
Masataka SUMI
d0d845ab2a Remove supporting legacy vrm shaders. 2022-11-04 21:48:54 +09:00
Masataka SUMI
da66cf768f Set externalData as initial value. 2022-11-04 21:38:58 +09:00
Masataka SUMI
36e9ca8605 fix directory name cases 2022-11-04 16:28:04 +09:00
Masataka SUMI
b6744a653a Implements fallbacked behaviour. 2022-11-04 16:20:55 +09:00
Masataka SUMI
04c14a2b86 Stop inheritance 2022-11-04 16:12:22 +09:00
Masataka SUMI
6fe4f9ac24 stop inheritance 2022-11-04 16:11:45 +09:00
Masataka SUMI
907ecf74bd suppress unnecessary diffs 2022-11-04 16:06:33 +09:00
Masataka SUMI
28f7045418 format directory structure about VRM10 material io 2022-11-04 15:50:42 +09:00
Masataka SUMI
1ff83272de format directory structure about VRM material IO 2022-11-04 15:45:05 +09:00
Masataka SUMI
77272ac6e7 rename glTF material exporters 2022-11-04 15:37:52 +09:00
Masataka SUMI
326bdf9efc Merge branch 'master' of https://github.com/vrm-c/UniVRM into refactorMaterialExporter 2022-11-04 14:28:16 +09:00
ousttrue
1ca2d14100
Merge pull request #1904 from Santarh/suppressPreprocessor
Use static getter instead of preprocessors.
2022-11-04 14:06:37 +09:00
ousttrue
bc2131a3f1
Merge pull request #1903 from Santarh/thumbFIx
Consider thumbnail image's mimeType when loading the VRM 1.0 model.
2022-11-04 14:00:47 +09:00
Masataka SUMI
f8ac8075e7 use static getter instead of preprocessors. 2022-11-03 20:58:14 +09:00
mkc1370
5043781ebf Added support for paths within editable Packages to UnityPath 2022-11-03 20:20:46 +09:00
Masataka SUMI
fd293b5f4c fix 2022-11-03 18:34:13 +09:00
Masataka SUMI
29c4686af4 Suppress warning logs when loading vrm10 models. 2022-11-03 18:30:09 +09:00
Masataka SUMI
dbdb147e2a Consider thumbnail image's mimeType when loading the vrm10 model. 2022-11-03 18:27:13 +09:00
Masataka SUMI
5dbb9c25ab meta update 2022-11-03 17:44:28 +09:00
Masataka SUMI
0255f17ca5 Remove warning code & suppress file size in Resources 2022-11-03 17:40:58 +09:00
Masataka SUMI
7a0745b5cd Remove Obsolete method 2022-11-03 17:33:16 +09:00
Masataka SUMI
6446b7b0fa mv 2022-11-03 02:14:31 +09:00
Masataka SUMI
9f8459653d follow 2022-11-03 02:02:08 +09:00
Masataka SUMI
8af4eaecf5 Refactoring Material Exporters 2022-11-03 02:01:47 +09:00
Masataka SUMI
18b9b1a285 mv Built-in RP's Importer code. 2022-11-02 23:56:38 +09:00
Masataka SUMI
4bb04ff317 Update MToon to v3.9 2022-11-02 18:13:22 +09:00
notargs
359a308e09 Merge remote-tracking branch 'upstream/master' into fix_rimlight_nan 2022-11-02 17:32:34 +09:00
notargs
6b02280c19 RimLightの計算時にNaNが紛れ込む問題を修正 2022-11-02 17:32:17 +09:00
ousttrue
21425fd5cf ビルドエラーを修正 2022-10-27 15:39:34 +09:00
ousttrue
04622046b9
Merge pull request #1892 from ousttrue/fix10/ShaderVariants
ShaderVariant
2022-10-27 15:18:47 +09:00
ousttrue
79dd54ef8f ShaderVariant 2022-10-27 15:10:47 +09:00
ousttrue
f7696a3fd5
Merge pull request #1887 from mkc1370/feature/preview_unsupported_shader
サポートされていないシェーダーが含まれるモデルのプレビューをできるように
2022-10-27 14:07:24 +09:00
ousttrue
c9bd20d4d1 UniVRM-0.106.0
Samples~へのコピー発生
2022-10-26 21:38:27 +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
0b5vr
76ebf0ef73
fix: Fix outdated exception message
`UpdateTypes` は `LateUpdate` か `Manual` しかなく、 `None` はこれは `Manual` の変更忘れでしょうか?
2022-10-26 18:48:02 +09:00
ousttrue
1dc3f21572
Merge pull request #1886 from ousttrue/feature/spring_manual_update
[1.0][0.x] SpringBone の手動更新
2022-10-26 17:16:23 +09:00
mkc1370
949265226f Make unsupported shaders visible 2022-10-26 15:56:36 +09:00
ousttrue
917f4e953e prefab は GameObject から得る 2022-10-26 14:27:41 +09:00
ousttrue
43f78eac12 add prefab assignment when asset created 2022-10-26 14:27:41 +09:00
ousttrue
b18e5cd63b VRM10Object を作成するステップ
* VRM10Object が無いときにエラー表示
* VRM10Object が無ければ VRM10Instance を停止させる
2022-10-26 14:27:36 +09:00
ousttrue
f33b8dbb46 ヒューマノイドボーン割り当て補助
1番目の子孫GameObjectがヒューマノイドの子孫であると見做して自動代入(指とか、足など枝分かれしないところの簡易な補助)
2022-10-26 14:24:39 +09:00
ousttrue
b1a545f987 元のスタイルに戻し 2022-10-26 13:31:19 +09:00
ousttrue
f17bac5b03 FastSpringBoneService.ManualUpdate に deltaTime 引き数を追加 2022-10-25 21:52:19 +09:00
ousttrue
11b6689c01 local 変数の使いまわしやめ 2022-10-25 21:50:59 +09:00
ousttrue
f4115cacd2
Merge pull request #1883 from ousttrue/fix/export_no_active
Fix/export no active
2022-10-25 19:38:37 +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
e6f0369eda UnityEngine.Object?. 2022-10-25 16:30:17 +09:00
ousttrue
a334a78f21 deltaTime 2022-10-25 16:17:20 +09:00
ousttrue
5d43f4b79e
Merge pull request #1878 from ousttrue/feature10/migrate_mod
modGltf 引き数を追加
2022-10-25 15:26:56 +09:00
ousttrue
8644aabd1e
Merge pull request #1884 from ousttrue/fix/may_fixed_1866
remove ThisType? field.
2022-10-25 13:05:14 +09:00
ousttrue
5c2d685a32
Merge pull request #1882 from ousttrue/fix/osx_multi_extensions
Fix/osx multi extensions
2022-10-24 21:27:54 +09:00
ousttrue
e1e4bfde78 FastSpringBoneService manual update 2022-10-24 19:12:52 +09:00
0b5vr
7a93206a94 feature: 親指の向き・爪の向きのギズモを更新
ousttrueさんによる元コミット: b2c3d14942
2022-10-24 18:24:54 +09:00
ousttrue
2b8ee17c4e add SpringBoneUpdateType.Manual 2022-10-24 18:11:06 +09:00
ousttrue
05a7cda9e1 remove ThisType? field. #1866 2022-10-24 17:56:22 +09:00
ousttrue
9ab1d15084 Add spring ref to validation 2022-10-24 17:38:59 +09:00
ousttrue
866e75243e get non active 2022-10-24 17:36:56 +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
bf5eee2fba fix EditorUtility.OpenFilePanel 2022-10-24 14:57:55 +09:00
ousttrue
66e993fa5f fix EditorUtility.SaveFilePanel 2022-10-24 14:48:00 +09:00
ousttrue
1b46673aee modGltf 引き数を追加 2022-10-21 19:42:36 +09:00
ousttrue
028cd81c19 未使用削除 2022-10-21 18:57:34 +09:00
ousttrue
938e6f7490 fix picker 2022-10-21 18:47:17 +09:00
ousttrue
f77f0dc6f5 コード整理。SpringBoneEditor を VRM10Window に統合
* 元は Constraint などのエディタもあったのだけど、削った。量が減ったので合体
2022-10-21 17:25:45 +09:00
ousttrue
916e4751c8 WINDOW_TITLE to VRM1.0 Model Editor 2022-10-21 17:10:26 +09:00
ousttrue
61a0a28c93 collider の offset 操作 2022-10-20 19:25:34 +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
b94b035d39 admdef 2022-10-20 15:17:23 +09:00
ousttrue
0a1b55ec1e meta のバリデーション。文言 2022-10-20 15:15:00 +09:00
ousttrue
0f7d2e8f7c rename, namespace 2022-10-20 15:03:11 +09:00
ousttrue
cb906d66cf VRM_BOTH_Samples to VRM_0x_and_10_Samples 2022-10-20 14:53:14 +09:00
ousttrue
c6dcbc9cf4 add MigrateExporter 2022-10-20 13:59:29 +09:00
notargs
a60d199559 不要なデータを削除 2022-10-18 16:37:30 +09:00
ousttrue
c41b985e01
Merge pull request #1858 from zzxiang/fix-warning-as-package
Packageに導入される時の警告を消す
2022-10-18 15:45:09 +09:00
ousttrue
66092a4364 readonly field to get only property 2022-10-18 15:30:42 +09:00
ousttrue
2a992950a6 joint と collider をクリック選択 2022-10-18 15:08:35 +09:00
notargs
dc3b6afd8c SpringBoneに対してグローバルで外力を渡すインターフェースを実装する 2022-10-18 13:16:33 +09:00
ousttrue
2b0d003ab5 TryParseOrDefault が Try してないので関数名を変える意向 2022-10-14 15:42:28 +09:00
ousttrue
d540b04cc4 素直な static type caching 技法になるように書き直し 2022-10-14 15:20:05 +09:00
ousttrue
75e9a82ee8
Merge pull request #1859 from 0b5vr/export-with-meta
feature: add third argument `vrmMeta` to static Vrm10Exporter.Export
2022-10-11 18:37:28 +09:00
0b5vr
8a45292f6c feature: add third argument vrmMeta to static Vrm10Exporter.Export 2022-10-11 18:17:50 +09:00
朱志翔
f98dd19c6f Packageに導入される時の警告を消す
[Issue 1627](https://github.com/vrm-c/UniVRM/issues/1627) のことです。
2022-10-10 10:04:39 +09:00
ousttrue
314fb6d901 UniGLTF_Samples 漏れ 2022-10-07 16:35:15 +09:00
ousttrue
d71ed12f2b Editor向け機能の切り分け忘れ 2022-10-07 13:38:12 +09:00
ousttrue
e9aa9c883e
Merge pull request #1847 from ousttrue/feature10/spring_bone_gizmo
implement Joint gizmo
2022-10-07 13:26:31 +09:00
ousttrue
c92818d106
Merge pull request #1848 from ousttrue/fix10/vertex_buffer_over_write
後から来た方が勝つ
2022-10-07 13:25:42 +09:00
ousttrue
38ef11367b
Merge pull request #1844 from mkc1370/feature/resize_to_reinitialize
Rename Texture2D.Resize to Reinitialize
2022-10-07 13:05:07 +09:00
ousttrue
99f591be05
Merge pull request #1850 from ousttrue/version/v0_105_0
UniVRM-0.105.0
2022-10-07 13:04:19 +09:00
ousttrue
4ca7df4d1c UniVRM-0.105.0.
サンプルの更新があるので差分多めです。XXX_Samples から XXX/Samples~ へのコピーが version 更新のついでに動作します。
2022-10-06 21:31:48 +09:00
ousttrue
0328acea02 後から来た方が勝つ 2022-10-06 21:16:44 +09:00
ousttrue
91a8ef2045 implement Joint gizmo 2022-10-06 21:09:28 +09:00
mkc1370
d6472418c9 rename Texture2D.Resize to Reinitialize 2022-10-05 19:45:40 +09:00
ousttrue
2ec90edf66 Rewrite ??=.
This is cause `CS1525: Invalid expression term '='` in Unity-2019.
#1840
2022-10-05 14:47:54 +09:00
ousttrue
f2a4480af2
Merge pull request #1822 from matsutaka-pxv/add-nextframeiftimedout-to-time-consuming-loop
Add IAwaitCaller.NextFrameIfTimedOut to time consuming loops
2022-10-04 19:31:07 +09:00
ousttrue
85f4e22a98 typo 2022-10-04 17:55:49 +09:00
ousttrue
903cfde3f4
Merge pull request #1841 from Santarh/uvdir2
Invert UV rotation direction of MToon 1.0 import/export.
2022-10-04 17:03:55 +09:00
Masataka SUMI
64f7c3faaf invert uv rotation direction of mtoon 1.0 2022-10-04 15:47:32 +09:00
ousttrue
6e36862b1c Assets/UniGLTF/Samples~ を追加 2022-10-04 15:07:58 +09:00
ousttrue
b0e20b95e4 Revert "typo rename UnityObjectDestoyer to UnityObjectDestroyer"
This reverts commit a8d5704a0f.
2022-10-03 18:09:05 +09:00
ousttrue
6e377b0543 UpdateControlRigImplicit
v0.104 仕様の ControlRig 例
2022-10-03 18:06:40 +09:00
ousttrue
a8d5704a0f typo rename UnityObjectDestoyer to UnityObjectDestroyer 2022-10-03 17:56:36 +09:00
ousttrue
2c300fd26e VRM10Viewer/VRM10ViewerUI.Loaded を別ファイルに分離 2022-10-03 17:55:27 +09:00
ousttrue
717ff82f1d コード整理
* glb/gltf ロード機能をオミット => GltfViewer を参照
* inner class SimpleViewer.Loaded を別ファイルに分離
* FileDialog を別フォルダに分離
2022-10-03 16:41:21 +09:00
ousttrue
85702ea5b0 GltfViewer 2022-10-03 14:16:17 +09:00
ousttrue
7dd809fe23 UniVRM-0.104.2 2022-09-28 17:49:01 +09:00
Masataka SUMI
04791b36ca Re-added binary files 2022-09-28 16:55:48 +09:00
Masataka SUMI
6a6bf4c157 remove lfs objects 2022-09-28 16:55:35 +09:00
ousttrue
4a9bafbe2b
Merge pull request #1831 from ousttrue/version/v0_104_1
sample 更新あり
2022-09-26 18:33:05 +09:00
ousttrue
e563a33d54 sample 更新あり 2022-09-26 18:09:53 +09:00
ousttrue
ef7c819d36
Merge pull request #1824 from Santarh/migrationMatcap
Fix migration behaviour of matcap.
2022-09-26 18:06:02 +09:00
Masataka SUMI
51f80bde73 Fix uv animation rotation direction of vrm-1.0 2022-09-26 17:34:42 +09:00
Masataka SUMI
5656214f72 Fix uv animation speed unit of vrm-1.0 2022-09-22 21:17:14 +09:00
Masataka SUMI
7c9919ef47 Fix migration behaviour of matcap. 2022-09-22 00:40:45 +09:00
Takayuki Matsuoka
24da2e5c39 Add IAwaitCaller.NextFrameIfTimedOut to time consuming loops
処理の長いループ内に IAwaitCaller.NextFrameIfTimedOut を追加します。

ループ外にProfiler.Begin/EndProfile()がある場合は、ループ内に入れます。
これにより、UnityEngineがループをまたいだBegin/EndProfileに対して
警告を出すのを抑制します。
2022-09-21 19:40:56 +09:00
Masataka SUMI
f74fd1c940 set expression isBinary 2022-09-21 19:24:21 +09:00
Masataka SUMI
3046871a9e Add UV transform expression to seed-san 2022-09-21 19:23:17 +09:00
ousttrue
d54a3d55cf
Merge pull request #1820 from Santarh/matcapFactorFix
follow matcapFactor in material color binding
2022-09-21 19:19:33 +09:00
Masataka SUMI
ec627fba5e follow matcapFactor in material color binding 2022-09-21 19:17:06 +09:00
Masataka SUMI
c7fb04f081 Add a rotation constraint to shoulder bone of seed-san 2022-09-21 18:55:10 +09:00
Masataka SUMI
a0225b2a58 fix seed-san material 2022-09-21 18:36:31 +09:00
Masataka SUMI
9e879e1825 change spec of mtoon10 matcapFactor default value 2022-09-21 18:36:18 +09:00
ousttrue
efac395b1c
Merge pull request #1816 from Santarh/sampleSeed
Add a vrm 1.0 model creation sample of Seed-san
2022-09-21 18:14:58 +09:00
ousttrue
9bd7e3f284
Merge pull request #1817 from Santarh/addMatcapFactor
Add implementation of matcapFactor
2022-09-21 18:14:14 +09:00
Masataka SUMI
6f441acbfd Add implementation of matcapFactor 2022-09-21 18:12:44 +09:00
Masataka SUMI
9a42409c76 Add a vrm 1.0 model creation sample of Seed-san 2022-09-21 17:39:37 +09:00
Masataka SUMI
59b88c3f6e Fix a bug of incorrect pose set when EnforceTPose called 2022-09-21 17:34:31 +09:00
ousttrue
8864846a7f
Merge pull request #1812 from ousttrue/fix10/remove_migration_file_write
Fix10/remove migration file write
2022-09-21 16:38:00 +09:00
ousttrue
4c0b204b17
Merge pull request #1809 from ousttrue/fix/update_sepc
[1.0] format に matcapColor 反映
2022-09-21 16:34:12 +09:00
ousttrue
ea660c68dc
Merge pull request #1803 from Santarh/controlRigOptions
Replace control rig generation option with enum in vrm 1.0
2022-09-21 16:33:24 +09:00
ousttrue
1d22f42e90
Merge pull request #1795 from matsutaka-pxv/add-awaitcaller-to-loadblendshapemaster
Add IAwaitCaller to VRMImporterContext.LoadBlendShapeMaster
2022-09-21 16:23:54 +09:00
Masataka SUMI
7ef5c7be54 remove unnecessary value of ControlRigGenerationOption 2022-09-21 16:22:59 +09:00
ousttrue
ba7cffd8db
Merge pull request #1813 from ousttrue/version/v0_104_0
UniVRM-0.104.0
2022-09-21 15:56:33 +09:00
ousttrue
8ef6e53c4f
Merge pull request #1811 from ousttrue/fix10/version_10
[1.0] update SpecVersion to 1.0
2022-09-21 15:56:23 +09:00
ousttrue
cb24601410
Merge pull request #1810 from ousttrue/fix10/export_capsule_reverse_x
[1.0] SpringBone のカプセルコライダーの座標変換漏れ
2022-09-21 15:56:17 +09:00
ousttrue
f3388bacdc
Merge pull request #1808 from Santarh/lfs
LFS tracking image & 3d model files.
2022-09-21 15:47:47 +09:00
ousttrue
864607023a UniVRM-0.104.0 2022-09-21 15:38:20 +09:00
ousttrue
819eedb957 MigrationVrm 関連を internal に 2022-09-21 15:34:54 +09:00
ousttrue
de3c1b48da デバッグ機能の消し忘れ 2022-09-21 15:25:59 +09:00
ousttrue
4a5cf395bb update SpecVersion to 1.0 2022-09-21 15:16:04 +09:00
ousttrue
4168ae302d SpringBone のカプセルコライダーの座標変換漏れ 2022-09-21 14:13:58 +09:00
ousttrue
dd58eda2ae matcapColor 反映 2022-09-21 13:15:04 +09:00
Takayuki Matsuoka
fe0c3d756d 不要なコード整形を修正
See also:
https://github.com/vrm-c/UniVRM/pull/1795#discussion_r974879279
2022-09-20 23:25:20 +09:00
Takayuki Matsuoka
0029c1cd5f LoadBlendShapeBindの引数順を変更
IAwaitCallerを最後の引数にするように変更

See also :
https://github.com/vrm-c/UniVRM/pull/1795#discussion_r974879093
2022-09-20 23:24:09 +09:00
Masataka SUMI
627c0e76f2 binary files replaced by lfs tracking 2022-09-20 18:21:51 +09:00
ousttrue
ed291eaf0f
Merge pull request #1804 from notargs/update_fastspringbone
FastSpringBoneに対し、末端ボーンへの考慮を追加するオプションを追加
2022-09-20 18:06:43 +09:00