Commit Graph

329 Commits

Author SHA1 Message Date
Masataka SUMI
c0498fc01d Fix UniUnlit inspector's bug, cull mode was empty. 2019-02-27 22:01:10 +09:00
Masataka SUMI
d49ccd0fe2 Normalize blendshape preview light's intensity. 2019-02-27 19:50:22 +09:00
ousttrue
90be6dc763 glTF.extensions.VRM default value to null
fix for none VRM exporter
2019-02-27 17:28:14 +09:00
AOKI Yuuto
8395eeb31c
Fix typo in obsolete attribute. 2019-02-19 23:52:52 +09:00
yutopp
130f049a43 Fix tests which use hardcoded versions 2019-02-15 19:16:03 +09:00
yutopp
40401538c8 Fix test for VRM.Meta. Now meta fields have default values, thus test was failed... 2019-02-15 19:11:34 +09:00
yutopp
61c3ce2ad0
Merge pull request #194 from dwango/feature/fix_exporter_errors_when_export_VRM_at_first_time
Set a default values to meta fields
2019-02-15 00:15:47 +09:00
yutopp
a2f8042066 Set a default values to meta fields 2019-02-14 20:00:28 +09:00
yutopp
525d7106e5 Bump version to 0.51.0. Support Semver. Add tests 2019-02-14 19:09:37 +09:00
ousttrue
839847e19c Fix null check 2019-02-13 08:35:01 +09:00
ousttrue
0ae38fadb2 Add ImporterContext.UseUniJSONParser. Add Test. Add nullcheck. 2019-02-13 08:35:01 +09:00
ousttrue
a0f23d3739 Add default constructor 2019-02-13 08:35:01 +09:00
ousttrue
aa7a974b8f Add JsonUtilityTest 2019-02-13 08:35:00 +09:00
ousttrue
7c0a3fe5b7 add comment 2019-02-13 08:29:09 +09:00
ousttrue
eef5ff60c8 fix DictionaryDeserializer 2019-02-13 08:24:21 +09:00
ousttrue
0cb031d0ba Separate GenericDeserializer.cs 2019-02-13 08:24:21 +09:00
ousttrue
ba466ff916 Separate GenericConstructor.cs 2019-02-13 08:24:21 +09:00
ousttrue
27d5a453b7 Update MaterialTest for JsonDictionaryValidator.Deserialize 2019-02-13 08:24:21 +09:00
ousttrue
0eff571b60 Add JsonDictionaryDeserializerTest 2019-02-13 08:23:15 +09:00
ousttrue
1ca7c20f49 Add IListTreeItem.ChildCount for optimization of ListTreeNode.Children 2019-02-10 04:56:50 +09:00
ousttrue
08ff5afae8 Refactoring JsonParser
Use ListTreeNode.AddValue to building tree
2019-02-10 02:57:03 +09:00
ousttrue
022308056a Remove unused code 2019-02-10 00:56:20 +09:00
ousttrue
3b1ed6fef9 optimize ListTreeNode Children for large JSON 2019-02-08 22:19:29 +09:00
j-hirose
bfff027bca Metallicマップ設定時にSmoothnessの値を復元するように修正 2019-02-07 16:58:07 +09:00
Nakaji Kohki
5b446a4534 Add README.url 2019-02-05 20:53:44 +09:00
yutopp
3d5545e091 Divide unity packages for asmdef files 2019-02-05 18:22:46 +09:00
yutopp
76bc9427da
Merge pull request #173 from dwango/calc_inverseBindMatrices_if_not_exists
Calculate inverseBindMatrices(Mesh.bindposes) in SkinnedMeshRenderer.…
2019-02-05 17:20:56 +09:00
yutopp
17426ab64a
Merge pull request #177 from dwango/fix_adf_error_VRM_DEVELOP
Fix adf error
2019-02-05 17:16:37 +09:00
ousttrue
722a98d466 Fix adf error 2019-02-05 17:01:04 +09:00
ousttrue
0d8f13e945 add null check 2019-02-05 16:33:23 +09:00
ousttrue
76a78057df fix KeyValue 2019-02-05 16:20:02 +09:00
ousttrue
99a150a146
Merge pull request #171 from dwango/skip_import_in_streamingassets
Skip AssetPostProcessor when file in StreamingAssets folder. #166
2019-02-05 01:25:42 +09:00
ousttrue
cb91f66969 Skip AssetPostProcessor when file in StreamingAssets folder. #166 2019-02-05 00:48:02 +09:00
ousttrue
da27a71538 Calculate inverseBindMatrices(Mesh.bindposes) in SkinnedMeshRenderer.transform local #127 2019-02-04 17:04:31 +09:00
ousttrue
cc9de9111a Fixed IFormatter.KeyValue. All Expression.Compile Removed 2019-02-03 16:44:47 +09:00
ousttrue
a5800d5937 Replace Invoke with GenericInvokeCallFactory 2019-02-02 18:36:37 +09:00
ousttrue
431a53230f Remove Expression from JsonObjectValidator 2019-02-02 18:22:03 +09:00
ousttrue
38a58500c9 Remove Expression from ListTreeNodeDeserializerExtensions 2019-02-02 17:46:25 +09:00
ousttrue
7086512cb8 Use Delegate.CreateDelegate 2019-02-02 17:40:30 +09:00
ousttrue
da562a18c0 Refactor GenericInvokeCallFactory. StaticAction/Func, OpenAction/Func, BindAction/Func 2019-02-02 17:27:28 +09:00
ousttrue
49b57e7ef3 GenericInvokeCallFactory.Create to CreateAction 2019-02-02 16:39:03 +09:00
ousttrue
1e7c340efa
Merge pull request #164 from dwango/work_aot
Reduce Expression.Compile
2019-02-02 15:51:27 +09:00
ousttrue
308008a5ea Remove Expression from JsonEnumValidator 2019-02-02 04:19:08 +09:00
ousttrue
f28c0fc20f Remove Expression from JsonArrayValidator 2019-02-02 04:19:07 +09:00
ousttrue
6268662829 Remove Expression from GenericCast 2019-02-02 04:19:07 +09:00
ousttrue
0a55f6fb29 Generate ConcreteCast 2019-02-02 04:19:07 +09:00
yutopp
48f8f602f5 Rename schemaVersion to specVersion 2019-02-01 20:51:03 +09:00
yutopp
6c2da9704a Add schemaVersion field to VRM extensions 2019-02-01 20:04:00 +09:00
ousttrue
ec9a8da1ce replace expression in FormatterExtensionsSerializer with invoke 2019-02-01 19:28:38 +09:00
yutopp
321dd7ffb2 Now commercialUssageName field in meta is required 2019-02-01 19:09:07 +09:00
yutopp
0eb67ada22 Refactor 2019-02-01 19:04:24 +09:00
yutopp
3321480843 Now sexualUssageName field in meta is required 2019-02-01 19:02:57 +09:00
yutopp
1632e9de40 Now violentUssageName field in meta is required 2019-02-01 18:59:59 +09:00
yutopp
76abf901f1 Now allowedUserName field in meta is required 2019-02-01 18:55:02 +09:00
yutopp
82c6dcf119 Now licenseName field in meta is required 2019-02-01 18:36:01 +09:00
ousttrue
9990021eb7 KeyValue is obsoleted 2019-02-01 17:56:09 +09:00
ousttrue
b6303ea26b Delegate to type specific Action 2019-02-01 17:52:06 +09:00
yutopp
5c3649bb87 Remove an unused file 2019-01-31 23:57:21 +09:00
yutopp
a95466030f Updatete MToon to HEAD(bump version when MToon is released in future) 2019-01-31 23:28:18 +09:00
yutopp
7d90913007 Merge branch 'master' into feature/adf 2019-01-31 22:48:32 +09:00
yutopp
1d0c2d8840 Set 'ExplicitIgnorableItemLength = 0' to glTF elements to export models without errors 2019-01-31 15:31:16 +09:00
yutopp
aa206d4cd9
Prepare a version for next release v0.50 2019-01-29 19:49:27 +09:00
yutopp
aca5888d81 Divide UniJSON from VRM as standalone assembly 2019-01-29 19:34:44 +09:00
yutopp
46bfe19697 Revert shader code which is automatically updated... 2019-01-29 18:13:17 +09:00
yutopp
ad0de15096 Rearrange directory structures to support Assembly Definition Files. Add asmdef files 2019-01-29 18:07:48 +09:00
yutopp
c5155caf12 Comment out unused variables 2019-01-29 14:55:22 +09:00
yutopp
123c695aa8 Use Action instead of Action<Unit> 2019-01-29 14:54:34 +09:00
yutopp
725c8b0abc Comment out unused variables 2019-01-29 14:53:37 +09:00
yutopp
dec76bb520 Comment out unused variables and add notes 2019-01-29 14:51:19 +09:00
yutopp
43af6389ef
Merge pull request #150 from dwango/fix_UNITY_5_symbol
Fix unity 5 symbol
2019-01-28 21:24:04 +09:00
ousttrue
1b213c86bf Fix Unity2018 with Net3.5 error. Remove UNITY_5 symbol check 2019-01-28 21:08:52 +09:00
yutopp
3176c87333 Update MToon to v1.8 2019-01-28 20:43:38 +09:00
yutopp
077a6d8ddb
Merge pull request #145 from dwango/fix_asset_assign_for_avoid_overwrite
Fix asset assign for avoid overwrite
2019-01-28 16:54:07 +09:00
yutopp
f9ea47e9b4
Merge pull request #143 from dwango/fix_same_mesh_but_different_material
Fix same mesh but different material
2019-01-28 16:52:30 +09:00
ousttrue
9da1b3f321 Added GenericCallUtility 2019-01-28 16:12:37 +09:00
ousttrue
7a09b59307 Load and assign VRMBlendShapeProxy.BlendShapeAvatar when importer avoid overwrite #142 2019-01-26 17:19:08 +09:00
ousttrue
fcbea02954 Load Material when importer avoid overwrite #142 2019-01-26 17:10:08 +09:00
ousttrue
1ccef789c4 Fix exporter logic that getting node.mesh index #140 2019-01-26 16:12:10 +09:00
ousttrue
dc1e1dab98 Add test for #140 2019-01-26 15:56:25 +09:00
ousttrue
f7888de0ba Fixed test #140 2019-01-26 15:42:13 +09:00
ousttrue
36b130a8ce Add Test for #140 2019-01-26 15:28:15 +09:00
yutopp
fabeff80d8 Add UniGLTF/UniUnlit to VRMShaders 2019-01-25 16:22:54 +09:00
yutopp
38eea5ff15
Merge pull request #139 from dwango/feature/fix_shaders_for_any_platforms
Fix normal maps are broken on Android(and also iOS) platforms
2019-01-25 15:07:20 +09:00
ousttrue
0205b863d8
Merge pull request #135 from dwango/updateWhenOffscreen_for_firstPerson
Always SkinnedMeshRenderer.updateWhenOffscreen is true for SkinnedMes…
2019-01-24 01:36:35 +09:00
yutopp
885823748a Add comments 2019-01-23 23:59:02 +09:00
yutopp
21dad1497e Remove conditions for WEBGL when exporting normal map textures 2019-01-23 23:51:25 +09:00
yutopp
f5ae88c071 Use tabs instead of spaces. Remove new lines 2019-01-23 22:33:54 +09:00
yutopp
69ff1c7fa9 Switch logics in the shader instead of C#
Co-authored-by: Masataka SUMI <santarh@gmail.com>
Co-authored-by: junichi_hirose <junichi_hirose@dwango.co.jp>
2019-01-23 22:27:34 +09:00
ousttrue
5267c420df Always SkinnedMeshRenderer.updateWhenOffscreen is true for SkinnedMeshRenderer that created by VRMFirstPerson #133 2019-01-23 12:41:45 +09:00
ousttrue
0ce8e6dc73 Remove code using legacy VRMLookAt in exporter 2019-01-22 22:30:40 +09:00
ousttrue
570409cf44 fixed BlendShapeProxy.OnDestroy 2019-01-22 10:24:29 +09:00
ousttrue
6b5edd383d
Merge pull request #131 from dwango/organize_menu
UniGLTF menu to VRM/UniGLTF. UniVRM menu to VRM/UniVRM
2019-01-22 01:17:32 +09:00
ousttrue
d35e42b2c4 UniGLTF menu to VRM/UniGLTF. UniVRM menu to VRM/UniVRM 2019-01-21 16:20:47 +09:00
ousttrue
cef89ad0c1 Fixed IFormatter.Clear that JsonFormatter.Clear dose not called. 2019-01-20 02:18:52 +09:00
yutopp
07b4da51a9 Add deserializer tests 2019-01-18 22:41:56 +09:00
yutopp
d2eff422b9 Fix spec for fields which have indices, add minimum=0 for them 2019-01-18 21:49:54 +09:00
ousttrue
521d3bfcfa
Merge pull request #123 from dwango/feature/fix_schemas_and_use_json_schema_instead_of_to_json
Feature/fix schemas and use json schema instead of to json
2019-01-18 16:15:56 +09:00
yutopp
38a0a7a715 Remove draco related fields to ignore extensions field. Extensions are already checked by 'ExtentionsUsed' field, it is safe to remove 2019-01-17 20:58:58 +09:00
yutopp
c0e2455e0e Add tests for serializer of VRM SecondaryAnimation 2019-01-17 20:34:17 +09:00
yutopp
cef2f3f92a Add tests for serializer of VRM Meta 2019-01-17 20:19:06 +09:00
yutopp
fa72052f03 Add tests for serializer of VRM Material 2019-01-17 20:09:57 +09:00
yutopp
0bbf103beb Add tests for serializer of VRM Humanoid 2019-01-17 20:04:52 +09:00
yutopp
ab6b22af68 Formatting 2019-01-17 19:50:01 +09:00
yutopp
90a12b33ce Add tests for serializer of VRM FirstPerson 2019-01-17 19:45:17 +09:00
yutopp
60544f0f1a Add tests for serializer of VRM BlendShapes 2019-01-17 19:27:44 +09:00
yutopp
d2709ea4fd Change a logic to check draco to a way written in the specification 2019-01-17 19:06:46 +09:00
yutopp
a5ab17049c Add tests for JsonUtility to change deserializer in future 2019-01-17 18:57:09 +09:00
yutopp
120dc42901 Fix a default value of glTFTexture.bufferView (Use 0 intead to save compatibility). 2019-01-17 15:00:16 +09:00
neon-izm
48c1e472ef springbone collider also need to set execution order 2019-01-17 02:03:03 +09:00
neon-izm
aab24b2335 add execution order number (avoid order conflict with vrik) 2019-01-17 01:57:28 +09:00
yutopp
b99a2c39ea Rename variable names. Add exporting pass which using JsonSchema 2019-01-16 18:39:30 +09:00
yutopp
b2e37c60a1 Add tests 2019-01-16 17:40:26 +09:00
yutopp
66d8adc191 Fix validation configs for JsonSchema when converting to glb bytes 2019-01-16 17:40:19 +09:00
yutopp
af1251e036 Add tests 2019-01-16 16:26:00 +09:00
yutopp
029faf2875 Fix typo 2019-01-16 15:14:58 +09:00
yutopp
3516e488f1 Support dependencies of JsonSchema. Fix tests to compare values which using ToJson and using JsonSchema. Restrict valudator 2019-01-16 01:39:18 +09:00
yutopp
da2f7b8490 Add experimental expoter option. Enable error checks for glTF 2019-01-15 17:56:44 +09:00
yutopp
8479c7c9b2 Add a test for glTF components. Fix json schema to export them correctly by using JsonSchema 2019-01-15 16:07:15 +09:00
yutopp
579d5331f5 Fix null errors in JsonArrayValidator 2019-01-11 18:40:49 +09:00
yutopp
32f966ed8c Fix typo. Refactor 2019-01-11 18:40:49 +09:00
yutopp
eef02f7665 JsonSchema supports ExplicitIgnorableItemLength to ignore length of Array/List. Can pass JsonSchemaValidationContext to Serializer optionally 2019-01-11 18:40:49 +09:00
yutopp
12519f26e3 Validator allows empty string 2019-01-11 18:40:49 +09:00
yutopp
4d01aff7e3 Validator checks elements in Array/List. Validator allows Count == 0 2019-01-11 18:40:49 +09:00
yutopp
cbd158c81d Add null check 2019-01-11 18:40:49 +09:00
yutopp
77eaa4bcb0 Add/Fix tests for UniJSON. Add ExplicitIgnorableValue option to ignore checks for validations 2019-01-11 18:40:49 +09:00
yutopp
317699ef41 Add an option to check all fields by JsonSchema 2019-01-11 18:40:49 +09:00
yutopp
60041f70c3 Add a test for JsonSchema.Serialize 2019-01-11 18:40:49 +09:00
yutopp
c3ccc802da Prepare a version for next release v0.49 2019-01-11 18:39:41 +09:00
yutopp
4840545b22 Set version to 0.48 2019-01-11 17:53:01 +09:00
ousttrue
e6829b268f bug fix ! 2019-01-11 17:26:09 +09:00
ousttrue
221e1e573d Fixed build warnings 2019-01-10 23:18:12 +09:00
ousttrue
0108d018e0 Allow external root 2019-01-10 18:44:57 +09:00
ousttrue
3471387b79
Merge pull request #118 from saturday06/unity2018-msgpack-time-before-unix-epoch
Throw exception on serialize 32bit time older than unix epoch
2019-01-09 23:40:05 +09:00
ousttrue
612df39e0b
Merge pull request #102 from saturday06/limit-gltf-material-emissiveFactor
Round glTF2.0 materials[].emissiveFactor value to its maximum limit
2019-01-09 23:37:34 +09:00
ousttrue
7fee636df8
Merge pull request #110 from saturday06/fix-invalid-gltf-value-output
Remove invalid json like `meshes[].primitives[].targets[].TANGENT = -1`
2019-01-09 23:35:13 +09:00
ousttrue
cd27645176
Merge pull request #117 from saturday06/fix-typo-epoch
Fix typo and deprecate it
2019-01-09 23:33:30 +09:00
ousttrue
d0aecfc630 Fixed VRMImportExportTests 2019-01-09 17:55:39 +09:00
ousttrue
7a5ff9eb76 move AliciaSolid_vrm-0.40.vrm to Tests/Models 2019-01-09 17:50:31 +09:00
ousttrue
8302fd6748 unitypackage folder to ProjectRoot 2019-01-09 16:56:11 +09:00
ousttrue
6d2dc373f5 mv UniJSONPRofiling project #100 2019-01-09 16:34:42 +09:00
ousttrue
8db3edf1f0 move specification #98 2019-01-09 16:16:16 +09:00
ousttrue
43eae3e9e9 UNIGLTF_DEVELOP to VRM_DEVELOP #97 2019-01-09 16:03:06 +09:00
Isamu Mogi
2c175b9f7e Throw exception on serialize 32bit time older than unix epoch 2019-01-08 00:41:41 +09:00
Isamu Mogi
b3446279f2 Use fixed one 2019-01-08 00:12:40 +09:00
Isamu Mogi
559067fb96 Fix typo and deprecate it 2019-01-08 00:06:02 +09:00
yutopp
ea224d3911 Change namespaces from VRM/global to VRM.Samples for all scripts in VRM.Samples 2019-01-07 19:06:46 +09:00
yutopp
8a952874e5 Remove an unnecessary exporter scrips for UnityEditor 2019-01-07 18:56:00 +09:00
yutopp
4f7e33afd7 Change an exported unity package name, UniVRM-Samples to UniVRM-samples 2019-01-07 18:53:40 +09:00
yutopp
2f18ef67f2 Support building test scenes for VRM.Samples 2019-01-07 18:52:35 +09:00
yutopp
409c745981 Add '-standalone' suffix for unity packages except for UniVRM(-Samples) 2019-01-07 18:44:02 +09:00
yutopp
5193a77e1f Support exporting VRM.Samples 2019-01-07 18:42:08 +09:00
yutopp
f74252d83c Move Assets/VRM.Samples/Resource/Models to Assets/StreamingAssets/VRM.Samples. Add motion data to StreamAssets. Fix pathes for models/motions in VRM.Samples 2019-01-07 18:29:58 +09:00
yutopp
26ebf0083c Fix typo 2019-01-07 17:37:15 +09:00
yutopp
d974daadfd Move import/export/material tests for the model of AliciaSolid. Add VRM model file of AliciaSolid to VRM.Sample/Resources/Models 2019-01-07 17:36:25 +09:00
yutopp
d8f4ce94e5 Add a meta file 2019-01-07 15:54:49 +09:00
yutopp
384122913b Convert CRLF to LF 2019-01-07 15:54:34 +09:00
ousttrue
a850c55e54 Merge commit '864b50492044c4799bb800363281a9d7b33aa59f' as 'Assets/VRM.Samples'
Co-authored-by: m2wasabi <m2wasabi@gmail.com>
Co-authored-by: ousttrue <ousttrue@gmail.com>
Co-authored-by: PoChang-Su <39595967+PoChang-Su@users.noreply.github.com>
Co-authored-by: sh_akira <30430584+sh-akira@users.noreply.github.com>
Co-authored-by: sh_akira <akira.satoh.sh@gmail.com>
Co-authored-by: yutopp <yutopp@gmail.com>
2019-01-07 15:33:41 +09:00
yutopp
88367cc6c2 Add a meta file 2019-01-07 15:27:39 +09:00
yutopp
fc74fe374d Add 'Export unitypackage' which exports UniVRM, UniJSON, UniGLTF and UniHumanoid 2019-01-07 15:24:22 +09:00
yutopp
5dec92c374 Call base constructor 2019-01-07 14:48:51 +09:00
yutopp
29ca308f80 Use uint instead of UInt32. A base type of enums must be underlying types and uint is same as UInt32. (ref: https://docs.microsoft.com/ja-jp/dotnet/csharp/language-reference/keywords/uint) 2019-01-07 14:44:58 +09:00
Isamu Mogi
da2fb76fd4 Remove invalid json like meshes[].primitives[].targets[].TANGENT = -1
In UniVRM v0.45 invalid glTF json values like
`meshes[].primitives[].targets[].TANGENT = -1` had been removed
by UniGLTF.JsonSerializableBase.SerializeMembers(). But it was disabled
unexpectedly since v0.46's following commit:
a85b9699e7 (diff-6d81c3ba04eb19e159e64767f9dd1325L36)

Now call UniGLTF.GLTFJsonFormatter.GLTFValue() explicitly to run serializable's
SerializeMembers() for removing those values that restores UniVRM v0.45
behavior without reflections.

Fixes #105
2019-01-04 02:40:23 +09:00
yutopp
6ae89549b5
Merge pull request #107 from saturday06/fix-typo-export
Fix typo in file name
2019-01-02 20:36:31 +09:00
Isamu Mogi
f2c8870569 Fix typo 2019-01-02 20:33:23 +09:00
Isamu Mogi
e1aa252d4b Fix typo 2019-01-02 20:29:11 +09:00
Isamu Mogi
9986e5615e Round glTF2.0 materials[].emissiveFactor value to its maximum limit 2018-12-31 00:55:34 +09:00
ousttrue
671a729637 Incremented version to UniVRM-0.47 2018-12-29 22:45:32 +09:00
ousttrue
5b0bf3e214 Removed empty folders 2018-12-29 22:09:36 +09:00
yutopp
7938679772 Move Assets/* (expect Plugins) to Assets/VRM/* 2018-12-29 13:21:42 +09:00
yutopp
c8c98b4ab9 Apply formatter 2018-12-28 23:44:40 +09:00
yutopp
c130b69023 Setup solution/project files 2018-12-28 23:05:21 +09:00
yutopp
f3e130d346 Move UniVRM related files into Assets/*. Move Scripts/Editor to Editor in UniVRM 2018-12-28 22:35:24 +09:00
yutopp
6df13b68e3 Update meta files 2018-12-28 22:32:12 +09:00
yutopp
01d0c8eea2 Move MToon to Assets/* 2018-12-28 22:30:13 +09:00
yutopp
0f2565ba09 Move DepthFirstScheduler to Assets/* 2018-12-28 22:28:51 +09:00
yutopp
75b4d54839 Move UniHumanoid to Assets/* 2018-12-28 22:28:17 +09:00
yutopp
e6f3576eb2 Move UniGLTF to Assets/* 2018-12-28 22:27:56 +09:00
yutopp
d96e88f9c8 Move UniJSON to Assets/* 2018-12-28 22:27:19 +09:00
yutopp
f0bc0a29bd Move UniUnlit to Assets/* 2018-12-28 22:26:31 +09:00