Commit Graph

280 Commits

Author SHA1 Message Date
Masataka SUMI
f1a640be61 Rename 2021-05-26 17:28:08 +09:00
Masataka SUMI
e5d0e927b4 Define IMaterialExporter, IMaterialImporter 2021-05-26 17:19:17 +09:00
Masataka SUMI
5664c7586a mv func about importing texture 2021-05-26 16:31:11 +09:00
ousttrue
c2c7467e12
Merge pull request #975 from ousttrue/fix10/fix_expression_editor
Fix10/fix expression editor
2021-05-25 19:24:14 +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
ousttrue
3e16a2f492 LoadDivided に BlendShape import の実装が無かった 2021-05-25 14:55:35 +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
Masataka SUMI
82106f6c64 Rename, Comment 2021-05-20 21:24:30 +09:00
Masataka SUMI
ef929de895 rename & use interface 2021-05-20 20:55:51 +09:00
Masataka SUMI
f88e8d7286 Refactoring Serializing Textures 2021-05-20 18:23:26 +09:00
ousttrue
67558710d6
Merge pull request #955 from Santarh/exportMtoon10
Implements exporting VRM 1.0 MToon
2021-05-19 16:03:13 +09:00
Masataka SUMI
3f13fdde05 ignore freeze while exportings vrm10 2021-05-18 21:01:19 +09:00
Masataka SUMI
d33b928eeb Implements VRM10 MToon Exporter 2021-05-18 20:40:36 +09:00
Masataka SUMI
44145bc6ca Merge branch 'master' of https://github.com/vrm-c/UniVRM into exportMtoon10 2021-05-18 17:25:07 +09:00
ousttrue
720bb3ed59 WIP aim 2021-05-18 17:01:06 +09:00
Masataka SUMI
2d6adb080c Warning when importing not implemented MToon property. 2021-05-14 17:04:47 +09:00
Masataka SUMI
b8f2d37ccf Export Texture with specified Color Space. 2021-05-13 20:57:35 +09:00
Masataka SUMI
d9bde2ff57 Import MToon textures. 2021-05-10 20:59:51 +09:00
Masataka SUMI
7bf9399710 fix 2021-05-10 20:59:18 +09:00
Masataka SUMI
93d4389d78 Import all MToon properties in VRM 1.0 2021-05-10 20:14:32 +09:00
Masataka SUMI
cd26109977 Rename 2021-05-10 15:58:59 +09:00
Masataka SUMI
c6a0540a53 Import all of VRM10 MToon textures. 2021-05-07 22:05:24 +09:00
Masataka SUMI
e8728845ca Define Vrm10MToon Texture importer 2021-05-07 21:34:01 +09:00
Masataka SUMI
db336970c9 Separate Vrm10 Texture Enumerator 2021-05-07 20:34:01 +09:00
Masataka SUMI
139625f5a6 Specify color space in exporting VRM10 Material. 2021-05-07 19:57:42 +09:00
Masataka SUMI
472fbc8b04 Specify color space in importing VRM10 & migrating VRM0 to VRM10. 2021-05-07 19:31:02 +09:00
ousttrue
3d4b10da12 VRM10SpringBoneColliderGroup の null 防御 2021-05-06 13:45:01 +09:00
ousttrue
9274c84c01 collider group の仕様変更 2021-04-30 14:08:36 +09:00
ousttrue
f5a1c1e537 remove unused Format/NodeCollider 2021-04-30 13:21:36 +09:00
ousttrue
693eb982fa generate cs from JsonSchema 2021-04-30 13:02:58 +09:00
ousttrue
22871e992d
ExpressionAvatar は 独立した ScriptableObject をやめる (#916)
* ExpressionAvatar is MonoBehaviour

* fix controller editor
2021-04-27 15:12:29 +09:00
ousttrue
06559cf188
Feature10/export divided vertex buffer (#913)
* MeshExportUtil

* MeshWriter.ExportMesh implement divided vertex buffer

* MeshImporterDivided

* WIP divided

* conflict restore VertexBuffer
2021-04-26 19:25:39 +09:00
ousttrue
6d6e812f3a null check 2021-04-26 14:07:28 +09:00
ousttrue
74cae0eec7 rename 2021-04-26 13:59:37 +09:00
ousttrue
64077a4ab1 rename 2021-04-26 13:55:06 +09:00
ousttrue
438ccc62db remove not used 2021-04-26 13:43:07 +09:00
ousttrue
948b3d9278 Vrm10Importer 2021-04-26 13:39:56 +09:00
ousttrue
10e44ed8a8 ModelReader, ModelWriter 2021-04-26 13:38:48 +09:00
ousttrue
843fa8fd28 MeshWriter 2021-04-26 13:25:02 +09:00
ousttrue
839f0b27ce MeshReader 2021-04-26 13:12:41 +09:00
ousttrue
e9c94de242 export position constraint 2021-04-23 17:40:23 +09:00
ousttrue
440a8f0e6f VrmExporter.ExportConstraints 2021-04-23 14:43:34 +09:00
ousttrue
e4adfdec88 colliders.Add(nodeIndex); 2021-04-23 13:39:33 +09:00
ousttrue
b636771d24 構築時に meta と expression が ExternalObjectMap を利用する 2021-04-22 17:09:06 +09:00
ousttrue
8c7113bd53 EditorにMetaObjectの参照を表示 2021-04-22 16:41:30 +09:00
ousttrue
366ea016f7 fix primitive.material 2021-04-21 16:44:45 +09:00
ousttrue
b90e781773 mtoon material export 実装 2021-04-21 16:39:22 +09:00
ousttrue
1204d83ddc RuntimeUnityBuilder の VRM部分で、必要な座標変換(x反転)が無かった。
Mesh, Node は、VrmLib.Model を介して座標変換されている。
2021-04-16 19:13:38 +09:00
ousttrue
52f516d443 test 追加. VRMMaterialImporterの interface を調整 2021-04-16 13:24:46 +09:00
ousttrue
36bba50914 Testを追加 2021-04-16 13:14:10 +09:00
ousttrue
b1184e9b0b rename 2021-04-16 12:39:10 +09:00
ousttrue
6ff0e6a34f SpringBoneManager 廃止 2021-04-15 19:45:16 +09:00
ousttrue
a13258785f VRM10SpringBone を SpringBone にした。 2021-04-15 19:26:15 +09:00
ousttrue
596651f551 Merge branch 'master' into feature10/update_jsonschema 2021-04-15 17:50:55 +09:00
ousttrue
99e2ac8a83 vrm-specification を更新して、コードを再生成 2021-04-15 14:50:27 +09:00
ousttrue
ed0cfb1f27
Merge pull request #872 from ousttrue/feature/extract_key
Feature/extract key
2021-04-14 20:12:05 +09:00
ousttrue
aedfe98974 mod TextureImportName.GetExtractName to GetUnityObjectName 2021-04-14 20:09:30 +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
56b7f1ae20 SubAssetKey 2021-04-14 13:50:09 +09:00
ousttrue
ac5662f61f colliderの重複考慮 2021-04-13 20:42:56 +09:00
ousttrue
f79736f0be Model.ToGlb を廃止。Vrm10Exporter.Export を追加 2021-04-12 20:28:37 +09:00
ousttrue
443001957b Model から VRM 情報が除去されたので、ToGlb に追加の引数が必用になった 2021-04-12 20:01:11 +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
3127ace0e1 ExportSpringBone 2021-04-09 17:11:51 +09:00
ousttrue
63dc77e354 WIP ReverseX 2021-04-09 16:55:18 +09:00
ousttrue
37eb014228 fix ExportFirstPerson 2021-04-09 16:55:14 +09:00
ousttrue
5a86d036bf conflict 2021-04-09 16:55:10 +09:00
ousttrue
20af5606a0 ExportFirstPerson 2021-04-09 16:55:05 +09:00
ousttrue
7d15c0bb04 ExportLookAt 2021-04-09 16:55:00 +09:00
ousttrue
50078af9bc ExportExpression 2021-04-09 16:54:55 +09:00
ousttrue
4bf461a226 Vrm10Exporter.ExportMeta 2021-04-09 16:54:50 +09:00
ousttrue
45503b4b31 Vrm10Exporter.Export 2021-04-09 16:54:44 +09:00
ousttrue
a207729d09 Vrm10MaterialExporter 2021-04-09 16:54:34 +09:00
ousttrue
90d6f49c24 Vrm10Exporter.Export 2021-04-09 16:54:27 +09:00
ousttrue
b62c123b66 meta, expressionAvatar, expression の extract を復旧 2021-04-06 15:08:37 +09:00
ousttrue
8784f78ed0 implement MToon 2021-04-01 20:22:27 +09:00
ousttrue
dbc6d45832 Nodes 2021-04-01 15:35:02 +09:00
ousttrue
b3b7712b31 param.Sampler.WrapModes != null 2021-04-01 15:15:25 +09:00
ousttrue
ca559b526e implement Constraint 2021-04-01 15:00:17 +09:00
ousttrue
572354079d implement SpringBone 2021-04-01 14:15:24 +09:00
ousttrue
009fcabba9 implement firstPerson 2021-04-01 13:56:57 +09:00
ousttrue
c3fc7797ec implement LookAt 2021-04-01 13:46:52 +09:00
ousttrue
5df1576a70 implement build meta 2021-04-01 13:37:05 +09:00
ousttrue
4b9a140277 ModelAsset を縮小 2021-04-01 12:16:48 +09:00
ousttrue
fd7f09fece remove RuntimeUnityBuilder.Asset 2021-04-01 12:16:48 +09:00
ousttrue
0b65eebc87 MaterialColorBind, TextureTransformBind 2021-04-01 12:16:47 +09:00
ousttrue
339b2f6f9e MorphTargetBinding 2021-04-01 12:16:47 +09:00
ousttrue
d57cf4c747 expression 2021-04-01 12:16:47 +09:00
ousttrue
9a29eac013 humanoid 2021-04-01 12:16:46 +09:00
ousttrue
ce6090f1d7 LoadGeometryAsync 2021-04-01 12:16:46 +09:00
ousttrue
bf73c96847 Migration 2021-04-01 12:16:46 +09:00
ousttrue
a15b497b85 use Vrm10MToonMaterialImporter 2021-04-01 12:16:45 +09:00
ousttrue
ad62835604 remove Texture and Material from VRM10(use VRMShaders) 2021-04-01 12:16:45 +09:00
ousttrue
c8d90c1adb remove Material and VRM from VrmLib 2021-04-01 12:16:45 +09:00
ousttrue
ce4d393013 Submesh.Material to int 2021-04-01 12:16:45 +09:00
ousttrue
0a11bd1568 WIP Model.Vrm 2021-04-01 12:16:44 +09:00
ousttrue
2336a28067 WIP vrm, material 2021-04-01 12:16:44 +09:00
ousttrue
c789364981 remove MaterialAdapter for import 2021-04-01 12:16:44 +09:00
ousttrue
a8039d46c8 WIP LoadVrm 2021-04-01 12:16:44 +09:00
ousttrue
818453652b WIP ExportVrm 2021-04-01 12:16:43 +09:00
ousttrue
75a12cbe87 remove non used 2021-04-01 12:16:43 +09:00
ousttrue
1c4b0e6392 WIP Vrm10MToonMaterialImporter 2021-04-01 12:16:42 +09:00
ousttrue
d4777e17a4 Vrm10Storage(GltfParser) 2021-04-01 12:16:41 +09:00
ousttrue
8a07b1c4a4 use UniGLTF.IBytesBuffer 2021-04-01 12:16:41 +09:00
ousttrue
06013474cf remove stride 2021-04-01 12:16:41 +09:00
ousttrue
ef6e161d82 remove IVrmExporter 2021-04-01 12:16:41 +09:00
ousttrue
57581467c9 remove IVrmStorage 2021-04-01 12:16:40 +09:00
ousttrue
6116a6cac1 rename 2021-04-01 12:16:40 +09:00
ousttrue
59129af006
Merge pull request #727 from ousttrue/feature10/z_plus_forward
VRM1 は、XYZ_RightUpForward_RH にする
2021-02-19 20:23:36 +09:00
Masataka SUMI
91418e0f7a エラー部分を暫定的に対処 2021-02-18 20:07:58 +09:00
ousttrue
dadf45865c fix sparse export 2021-02-16 18:21:50 +09:00
PoChang007
53f9cb54f5
Merge pull request #722 from ousttrue/feature10/add_surprised
Implemented VrmLib.ExpressionPreset.Surprised
2021-02-03 15:08:15 +09:00
ousttrue
3bbe81e725 new list 2021-02-03 14:05:11 +09:00
ousttrue
e4ad2dda11 Implemented VrmLib.ExpressionPreset.Surprised 2021-02-03 13:58:47 +09:00
Masataka SUMI
d9a8278df9 fix ExpressionPreset conversion problem in migration. 2021-02-01 23:37:55 +09:00
ousttrue
4173d00c9a generate expression
OverrideBlink, OverrideLookAt, OverrideMouth
2021-01-29 16:26:13 +09:00
ousttrue
feff04d3a6 trs 2021-01-28 20:03:19 +09:00
ousttrue
24e16077b5 MigrateExpression 2021-01-28 20:03:18 +09:00
ousttrue
43c46fbf18 fix SpringBoneAdapter.ToGltf 2021-01-27 16:56:29 +09:00
ousttrue
f6babc46e0 fix ApiSampleTests.cs 2021-01-27 16:27:24 +09:00
ousttrue
9b45fb9f72 exclude checkbox 2021-01-22 15:55:55 +09:00
ousttrue
178c51ddec Joint別パラメーターを実装 2021-01-22 15:31:14 +09:00
ousttrue
562b3a771a MigrateSpringBone 2021-01-21 21:51:39 +09:00
ousttrue
564727e0f5 fix 2021-01-20 21:47:38 +09:00
ousttrue
505417a964 merge VrmLib.GLb to UniGLTF.Glb 2021-01-20 18:36:39 +09:00
ousttrue
e05daa1524 WIP SpringBone
* JsonSchema更新
* シリアライザ修正

#635
2021-01-20 18:36:39 +09:00
ousttrue
d53942a7bd merge vrm10
* MeshUtility を UniGLTF 下に移動
* Assets/VRM10 を追加
* JsonSchemaからのコード生成 UniGLTF/Editor/Generator を追加
2021-01-07 13:37:24 +09:00