Commit Graph

397 Commits

Author SHA1 Message Date
ousttrue
03bb4201bf enabled = false. not updateWhenOffscreen 2021-09-28 16:54:34 +09:00
ousttrue
68094b54aa Rename to UniUnlitUtil and Use UniUnlitUtil.ShaderName 2021-09-27 21:01:10 +09:00
Masataka SUMI
5bfb052997 Make fog work. 2021-09-21 17:16:56 +09:00
ousttrue
7d98ff15f9 UniVRM-0.84.0 2021-09-17 17:38:18 +09:00
ousttrue
9b58179447 UniVRM-0.83.0 2021-09-10 12:34:50 +09:00
ousttrue
178fefb838 Hidden/UniGLTF/StandardMapExporter 2021-09-09 18:46:57 +09:00
Masataka SUMI
4bd88b907b mv texture convert shaders to VRMShaders 2021-09-09 14:46:32 +09:00
Masataka SUMI
f874a4d973 mv UniUnlit to Resources 2021-09-09 14:46:08 +09:00
ousttrue
672e11e3ce 不完全な TaskCaller 削除。デフォルトは、ImmediateCaller とする。 2021-09-08 15:28:35 +09:00
ousttrue
da05ff6ba8 UniVRM-0.82.1 2021-09-03 15:58:52 +09:00
ousttrue
772a3d357c Error Message 2021-09-01 16:12:33 +09:00
ousttrue
d6cab51b2e UniVRM-0.82.0 2021-09-01 15:43:44 +09:00
ousttrue
512727467a SubAsset の Material の状態を変更してしまうためよろしくない(状態不明) 2021-08-25 16:43:14 +09:00
ousttrue
ed332248b7 SubAssetでもモードを変えて中を見れる 2021-08-24 21:04:31 +09:00
ousttrue
8e51cef38f UniVRM-0.81.0
* rename com.vrmc.unigltf to com.vrmc.gltf
* and reversion. com.vrmc.gltf use same version with vrm
2021-08-19 18:49:08 +09:00
ousttrue
54d2e967e5 mv VRM10.Samples to VRM10/Samples
* StreamingAssets 移動
* BVH load 調整
2021-08-18 18:19:14 +09:00
ousttrue
cb5a30d683 update VersionMenu
* vrm-1 の更新忘れてた
* samples 追加
2021-08-18 18:04:18 +09:00
ousttrue
214cc64437 add [HDR] 2021-08-13 13:21:39 +09:00
ousttrue
a2b7e34ff5 UniVRM-0.80.0 2021-08-11 20:02:05 +09:00
ousttrue
cc89cb104c update JsonSchema to VRM-1.0beta 2021-08-06 16:27:50 +09:00
Masataka SUMI
36e7d1ef98 remove duplicated 2021-08-04 23:35:48 +09:00
Masataka SUMI
58b2588f2d Use GUID in asmdefs 2021-08-04 15:19:09 +09:00
Masataka SUMI
21a5f4e315 Make asmdef's auto-referenced true. 2021-07-19 16:15:35 +09:00
ousttrue
b3017166a4 UniVRM-0.79.0 2021-07-19 12:06:18 +09:00
Masataka SUMI
8e0322aa70 fix direcitonal light attenuation multiply. 2021-07-15 19:57:43 +09:00
Masataka SUMI
1549db1a81 fix pbr correct mode. 2021-07-15 19:57:21 +09:00
Masataka SUMI
eb532c4aa6 Add Pbr Correct mode. 2021-07-15 19:47:22 +09:00
Masataka SUMI
3cb5d97c44 fix outline normal 2021-07-15 19:44:06 +09:00
Masataka SUMI
93d4507db7 Add Shade & Toony presets. 2021-07-15 19:16:02 +09:00
Masataka SUMI
23a50ae7b3 Add migration Tests 2021-07-15 19:05:51 +09:00
Masataka SUMI
f71e1fbbce Add EditMode 2021-07-15 18:05:34 +09:00
Masataka SUMI
8c661736cd Rename MToon10 2021-07-15 16:35:59 +09:00
ousttrue
fa460f0031 JsonSchema を更新してコードを再生成した
https://github.com/vrm-c/vrm-specification/pull/296
2021-07-02 19:57:37 +09:00
Masataka SUMI
70c01d5344 AnimationClip import with AnimationClipFactory 2021-06-29 21:02:19 +09:00
Masataka SUMI
6072a879d2 Add comment 2021-06-24 22:04:12 +09:00
Masataka SUMI
02455ef51d TextureDeserializer can await. 2021-06-24 22:03:46 +09:00
ousttrue
0b575c43d2
Merge pull request #1072 from Santarh/exportTexturesWithoutAlpha
Export textures with alpha channel only if necessary
2021-06-24 15:43:15 +09:00
Masataka SUMI
2ad014f11c Rename 2021-06-24 15:13:05 +09:00
Masataka SUMI
c9d513e409 Correct Metallic-Roughness Conversion condition 2021-06-23 23:42:37 +09:00
Masataka SUMI
fbd885c67c Export texture's alpha if only necessary. 2021-06-23 23:04:16 +09:00
Masataka SUMI
8833925d71 Remove unused define 2021-06-23 21:57:49 +09:00
Masataka SUMI
186609639a fix a bug. Outline Width Texture doesn't reference uv correctly. 2021-06-23 21:57:02 +09:00
Masataka SUMI
61843ccadd Apply emissionColor if emissionMap was none. 2021-06-23 20:38:40 +09:00
Masataka SUMI
e0d561af37 Don't use multi_compile_local (because 2019.1 or later function...) 2021-06-23 20:32:07 +09:00
PoChang007
851b9432d7
Merge pull request #1067 from ousttrue/version/v0_78_0
UniVRM-0.78.0
2021-06-23 13:11:44 +09:00
ousttrue
0d0471535a UniVRM-0.78.0 2021-06-23 13:05:19 +09:00
Masataka SUMI
2fa03bbcdd Merge branch 'master' of https://github.com/vrm-c/UniVRM into legacyMigration 2021-06-22 20:03:26 +09:00
Masataka SUMI
c3775ca15f Add migration code about legacy roughness texture behaviour. 2021-06-22 19:59:59 +09:00
Masataka SUMI
95dd4fd2fc Remove unused 2021-06-22 19:49:27 +09:00
Masataka SUMI
3ac8d19b86 public textureDeserializer 2021-06-22 19:49:00 +09:00
ousttrue
21d0ce714e RemapEditorBase に externalObjectMap を保持しない 2021-06-21 14:15:48 +09:00
ousttrue
8541b5c036 UniVRM-0.77.0 2021-06-16 19:03:40 +09:00
Masataka SUMI
50383c3483 Disable auto-referenced in asmdefs 2021-06-15 18:00:27 +09:00
Masataka SUMI
3102822312 Update submodule MToon 2021-06-15 17:42:25 +09:00
Masataka SUMI
66e3e3b84c refactoring about alpha 2021-06-14 20:05:12 +09:00
ousttrue
611da973e5
Merge pull request #1024 from Santarh/mtoon3
Use MToon10 in VRM1.0 implementation.
2021-06-14 12:43:10 +09:00
Masataka SUMI
ecf684722a follow 0.x lighting behaviour in mtoon 1.0 2021-06-11 21:45:13 +09:00
Masataka SUMI
48842419d0 Consider back-face normal. 2021-06-11 18:09:32 +09:00
Masataka SUMI
5aa8c696a9 remove unused 2021-06-10 21:40:08 +09:00
Masataka SUMI
735cfbe1f3 emissive factor is zero if pass was forward add 2021-06-10 21:36:46 +09:00
Masataka SUMI
aac55f605a fix view vector is zero 2021-06-10 21:34:01 +09:00
ousttrue
612a59cba7 TakeResponsibilityForDestroyObjectFunc の返り値削除
GameObject(prefab root)の移譲の判定にしか使っていなかった。設計変更で不要になった
2021-06-10 20:39:13 +09:00
ousttrue
a17c789a02 ImporterContext.LoadAsync が UnityObjectManager を戻すようにインタフェースを変更 2021-06-10 20:39:12 +09:00
ousttrue
3b1f3fb52c add SubAssetKey to TakeResponsibilityForDestroyObjectFunc 2021-06-10 20:39:11 +09:00
ousttrue
6268ec803b IResponsibilityForDestroyObjects 2021-06-10 20:39:11 +09:00
Masataka SUMI
2dd31517e2 use MToon10 in VRM10 import/export 2021-06-10 20:23:42 +09:00
Masataka SUMI
95042d2ce0 mv 2021-06-10 15:58:53 +09:00
Masataka SUMI
b2fe35739c mv 2021-06-10 15:47:10 +09:00
Masataka SUMI
aa803d3edc mv namespace 2021-06-10 15:27:04 +09:00
Masataka SUMI
45b7b3e7de Add migration mtoon10 2021-06-10 15:20:13 +09:00
Masataka SUMI
bff1fd17b9 add meta 2021-06-10 15:19:09 +09:00
Masataka SUMI
21503aec8a mv class to runtime 2021-06-10 15:19:00 +09:00
ousttrue
9f3cbfc1f4
Merge pull request #1015 from Santarh/mtoon2
Implements vrmc_materials_mtoon inspector
2021-06-09 11:55:36 +09:00
Masataka SUMI
33198c7e51 Fill inspector gui 2021-06-08 20:21:49 +09:00
Masataka SUMI
0462b05678 Suppress outline visibility 2021-06-08 16:14:19 +09:00
Masataka SUMI
f5d8eaf571 fix outline variants 2021-06-08 14:51:36 +09:00
Masataka SUMI
141f317c9e fix rim variant 2021-06-08 14:17:09 +09:00
PoChang007
4b8cccde0e
Merge pull request #1012 from ousttrue/version/v0_76_0
UniVRM-0.76.0
2021-06-07 21:05:22 +09:00
ousttrue
79af87b3bd
Merge pull request #1003 from Santarh/mtoonDefine
Implements vrmc_materials_mtoon shader code
2021-06-07 20:57:54 +09:00
ousttrue
dc2c8c5703 大文字修正。const 使う 2021-06-07 20:47:23 +09:00
Masataka SUMI
1f2cc762b7 fix 2021-06-07 20:44:08 +09:00
ousttrue
54893c343e UniVRM-0.76.0 2021-06-07 20:37:42 +09:00
ousttrue
2e659da9da 古いシェーダー名をフォールバック #1004 2021-06-07 20:34:16 +09:00
Masataka SUMI
d700b393ff Suppress variants. 2021-06-07 20:33:01 +09:00
Masataka SUMI
ccbc53d0d8 Suppress TextureFetch if not needed. 2021-06-07 20:11:00 +09:00
Masataka SUMI
977482df90 Disable unnecessary shader variants/ 2021-06-07 20:10:20 +09:00
Masataka SUMI
c81e4c275a add outline pass 2021-06-04 21:21:04 +09:00
ousttrue
c7dfb001a2 空になった VrmUnlitShaders フォルダを削除。 Resources を減らし
* UniUnlit/Resources/UniUnlit.shader を UniUnlit/Runtime/UniUnlit.shader に移動
* UniGLTF/Resources/Shaders/xxx.shader を UniGLTF/IO/TextureIO/Shaders/xxx.shader に移動
2021-06-03 15:09:08 +09:00
ousttrue
bfb591b711 remove legacy shaders
#496
2021-06-03 14:54:57 +09:00
Masataka SUMI
598e3d7013 Separate GI func 2021-06-02 21:01:41 +09:00
Masataka SUMI
9c089b85ad fix matcap uv 2021-06-02 20:54:09 +09:00
Masataka SUMI
fd52ae2af4 Refactoring 2021-06-02 20:49:22 +09:00
Masataka SUMI
2b8295d5d4 Separate compile-time define 2021-06-02 20:25:07 +09:00
Masataka SUMI
e6d5b4d653 make function arguments constant. 2021-06-02 20:07:39 +09:00
Masataka SUMI
f857935bbd Separate functions 2021-06-02 19:31:54 +09:00
Masataka SUMI
0182e974bf follow mtoon0.x 2021-06-02 15:58:05 +09:00
Masataka SUMI
485c43efe6 implements lighting & emission. 2021-06-01 19:21:28 +09:00
Masataka SUMI
d25eb746df Fix alpha source 2021-05-31 20:21:17 +09:00
Masataka SUMI
44067be1fc Implements basic components of mtoon10. 2021-05-31 20:18:34 +09:00
Masataka SUMI
8ec0bfca40 define MToon10 properties according to schema 2021-05-28 19:24:42 +09:00
Masataka SUMI
09b2d4d326 duplicate MToon10 from MToon 2021-05-28 18:10:59 +09:00
Masataka SUMI
388a7fbc6e Add complex test to MetallicRoughnessConverter 2021-05-27 22:45:21 +09:00
Masataka SUMI
9aee0b1ea3 Implements standard texture importing with shader 2021-05-27 22:27:51 +09:00
Masataka SUMI
06715ab77b fix bug 2021-05-27 22:24:25 +09:00
Masataka SUMI
589d5504a7 Rename normal map exporter 2021-05-27 21:44:09 +09:00
Masataka SUMI
de55fd4637 remove unused 2021-05-27 21:25:26 +09:00
Masataka SUMI
7c9be3cf9e remove debug code 2021-05-27 21:24:46 +09:00
Masataka SUMI
44bced7f3d don't need normal texture conversion when importing 2021-05-27 20:27:11 +09:00
Masataka SUMI
6b6a219d43 use ITextureDeserializer 2021-05-27 20:03:45 +09:00
Masataka SUMI
02e51346f4 define ITextureDeserializer 2021-05-27 18:54:27 +09:00
Masataka SUMI
886311af50 Suppress alpha channel if exporting linear, normal or metallic-roughness texture. 2021-05-27 17:42:57 +09:00
Masataka SUMI
8cba3ba71a mv MaterialImportParam MaterialDescriptor 2021-05-27 15:56:51 +09:00
Masataka SUMI
570cef700d mv TextureImportParam TextureDescriptor 2021-05-27 15:43:57 +09:00
Masataka SUMI
f2495f61b5 mv TextureImportParamSet TextureDescriptorSet 2021-05-27 15:38:40 +09:00
Masataka SUMI
157c7091f7 follow test 2021-05-27 15:35:45 +09:00
Masataka SUMI
86d1dc0db7 rename 2021-05-27 15:16:03 +09:00
Masataka SUMI
b549f54a13 define TextureSet 2021-05-27 15:12:49 +09:00
Masataka SUMI
a6d730d15f Refactor Texture enumeration to TextureSetImport 2021-05-26 21:22:34 +09:00
Masataka SUMI
34e5e4689c Ignore considering gltf external textures 2021-05-25 16:43:47 +09:00
Masataka SUMI
b7593254d9 Strict SubAssetKey constructor 2021-05-25 15:44:20 +09:00
Masataka SUMI
effc63255c remove debug 2021-05-25 14:56:08 +09:00
Masataka SUMI
709fe25783 SubAssetKey の使用を厳格化 2021-05-24 23:28:43 +09:00
Masataka SUMI
9cd3288e4d mv SubAssetKey 2021-05-24 20:12:19 +09:00
ousttrue
b75453db83 CopyFromNonReadableSRgbDds をシンプル化
Nvidia と Radeon で動作が異なる?
2021-05-24 18:52:57 +09:00
ousttrue
152e9c8a15 UniVRM-0.75.0 2021-05-24 17:58:16 +09:00
ousttrue
bd3209cc1b
Merge pull request #970 from Santarh/throwTeim
Throw not supported texture types
2021-05-24 17:00:44 +09:00
Masataka SUMI
9614f7eb56 Throw not supported texture types 2021-05-24 16:44:56 +09:00
ousttrue
7c6d77fb02 fix default 2021-05-24 16:40:08 +09:00
ousttrue
207b4e1a6a コミット漏れと mipmapCount 2021-05-24 15:53:47 +09:00
ousttrue
78a3b02189 共通コードをくくり出し 2021-05-24 15:33:21 +09:00
ousttrue
fdd46b4de3 new Texture2D(mipmap) 2021-05-24 15:02:38 +09:00
ousttrue
df45b69521 TextureSamplerUtil の整理 2021-05-24 14:36:27 +09:00
Masataka SUMI
9fcd2abc58 Force copy texture if texture type was "Normal map". 2021-05-21 20:51:13 +09:00
Masataka SUMI
c142e670bd Check Editor NormalMap. 2021-05-21 20:01:08 +09:00
Masataka SUMI
d61fc7339e fix bug 2021-05-21 19:15:37 +09:00
Masataka SUMI
cb3d43add1 Don't export raw file if texture color space was different. 2021-05-21 19:00:03 +09:00
Masataka SUMI
18a6aaad64 Rename, comment 2021-05-21 18:12:40 +09:00
Masataka SUMI
9194c772a3 Consider colorspace 2021-05-21 18:12:21 +09:00
ousttrue
95cb9da77e SamplerParam.WrapModes を WrapModesU と WrapModesV に展開 2021-05-21 13:08:09 +09:00
Masataka SUMI
82106f6c64 Rename, Comment 2021-05-20 21:24:30 +09:00
Masataka SUMI
21bcd140f8 たとえ同じ Texture インスタンスであっても、glTF のプロパティが要求する色空間が違えば別のテクスチャとして出力する 2021-05-20 21:04:09 +09:00
Masataka SUMI
ef929de895 rename & use interface 2021-05-20 20:55:51 +09:00
Masataka SUMI
7963c4fe5c make enum private 2021-05-20 20:42:17 +09:00
Masataka SUMI
1d6f58feb5 define interface 2021-05-20 20:00:16 +09:00
Masataka SUMI
22f4c5ce5e comment 2021-05-20 19:58:08 +09:00
Masataka SUMI
275ac63080 Check export texture in editor 2021-05-20 19:57:55 +09:00
Masataka SUMI
f88e8d7286 Refactoring Serializing Textures 2021-05-20 18:23:26 +09:00
Masataka SUMI
4f32ccfd52 Add glTF PBR Material color space test. 2021-05-19 20:12:46 +09:00
Masataka SUMI
ce9129749f Add principle texture colorspace tests. 2021-05-19 18:08:24 +09:00
Masataka SUMI
d89dca1e47 mv texture 2021-05-19 17:27:48 +09:00
Masataka SUMI
257b5d71e2 Add comments. 2021-05-13 21:24:26 +09:00
Masataka SUMI
099a4600c1 Add CopyTexture Tests. 2021-05-13 21:13:34 +09:00
Masataka SUMI
2e338a78e9 Don't Compress texture for UnitTests. 2021-05-13 21:00:56 +09:00
Masataka SUMI
b8f2d37ccf Export Texture with specified Color Space. 2021-05-13 20:57:35 +09:00
Masataka SUMI
72a922ded9 Divide ColorSpace enum 2021-05-13 19:20:38 +09:00
Masataka SUMI
7ad3ab8132 Throw Exception if exporting non-readable Texture2D. 2021-05-13 18:36:25 +09:00
Masataka SUMI
d44b43baae remove GL.sRGBWrite 2021-05-13 17:41:54 +09:00
Masataka SUMI
d9bde2ff57 Import MToon textures. 2021-05-10 20:59:51 +09:00
Masataka SUMI
537cfe55be Add RenderQueue to MaterialImportParam 2021-05-10 19:59:19 +09:00
ousttrue
1e77f7cfa8 UniVRM-0.74.0 2021-05-10 14:44:06 +09:00
Masataka SUMI
65973e2a6e Can import TextureImportTypes.Linear. 2021-05-07 22:04:53 +09:00
Masataka SUMI
02bd1fe6b2 Generate format and serializer/deserializer. 2021-05-06 18:59:50 +09:00
ousttrue
c8232789ff UniVRM-0.73.0 2021-04-21 18:25:42 +09:00
ousttrue
1582cd1c24 TextureImporterConfigurator を VRMShaders.GLTF.IO.Editor に移動 2021-04-19 15:13:15 +09:00
Masataka SUMI
35d29e5131 Add MToon directory meta file 2021-04-16 20:13:55 +09:00
Masataka SUMI
a0fa64493a Add MToon submodule in new directory. 2021-04-16 19:56:09 +09:00
Masataka SUMI
3858a69b63 Remove old mtoon 2021-04-16 19:53:25 +09:00
ousttrue
aedfe98974 mod TextureImportName.GetExtractName to GetUnityObjectName 2021-04-14 20:09:30 +09:00
ousttrue
60174491c4 TextureImportName の使っていないところを削除 2021-04-14 20:05:08 +09:00
ousttrue
46605091ac GC 2021-04-14 20:04:41 +09:00
ousttrue
66a7cfc768 TextureImportParam の GltfName, ConvertedName を UnityObjectName に単純化 2021-04-14 16:41:15 +09:00
ousttrue
03c0ad69c6 HashSet<SubAssetKey> 2021-04-14 14:25:21 +09:00
ousttrue
6977424196
Merge pull request #863 from ousttrue/fix/do_not_use_resources
GetBytesWithMime を VRMShaders に移動
2021-04-12 18:42:46 +09:00
ousttrue
f43811702e UniVRM-0.72.0 2021-04-12 18:19:14 +09:00
ousttrue
e35bc5f2fe GetBytesWithMime を VRMShaders に移動
* UniGLTF.GltfTextureExporter.GetBytesWithMime を VRMShaders.AssetTextureUtil.GetTextureBytesWithMime に移動
* テスト NotReadable, Compressed を VRMShaders に移動
* テスト用リソース Resources/4x4.png と 4x4compressed.DDS を VRMShaders に移動
2021-04-12 18:17:24 +09:00
ousttrue
4bf461a226 Vrm10Exporter.ExportMeta 2021-04-09 16:54:50 +09:00
Masataka SUMI
23082ad43a follow gitmodules & mv mtoon submodule files 2021-04-09 15:50:18 +09:00
ousttrue
bbb5b0384c 2018仕様に修正 2021-04-08 21:12:17 +09:00
Masataka SUMI
71fb834364 refactoring vrm shaders asmdef 2021-04-08 20:59:43 +09:00
Masataka SUMI
8eaceb6c8e Refactoring VRMShaders directory & asmdef 2021-04-08 20:19:37 +09:00
ousttrue
b51216a96b includePlatforms is only Editor 2021-04-05 13:35:33 +09:00
ousttrue
84f6e95752 update MToon-3.6 2021-04-05 13:24:47 +09:00
ousttrue
002e8c6060 rename AssetTextureUtil.UseAsset to AssetTextureUtil.IsTextureEditorAsset 2021-04-05 13:15:13 +09:00
ousttrue
27fa5dbc60 VRMShaders.TextureExporter, AssetTextureUtil 2021-04-02 18:35:02 +09:00
ousttrue
7184bf7dee UniVRM-0.71.0 2021-04-02 13:56:52 +09:00
ousttrue
b3b7712b31 param.Sampler.WrapModes != null 2021-04-01 15:15:25 +09:00
PoChang007
db1bfb85c6
Merge pull request #834 from ousttrue/feature/update_texture_test
VRMShaders にテスト移動。IsReadable=false のときにコピーしないとエラーになるテスト
2021-03-31 15:11:08 +09:00
ousttrue
634d467b86 UniVRM-0.70.0 2021-03-31 14:36:40 +09:00
ousttrue
5adce2dbe8 VRMShaders にテスト移動。IsReadable=false のときにコピーしないとエラーになるテスト 2021-03-31 14:34:20 +09:00
ousttrue
270a2d3eed
Merge pull request #830 from ousttrue/feature/vrmshaders_materialfactory
マテリアル生成を VRMShaders に移動
2021-03-29 16:50:16 +09:00
ousttrue
2c3ec107ec MaterialImportParam 2021-03-29 14:39:51 +09:00
amamagi
fabb5f81bb add support for single pass instanced stereo rendering to UniUnlit shader 2021-03-26 19:47:04 +09:00
ousttrue
b421ad7369 VRMShaders.TextureFactory 2021-03-25 20:23:58 +09:00
ousttrue
f2b82200f1 TextureImportParam.ExtractKey 2021-03-25 14:49:56 +09:00
ousttrue
fd198ac10d VRMShaders.{NormalConverter,OcclusionMetallicRoughnessConverter} 2021-03-24 21:00:23 +09:00
ousttrue
d32ca24f8b VRMShaders.TextureConverter 2021-03-24 20:57:41 +09:00
ousttrue
64b97295b5 add TextureImportParam.{Offset,Scale} 2021-03-24 20:32:41 +09:00
ousttrue
aa7fb07b12 rename 2021-03-24 18:38:55 +09:00
ousttrue
e3a830bddb TextureImportParam 2021-03-24 16:44:44 +09:00
ousttrue
b63c165f5d SamplerParam 2021-03-24 16:26:41 +09:00