Experimental Exporterでjsonに空の配列が含まれglTF違反になってしまうことがあるのを修正 #486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
saturday06
commented
Jul 26, 2020
| @@ -48,10 +48,21 @@ class Generator : IDisposable | |||
| { | |||
| {"gltf/animations", "if(value.animations!=null && value.animations.Count>0)" }, | |||
| {"gltf/cameras", "if(value.cameras!=null && value.cameras.Count>0)" }, | |||
| {"gltf/buffers", "if(value.buffers!=null && value.buffers.Count>0)" }, | |||
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| @@ -48,10 +48,21 @@ class Generator : IDisposable | |||
| { | |||
| {"gltf/animations", "if(value.animations!=null && value.animations.Count>0)" }, | |||
| {"gltf/cameras", "if(value.cameras!=null && value.cameras.Count>0)" }, | |||
| {"gltf/buffers", "if(value.buffers!=null && value.buffers.Count>0)" }, | |||
| {"gltf/bufferViews", "if(value.bufferViews!=null && value.bufferViews.Count>0)" }, | |||
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/bufferViews[]/byteStride", "if(false)" }, | ||
| {"gltf/bufferViews[]/target", "if(value.target!=0)" }, | ||
| {"gltf/animations[]/channels", "if(value.channels!=null && value.channels.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/animations[]/channels[]/target", "if(value!=null)" }, | ||
| {"gltf/animations[]/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/animations[]/channels[]/target", "if(value!=null)" }, | ||
| {"gltf/animations[]/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, | ||
| {"gltf/accessors", "if(value.accessors!=null && value.accessors.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/animations[]/channels[]/target", "if(value!=null)" }, | ||
| {"gltf/animations[]/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, | ||
| {"gltf/accessors", "if(value.accessors!=null && value.accessors.Count>0)" }, | ||
| {"gltf/accessors[]/max", "if(value.max!=null && value.max.Length>0)"}, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/animations[]/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, | ||
| {"gltf/accessors", "if(value.accessors!=null && value.accessors.Count>0)" }, | ||
| {"gltf/accessors[]/max", "if(value.max!=null && value.max.Length>0)"}, | ||
| {"gltf/accessors[]/min", "if(value.min!=null && value.min.Length>0)"}, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/accessors[]/sparse", "if(value.sparse!=null && value.sparse.count>0)"}, | ||
| {"gltf/images", "if(value.images!=null && value.images.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/accessors[]/sparse", "if(value.sparse!=null && value.sparse.count>0)"}, | ||
| {"gltf/images", "if(value.images!=null && value.images.Count>0)" }, | ||
|
|
||
| {"gltf/meshes", "if(value.meshes!=null && value.meshes.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/images", "if(value.images!=null && value.images.Count>0)" }, | ||
|
|
||
| {"gltf/meshes", "if(value.meshes!=null && value.meshes.Count>0)" }, | ||
| {"gltf/meshes[]/primitives", "if(value.primitives!=null && value.primitives.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| @@ -67,17 +78,27 @@ class Generator : IDisposable | |||
| {"gltf/meshes[]/primitives[]/attributes/WEIGHTS_0", "if(value.WEIGHTS_0!=-1)"}, | |||
|
|
|||
| {"gltf/meshes[]/primitives[]/extras", "if(value.extras!=null && value.extras.targetNames!=null && value.extras.targetNames.Count>0)"}, | |||
| {"gltf/meshes[]/weights", "if(value.weights!=null && value.weights.Length>0)" }, | |||
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| @@ -67,17 +78,27 @@ class Generator : IDisposable | |||
| {"gltf/meshes[]/primitives[]/attributes/WEIGHTS_0", "if(value.WEIGHTS_0!=-1)"}, | |||
|
|
|||
| {"gltf/meshes[]/primitives[]/extras", "if(value.extras!=null && value.extras.targetNames!=null && value.extras.targetNames.Count>0)"}, | |||
| {"gltf/meshes[]/weights", "if(value.weights!=null && value.weights.Length>0)" }, | |||
| {"gltf/materials", "if(value.materials!=null && value.materials.Count>0)" }, | |||
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/materials[]/alphaCutoff", "if(!string.IsNullOrEmpty(value.alphaMode))" }, | ||
| {"gltf/nodes", "if(value.nodes!=null && value.nodes.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/nodes[]/camera", "if(value.camera!=-1)"}, | ||
| {"gltf/nodes[]/mesh", "if(value.mesh!=-1)"}, | ||
| {"gltf/nodes[]/skin", "if(value.skin!=-1)"}, | ||
| {"gltf/nodes[]/children", "if(value.children != null && value.children.Length>0)"}, | ||
| {"gltf/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/nodes[]/camera", "if(value.camera!=-1)"}, | ||
| {"gltf/nodes[]/mesh", "if(value.mesh!=-1)"}, | ||
| {"gltf/nodes[]/skin", "if(value.skin!=-1)"}, | ||
| {"gltf/nodes[]/children", "if(value.children != null && value.children.Length>0)"}, | ||
| {"gltf/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, | ||
| {"gltf/scenes", "if(value.scenes!=null && value.scenes.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/nodes[]/camera", "if(value.camera!=-1)"}, | ||
| {"gltf/nodes[]/mesh", "if(value.mesh!=-1)"}, | ||
| {"gltf/nodes[]/skin", "if(value.skin!=-1)"}, | ||
| {"gltf/nodes[]/children", "if(value.children != null && value.children.Length>0)"}, | ||
| {"gltf/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, | ||
| {"gltf/scenes", "if(value.scenes!=null && value.scenes.Count>0)" }, | ||
| {"gltf/scenes[]/nodes", "if(value.nodes!=null && value.nodes.Length>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/samplers", "if(value.samplers!=null && value.samplers.Count>0)" }, | ||
| {"gltf/scenes", "if(value.scenes!=null && value.scenes.Count>0)" }, | ||
| {"gltf/scenes[]/nodes", "if(value.nodes!=null && value.nodes.Length>0)" }, | ||
| {"gltf/skins", "if(value.skins!=null && value.skins.Count>0)" }, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/skins[]/skeleton", "if(value.skeleton!=-1)"}, | ||
| {"gltf/extensionsRequired", "if(false)"}, | ||
| {"gltf/skins[]/joints", "if(value.joints!=null && value.joints.Length>0)"}, |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/skins[]/skeleton", "if(value.skeleton!=-1)"}, | ||
| {"gltf/extensionsRequired", "if(false)"}, | ||
| {"gltf/skins[]/joints", "if(value.joints!=null && value.joints.Length>0)"}, | ||
| {"gltf/extensionsUsed", "if(value.extensionsUsed!=null && value.extensionsUsed.Count>0)"}, // dummy |
There was a problem hiding this comment.
saturday06
commented
Jul 26, 2020
| {"gltf/extensionsRequired", "if(false)"}, | ||
| {"gltf/skins[]/joints", "if(value.joints!=null && value.joints.Length>0)"}, | ||
| {"gltf/extensionsUsed", "if(value.extensionsUsed!=null && value.extensionsUsed.Count>0)"}, // dummy | ||
| {"gltf/extensionsRequired", "if(false && value.extensionsRequired!=null && value.extensionsRequired.Count>0)"}, |
There was a problem hiding this comment.
すでにfalse固定になっていますが、いちおう防御的に記述しておきます。
saturday06
commented
Jul 26, 2020
| {"gltf/extensions/VRM/humanoid/humanBones[]/axisLength", "if(value.axisLength>0)"}, | ||
| {"gltf/extensions/VRM/humanoid/humanBones[]/center", "if(value.center!=Vector3.zero)"}, | ||
| {"gltf/extensions/VRM/humanoid/humanBones[]/max", "if(value.max!=Vector3.zero)"}, | ||
| {"gltf/extensions/VRM/humanoid/humanBones[]/min", "if(value.min!=Vector3.zero)"}, | ||
| {"gltf/textures", "if(value.textures!=null && value.textures.Count>0)" }, |
There was a problem hiding this comment.
hiroj
approved these changes
Jul 27, 2020
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Experimental Exporterで空配列の除外設定に漏れがあったため、glTF違反のデータを出力してしまうことがあるの修正しました。また、Experimental Exporterが古くなっていたので再生成しました。
こちらのVRM をUniVRM masterブランチ c9b383b でインポートし「Use Experimental Exporter」をON、「Use Sparse Accessor」をOFFの状態でエクスポートした結果の拡張子をglbとし、 https://github.khronos.org/glTF-Validator/ にかけた結果を次に示します。