Skip to content

feat: Add support for importing 64-bit GLB version 3 files #51

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

Open
aaronfranke wants to merge 1 commit into
base: main
Choose a base branch
from
+144 −75
Open

feat: Add support for importing 64-bit GLB version 3 files #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Packages/com.unity.cloud.gltfast.tests/Assets~/Unity/FormatVariants/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Textured cube in three format variants:

1. glTF (JSON) with separate buffer and texture files.
2. glTF-Binary (.glb)
2. glTF-Binary (.glb) version 2 and version 3.
3. glTF (JSON) with embedded buffer and texture.

## Legal
Expand Down
3 changes: 3 additions & 0 deletions ...unity.cloud.gltfast.tests/Assets~/Unity/FormatVariants/glTF-Binary/FormatVariantsGLB3.glb
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Packages/com.unity.cloud.gltfast.tests/Tests/Editor/GltfImporterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void OneTimeTearDown()
AssetDatabase.Refresh();
}

[GltfTestCase("glTF-test-models", 65)]
[GltfTestCase("glTF-test-models", 66)]
public IEnumerator GltfTestModels(GltfTestCaseSet testCaseSet, GltfTestCase testCase)
{
#if GLTFAST_EDITOR_IMPORT_OFF
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.cloud.gltfast.tests/Tests/Runtime/Scripts/Import/AssetsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void OneTimeTearDown()
m_Runner.Dispose();
}

[GltfTestCase("glTF-test-models", 65)]
[GltfTestCase("glTF-test-models", 66)]
public IEnumerator GltfTestModels(GltfTestCaseSet testCaseSet, GltfTestCase testCase)
{
yield return AsyncWrapper.WaitForTask(m_Runner.Run(testCaseSet, testCase));
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.cloud.gltfast.tests/Tests/Runtime/Scripts/Import/CancellationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public IEnumerator CancelImport_SampleAssets(GltfTestCaseSet testCaseSet, GltfTe
yield return CancellationTestInternal(testCaseSet, testCase, k_MaxIterations);
}

[GltfTestCase("glTF-test-models", 65)]
[GltfTestCase("glTF-test-models", 66)]
public IEnumerator CancelImport_TestModels(GltfTestCaseSet testCaseSet, GltfTestCase testCase)
{
yield return CancellationTestInternal(testCaseSet, testCase, k_MaxIterations);
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.cloud.gltfast.tests/Tests/Runtime/Scripts/Import/MemoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public IEnumerator LoadUnload_SampleAssets(GltfTestCaseSet testCaseSet, GltfTest
yield return GetAllObjectsTestInternal(LoadFileInternal(testCaseSet, testCase), true);
}

[GltfTestCase("glTF-test-models", 65)]
[GltfTestCase("glTF-test-models", 66)]
public IEnumerator LoadUnload_TestModels(GltfTestCaseSet testCaseSet, GltfTestCase testCase)
{
yield return GetAllObjectsTestInternal(LoadFileInternal(testCaseSet, testCase), true);
Expand Down
13 changes: 9 additions & 4 deletions Packages/com.unity.cloud.gltfast.tests/Tests/Runtime/TestCaseSets/glTF-test-models.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ MonoBehaviour:
- relativeUri: EightTexcoords/EightTexcoords.gltf
expectLoadFail: 0
expectInstantiationFail: 0
expectedLogCodes: 34000000
expectedLogCodes: 36000000
requiredExtensions:
- relativeUri: EmbedBufferInvalid/EmbedBufferInvalid.gltf
expectLoadFail: 1
Expand Down Expand Up @@ -63,7 +63,7 @@ MonoBehaviour:
- relativeUri: NineTexcoords/NineTexcoords.gltf
expectLoadFail: 0
expectInstantiationFail: 0
expectedLogCodes: 34000000
expectedLogCodes: 36000000
requiredExtensions:
- relativeUri: NoNormals/NoNormals.gltf
expectLoadFail: 0
Expand Down Expand Up @@ -128,12 +128,12 @@ MonoBehaviour:
- relativeUri: Bounds/BoundsMissing/BoundsMissing.gltf
expectLoadFail: 0
expectInstantiationFail: 0
expectedLogCodes: 20000000
expectedLogCodes: 22000000
requiredExtensions:
- relativeUri: DracoSpecialCases/glTF/DracoSpecialCases.gltf
expectLoadFail: 0
expectInstantiationFail: 0
expectedLogCodes: 2000000034000000
expectedLogCodes: 2200000036000000
requiredExtensions: 00000000
- relativeUri: FormatVariants/glTF/FormatVariants.gltf
expectLoadFail: 0
Expand All @@ -145,6 +145,11 @@ MonoBehaviour:
expectInstantiationFail: 0
expectedLogCodes:
requiredExtensions:
- relativeUri: FormatVariants/glTF-Binary/FormatVariantsGLB3.glb
expectLoadFail: 0
expectInstantiationFail: 0
expectedLogCodes:
requiredExtensions:
- relativeUri: FormatVariants/glTF-Embedded/FormatVariants.gltf
expectLoadFail: 0
expectInstantiationFail: 0
Expand Down
8 changes: 4 additions & 4 deletions ...ud.gltfast/Runtime/Scripts/GlbBinChunk.cs → ...ltfast/Runtime/Scripts/GltfBufferRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

namespace GLTFast
{
readonly struct GlbBinChunk
readonly struct GltfBufferRange
{
public int Start { get; }
public long Start { get; }

public uint Length { get; }
public long Length { get; }

public GlbBinChunk(int start, uint length)
public GltfBufferRange(long start, long length)
{
Start = start;
Length = length;
Expand Down
0 ...tfast/Runtime/Scripts/GlbBinChunk.cs.meta → ...t/Runtime/Scripts/GltfBufferRange.cs.meta
View file
Open in desktop
File renamed without changes.
Loading