Commit Graph

370 Commits

Author SHA1 Message Date
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
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
c9bd20d4d1 UniVRM-0.106.0
Samples~へのコピー発生
2022-10-26 21:38:27 +09:00
ousttrue
b18e5cd63b VRM10Object を作成するステップ
* VRM10Object が無いときにエラー表示
* VRM10Object が無ければ VRM10Instance を停止させる
2022-10-26 14:27:36 +09:00
ousttrue
05a7cda9e1 remove ThisType? field. #1866 2022-10-24 17:56:22 +09:00
ousttrue
d71ed12f2b Editor向け機能の切り分け忘れ 2022-10-07 13:38:12 +09:00
ousttrue
4ca7df4d1c UniVRM-0.105.0.
サンプルの更新があるので差分多めです。XXX_Samples から XXX/Samples~ へのコピーが version 更新のついでに動作します。
2022-10-06 21:31:48 +09:00
ousttrue
85f4e22a98 typo 2022-10-04 17:55:49 +09:00
ousttrue
b0e20b95e4 Revert "typo rename UnityObjectDestoyer to UnityObjectDestroyer"
This reverts commit a8d5704a0f.
2022-10-03 18:09:05 +09:00
ousttrue
a8d5704a0f typo rename UnityObjectDestoyer to UnityObjectDestroyer 2022-10-03 17:56:36 +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
e563a33d54 sample 更新あり 2022-09-26 18:09:53 +09:00
Masataka SUMI
9e879e1825 change spec of mtoon10 matcapFactor default value 2022-09-21 18:36:18 +09:00
Masataka SUMI
6f441acbfd Add implementation of matcapFactor 2022-09-21 18:12:44 +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
864607023a UniVRM-0.104.0 2022-09-21 15:38:20 +09:00
Masataka SUMI
627c0e76f2 binary files replaced by lfs tracking 2022-09-20 18:21:51 +09:00
ousttrue
e34e06f98a UniVRM-0.103.2 2022-09-15 13:02:58 +09:00
ousttrue
7d6f835ffe UniVRM-0.103.1 2022-09-13 14:39:40 +09:00
Masataka SUMI
413ed64355 Fix a importing error when the model using KHR_texture_basisu extension. 2022-09-12 22:11:48 +09:00
ousttrue
b3a0cb3336
Merge pull request #1773 from ousttrue/version/v0_103_0
UniVRM-0.103.0
2022-09-08 18:07:01 +09:00
Takayuki Matsuoka
a68d0122ce BREAKING CHANGE: Introduce NextFrameIfTimedOut as a new interface method of IAwaitCaller
This is a breaking change since it introduces new interface method to IAwaitCaller.

----

NextFrameIfTimedOut() is added to IAwaitCaller.  The following inheritors also introduce the method.

- ImmediateCaller.NextFrameIfTimedOut() just invokes NextFrame().
- RuntimeOnlyAwaitCaller.NextFrameIfTimedOut() invokes NextFrame() if timed out.  Otherwise, do nothing.
- RuntimeOnlyNoThreadAwaitCaller.NextFrameIfTimedOut() works same as RuntimeOnlyAwaitCaller.

Constructor of RuntimeOnlyAwaitCaller and RuntimeOnlyNoThreadAwaitCaller
now take argument of timeout in seconds.  The default value is 1/1000 (1 milliseconds).

See also:
https://github.com/vrm-c/UniVRM/pull/1781#pullrequestreview-1100131840
2022-09-08 17:39:05 +09:00
Takayuki Matsuoka
935afcb80d Add new pseudo method NextFrameIfTimedOut to RuntimeOnlyAwaitCaller
This change adds (pseudo) method RuntimeOnlyAwaitCaller.NextFrameIfTimedOut()
which invokes NextFrame() if given time is elapsed.  Otherwise, it does nothing.

We'll be able to utilize this (pseudo) method to ease possible cause of spikes.

For example:

----
public class VRMImporterContext : ImporterContext {
  protected override async Task OnLoadHierarchy(IAwaitCaller awaitCaller, ...) {
    ...
    var blendShapeList = VRM.blendShapeMaster.blendShapeGroups;
    if (blendShapeList != null && blendShapeList.Count > 0) {
      foreach (var x in blendShapeList) {
        await awaitCaller.NextFrameIfTimeout();
        BlendShapeAvatar.Clips.Add(await LoadBlendShapeBind(awaitCaller, x, transformMeshTable));
      }
    }
    ...
  }
}
----

Note that this change doesn't add NextFrameIfTimeout() to IAwaitCaller to avoid
breaking change.  This limitation introduces extra (maybe unnecessarily) complexity.
2022-09-07 17:51:10 +09:00
ousttrue
32f03781e4 UniVRM-0.103.0 2022-09-07 14:33:52 +09:00
ousttrue
41e8628ae8
Merge pull request #1765 from ousttrue/fix/use_optional_for_index
glTFTexture.source type to int?
2022-09-05 19:05:26 +09:00
ousttrue
4e6f66e5d9
Merge pull request #1756 from vrm-c/webgl_build
WebGLの動作確認
2022-08-30 20:00:01 +09:00
ousttrue
f2d587e09f glTFTexture.source type to int? 2022-08-05 21:13:32 +09:00
mkc1370
fbf2b24519 fix missing commit 2022-08-02 18:07:32 +09:00
mkc1370
24a32d3397 Add unity official module dependencies 2022-08-02 12:38:25 +09:00
ousttrue
1ca7a8684d WebGLの動作確認用 2022-07-26 14:30:51 +09:00
ousttrue
f3487badb7 UniVRM-0.102.1 2022-07-21 17:12:09 +09:00
ousttrue
3c3587a5f9 UniVRM-0.102.0 2022-07-14 15:56:53 +09:00
ousttrue
35359a6dc3 add GltfValidator test 2022-07-11 16:04:59 +09:00
ousttrue
6aa92e8898 UniVRM-0.101.0 2022-06-29 13:17:13 +09:00
ousttrue
1e26e1fe4b UniVRM-0.100.1 2022-06-17 15:36:01 +09:00
ousttrue
530ec709bf UniVRM-0.100.0 2022-06-10 17:19:51 +09:00
ousttrue
c0d7869258 より上流で防御
* Vector には Color も入っているぽい(Vector4 と Colorは実質同じ)
* Texture が無いときにも OffsetScale が入っているケースがある
2022-06-08 17:42:31 +09:00
ousttrue
b90c5026a6 unity-2021 では SetVector により offset, scale をセットするとエラー Property PROP_NAME already exists in the property sheet with a different type: 5 が発生する。 2022-06-07 17:37:07 +09:00
ousttrue
f6e62dea9a readonly struct なので null を返して失敗を表現できない。throw してたのだけど、順次 TryGet に変えてく。 2022-06-03 15:48:26 +09:00
ousttrue
52d0ae691d Test追加。Application.dataPath のひとつ上が AssetDatabase の root になる。 2022-06-02 18:41:17 +09:00
ousttrue
de8d65cb5d public string FullPath { get; }. 末尾に '/' を付けない仕様を追加 2022-06-02 18:31:17 +09:00
ousttrue
13dab3aa34 public readonly string FullPath { get; } 2022-06-02 18:14:53 +09:00
ousttrue
7030a4ddf4 VRMShaders.PathObject を追加。 MigrationMenu で使う。 2022-06-02 17:56:36 +09:00
ousttrue
866d1883c7 未使用概念 PreShaderPropExporter を削除 2022-06-02 15:26:17 +09:00