Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-12 13:59:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow External chunks.

Browse Source
This commit is contained in:
Masataka SUMI
2021-06-22 21:24:43 +09:00
parent 05272ff989
commit 887d4b61a2
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/UniGLTF/Runtime/UniGLTF/Format/glbTypes.cs
View File

@@ -52,26 +52,28 @@ namespace UniGLTF
public struct GlbChunk
{
public GlbChunkType ChunkType;
public GlbChunkType ChunkType => ChunkTypeString.ToChunkType();
public string ChunkTypeString;
public ArraySegment<Byte> Bytes;
public GlbChunk(string json) : this(
GlbChunkType.JSON,
GlbChunkType.JSON.ToChunkTypeString(),
new ArraySegment<byte>(Encoding.UTF8.GetBytes(json))
)
{
}
public GlbChunk(ArraySegment<Byte> bytes) : this(
GlbChunkType.BIN,
GlbChunkType.BIN.ToChunkTypeString(),
bytes
)
{
}
public GlbChunk(GlbChunkType type, ArraySegment<Byte> bytes)
public GlbChunk(string chunkTypeString, ArraySegment<Byte> bytes)
{
ChunkType = type;
ChunkTypeString = chunkTypeString;
Bytes = bytes;
}
@@ -82,12 +84,12 @@ namespace UniGLTF
public static GlbChunk CreateJson(ArraySegment<byte> bytes)
{
return new GlbChunk(GlbChunkType.JSON, bytes);
return new GlbChunk(GlbChunkType.JSON.ToChunkTypeString(), bytes);
}
public static GlbChunk CreateBin(ArraySegment<Byte> bytes)
{
return new GlbChunk(GlbChunkType.BIN, bytes);
return new GlbChunk(GlbChunkType.BIN.ToChunkTypeString(), bytes);
}
byte GetPaddingByte()
@@ -152,7 +154,7 @@ namespace UniGLTF
}
/// <summary>
/// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#glb-file-format-specification
/// https://github.com/KhronosGroup/glTF/blob/master/specification/2.0/README.md#glb-file-format-specification
/// </summary>
public struct Glb
{
@@ -267,12 +269,11 @@ namespace UniGLTF
//var type = (GlbChunkType)BitConverter.ToUInt32(bytes, pos);
var chunkTypeBytes = bytes.Slice(pos, 4).Where(x => x != 0).ToArray();
var chunkTypeStr = Encoding.ASCII.GetString(chunkTypeBytes);
var type = ToChunkType(chunkTypeStr);
pos += 4;
chunks.Add(new GlbChunk
{
ChunkType = type,
ChunkTypeString = chunkTypeStr,
Bytes = bytes.Slice(pos, chunkDataSize)
});

9
Assets/UniGLTF/Runtime/UniGLTF/IO/GltfParser.cs
View File

@@ -86,7 +86,7 @@ namespace UniGLTF
{
var chunks = glbImporter.ParseGlbChunks(bytes);
if (chunks.Count != 2)
if (chunks.Count < 2)
{
throw new Exception("unknown chunk count: " + chunks.Count);
}
@@ -106,6 +106,8 @@ namespace UniGLTF
var jsonBytes = chunks[0].Bytes;
ParseJson(Encoding.UTF8.GetString(jsonBytes.Array, jsonBytes.Offset, jsonBytes.Count),
new SimpleStorage(chunks[1].Bytes));
ParseExternalChunks(bytes, chunks);
}
catch (StackOverflowException ex)
{
@@ -117,6 +119,11 @@ namespace UniGLTF
}
}
protected virtual void ParseExternalChunks(byte[] bytes, IReadOnlyList<GlbChunk> chunks)
{
}
public virtual void ParseJson(string json, IStorage storage)
{
Json = json;

18
Assets/UniGLTF/Runtime/UniGLTF/IO/glbImporter.cs
View File

@@ -12,7 +12,7 @@ namespace UniGLTF
public const string GLB_MAGIC = "glTF";
public const float GLB_VERSION = 2.0f;
public static GlbChunkType ToChunkType(string src)
public static GlbChunkType ToChunkType(this string src)
{
switch(src)
{
@@ -27,6 +27,19 @@ namespace UniGLTF
}
}
public static string ToChunkTypeString(this GlbChunkType type)
{
switch (type)
{
case GlbChunkType.JSON:
return "JSON";
case GlbChunkType.BIN:
return "BIN";
default:
throw new ArgumentOutOfRangeException(nameof(type), type, null);
}
}
[Obsolete("Use ParseGlbChunks(bytes)")]
public static List<GlbChunk> ParseGlbChanks(Byte[] bytes)
{
@@ -67,12 +80,11 @@ namespace UniGLTF
//var type = (GlbChunkType)BitConverter.ToUInt32(bytes, pos);
var chunkTypeBytes = bytes.Skip(pos).Take(4).Where(x => x != 0).ToArray();
var chunkTypeStr = Encoding.ASCII.GetString(chunkTypeBytes);
var type = ToChunkType(chunkTypeStr);
pos += 4;
chunks.Add(new GlbChunk
{
ChunkType = type,
ChunkTypeString = chunkTypeStr,
Bytes = new ArraySegment<byte>(bytes, (int)pos, (int)chunkDataSize)
});