LegacyConsole/PCK-Studio
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-23 04:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

ModelImporter - Update BedrockModel json class

Browse Source
This commit is contained in:
miku-666
2024-07-30 22:11:43 +02:00
parent 139b355451
commit c2da34cd8c
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
PCK-Studio/External/Format/BedrockModel.cs vendored
View File

@@ -15,7 +15,7 @@ namespace PckStudio.External.Format
public string FormatVersion { get; set; }
[JsonProperty("minecraft:geometry")]
public List<Geometry> Models;
public List<Geometry> Models { get; } = new List<Geometry>();
}
internal class Geometry
@@ -24,7 +24,7 @@ namespace PckStudio.External.Format
public GeometryDescription Description { get; set; }
[JsonProperty("bones")]
public List<Bone> Bones;
public List<Bone> Bones { get; } = new List<Bone>();
}
internal class GeometryDescription
@@ -61,6 +61,10 @@ namespace PckStudio.External.Format
Cubes = new List<Cube>();
}
[JsonProperty("parent", NullValueHandling = NullValueHandling.Ignore)]
public string Parent { get; set; } = "";
[JsonIgnore]
public Vector3 Pivot
{
@@ -99,6 +103,20 @@ namespace PckStudio.External.Format
origin[2] = value.Z;
}
}
[JsonProperty("rotation")]
private float[] rotation { get; set; } = new float[3];
[JsonIgnore]
public Vector3 Rotation
{
get => rotation.Length < 3 ? Vector3.Zero : new Vector3(rotation[0], rotation[1], rotation[2]);
set
{
rotation[0] = value.X;
rotation[1] = value.Y;
rotation[2] = value.Z;
}
}
[JsonProperty("size")]
private float[] size { get; set; } = new float[3];
@@ -134,7 +152,7 @@ namespace PckStudio.External.Format
[JsonProperty("inflate")]
public float Inflate { get; set; } = 0f;
[JsonProperty("mirror", DefaultValueHandling = DefaultValueHandling.Ignore)]
public bool Mirror;
[JsonProperty("mirror", NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore)]
public bool Mirror { get; set; } = false;
}
}

4
PCK-Studio/Internal/ModelImporter.cs
View File

@@ -523,7 +523,7 @@ namespace PckStudio.Internal
}
Geometry selectedGeometry = new Geometry();
selectedGeometry.Bones = bones.Values.ToList();
selectedGeometry.Bones.AddRange(bones.Values);
object bedrockModel = null;
// Bedrock Entity (Model)
if (fileName.EndsWith(".geo.json"))
@@ -536,7 +536,7 @@ namespace PckStudio.Internal
bedrockModel = new BedrockModel
{
FormatVersion = "1.12.0",
Models = new List<Geometry>() { selectedGeometry }
Models = { selectedGeometry }
};
}
// Bedrock Legacy Model