Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Export 時に default 値の TRS を出力しない #1061

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Export 時に default 値の TRS を出力しない #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20d068e
skip T if [0, 0, 0]
ousttrue Jun 22, 2021
c8e245c
Skip R, S
ousttrue Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Assets/UniGLTF/Editor/UniGLTF/Serialization/SerializerGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public static class SerializerGenerator
const string Begin = @"using System;
using System.Collections.Generic;
using UniJSON;
using System.Linq;

namespace UniGLTF {

Expand All @@ -34,7 +35,7 @@ static string OutPath
get
{
return Path.Combine(UnityEngine.Application.dataPath,
"UniGLTF/UniGLTF/Scripts/IO/GltfSerializer.g.cs");
"UniGLTF/Runtime/UniGLTF/Format/GltfSerializer.g.cs");
}
}

Expand Down
7 changes: 4 additions & 3 deletions Assets/UniGLTF/Runtime/UniGLTF/Format/GltfSerializer.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UniJSON;
using System.Linq;

namespace UniGLTF {

Expand Down Expand Up @@ -1121,17 +1122,17 @@ public static void Serialize_gltf_nodes_ITEM(JsonFormatter f, glTFNode value)
Serialize_gltf_nodes__matrix(f, value.matrix);
}

if(value.translation!=null&&value.translation.Length>=3){
if(value.translation!=null&&value.translation.Length>=3&&!value.translation.SequenceEqual(new float[]{0, 0, 0})){
f.Key("translation");
Serialize_gltf_nodes__translation(f, value.translation);
}

if(value.rotation!=null&&value.rotation.Length>=4){
if(value.rotation!=null&&value.rotation.Length>=4&&!value.rotation.SequenceEqual(new float[]{0, 0, 0, 1})){
f.Key("rotation");
Serialize_gltf_nodes__rotation(f, value.rotation);
}

if(value.scale!=null&&value.scale.Length>=3){
if(value.scale!=null&&value.scale.Length>=3&&!value.scale.SequenceEqual(new float[]{1, 1, 1})){
f.Key("scale");
Serialize_gltf_nodes__scale(f, value.scale);
}
Expand Down
6 changes: 3 additions & 3 deletions Assets/UniGLTF/Runtime/UniGLTF/Format/glTFNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ public class glTFNode
[JsonSchema(MinItems = 16, MaxItems = 16)]
public float[] matrix;

[JsonSchema(MinItems = 3, MaxItems = 3)]
[JsonSchema(MinItems = 3, MaxItems = 3, SerializationConditions = new string[] { "!value.translation.SequenceEqual(new float[]{0, 0, 0})" })]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

悲しみのジェネレートコード、しかしヨシ

厳密に float 比較で一致したときのみなのもよさそう。

public float[] translation;

[JsonSchema(MinItems = 4, MaxItems = 4)]
[JsonSchema(MinItems = 4, MaxItems = 4, SerializationConditions = new string[] { "!value.rotation.SequenceEqual(new float[]{0, 0, 0, 1})" })]
[ItemJsonSchema(Minimum = -1.0, Maximum = 1.0)]
public float[] rotation;

[JsonSchema(MinItems = 3, MaxItems = 3)]
[JsonSchema(MinItems = 3, MaxItems = 3, SerializationConditions = new string[] { "!value.scale.SequenceEqual(new float[]{1, 1, 1})" })]
public float[] scale;

[JsonSchema(Minimum = 0, ExplicitIgnorableValue = -1)]
Expand Down