Commit Graph

197 Commits

Author SHA1 Message Date
thoxey
88588bf111 Adds a new trio of utility classes
These allow for the creation of materialdescriptorgenerators that use the current render pipeline
2023-07-25 12:23:25 +01:00
ousttrue
48ebe7e081
Merge pull request #2064 from ousttrue/fix/broken_springbone_no_throw
springbone の import で throw しない
2023-06-06 13:04:08 +09:00
ousttrue
cd6db6d127 human bone の index が -1 になりうる? 2023-06-05 17:01:32 +09:00
ousttrue
69b952257a VRMSpringUtility.LoadSecondary 関数が throw しないように修正
fix #2023
SpringBone は不完全になるが throw しない。
2023-05-15 13:07:16 +09:00
amamagi
e663091fee feat: Add ITextureDeserializer parameter to Vrm10.LoadXXXAsync() and VrmUtility.LoadXXXAsync() 2023-01-11 11:43:58 +09:00
Masataka SUMI
0a7ac08dac specify a Shader instead of a string in MaterialDescriptor. 2022-12-05 17:21:20 +09:00
Masataka SUMI
3ad42a262e fix 2022-12-05 17:05:21 +09:00
Masataka SUMI
847b2703bc Remove concrete VRM shader's info from UniGLTF. 2022-12-05 17:03:48 +09:00
Masataka SUMI
2f915b4777 Take off responsibility of determining shaders from ImporterContext. 2022-12-05 16:30:43 +09:00
Masataka SUMI
ecebd7b715 Add baseColorFactor migration of older vrm file 2022-11-16 18:32:51 +09:00
Masataka SUMI
77e87eba38 rename vrm material importer class names 2022-11-10 21:38:36 +09:00
Masataka SUMI
bd63c7e14f mv function of importing material name 2022-11-10 21:30:13 +09:00
Masataka SUMI
9f16a268a6 rename 2022-11-10 21:26:02 +09:00
Masataka SUMI
521f0e9871 Merge branch 'master' of https://github.com/vrm-c/UniVRM into fixEmissionColorSpace 2022-11-07 14:14:33 +09:00
Masataka SUMI
6503493438 Migrate materials when importing a VRM 0.x model. 2022-11-04 23:39:57 +09:00
Masataka SUMI
d0d845ab2a Remove supporting legacy vrm shaders. 2022-11-04 21:48:54 +09:00
Masataka SUMI
36e9ca8605 fix directory name cases 2022-11-04 16:28:04 +09:00
Masataka SUMI
6fe4f9ac24 stop inheritance 2022-11-04 16:11:45 +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
Masataka SUMI
f8ac8075e7 use static getter instead of preprocessors. 2022-11-03 20:58:14 +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
8af4eaecf5 Refactoring Material Exporters 2022-11-03 02:01:47 +09:00
ousttrue
c6dcbc9cf4 add MigrateExporter 2022-10-20 13:59:29 +09:00
ousttrue
85f4e22a98 typo 2022-10-04 17:55:49 +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
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
Takayuki Matsuoka
799857bb8b Add IAwaitCaller to VRMImporterContext.LoadFirstPerson
Since we still don't have explicit rule/method to add NextFrameIfTimedOut, this change may seem random.

But we've conducted some benchmarks and profiled them before add these await-s.  These changes ease CPU spikes.
2022-09-14 13:11:23 +09:00
Takayuki Matsuoka
64286d8400 Add IAwaitCaller to VRMImporterContext.LoadBlendShapeMaster
Since VRMImporterContext.LoadBlendShapeMaster may take long time to complete,
change it to async Task method and pass IAwaitCaller as an argument.

This changeset also changes VRMImporterContext.LoadBlendShapeBind.
Because this method has long LINQ chain and we need to split it to ease
its CPU time spike.
2022-09-14 11:09:37 +09:00
Masataka SUMI
0dfa783406 mv CachedEnum namespace to UniGLTF.Utils 2022-09-07 15:59:35 +09:00
Masataka SUMI
29163a43b1 Use CachedEnum 2022-09-07 15:38:02 +09:00
Masataka SUMI
996bc91c93 Rename CacheEnum to CachedEnum 2022-09-07 15:04:23 +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
d974ddfa57 out (SubAssetKey, TextureDescriptor) を 2つの out に展開 2022-09-05 18:41:12 +09:00
ousttrue
2efcf65e60 LoadBytesAsync 2022-08-22 13:00:05 +09:00
ousttrue
f2d587e09f glTFTexture.source type to int? 2022-08-05 21:13:32 +09:00
ousttrue
1ca7a8684d WebGLの動作確認用 2022-07-26 14:30:51 +09:00
ousttrue
ba83d65018 null check 2022-07-14 15:53:14 +09:00
ousttrue
eca75c54a4 ImporterContext.LoadAnimation 2022-06-27 20:39:11 +09:00
ousttrue
933466169f VRMExportSettings.KeepAnimation 2022-06-27 19:20:40 +09:00
ousttrue
d530b0fc6d typo 2022-06-08 17:55:09 +09:00
ousttrue
c0d7869258 より上流で防御
* Vector には Color も入っているぽい(Vector4 と Colorは実質同じ)
* Texture が無いときにも OffsetScale が入っているケースがある
2022-06-08 17:42:31 +09:00
ousttrue
ac19e0d135 PreShaderPropExporter は既に VRM/MToon 専用 2022-06-02 15:12:22 +09:00
ousttrue
8ed88db8df add warning 2022-05-12 16:00:32 +09:00
ousttrue
edcfac499f null だと後続で例外。utility なのでフォールバックさせることにした。 2022-05-12 15:45:17 +09:00
ousttrue
e19ab9808a EditorAnimationExporter 2022-02-28 14:29:56 +09:00