diff --git a/Source/AssetRipper.Export.PrimaryContent/Models/GlbMeshExporter.cs b/Source/AssetRipper.Export.PrimaryContent/Models/GlbMeshExporter.cs index 708f0dd1c..3903dccd9 100644 --- a/Source/AssetRipper.Export.PrimaryContent/Models/GlbMeshExporter.cs +++ b/Source/AssetRipper.Export.PrimaryContent/Models/GlbMeshExporter.cs @@ -3,6 +3,7 @@ using AssetRipper.Export.Modules.Models; using AssetRipper.SourceGenerated.Classes.ClassID_43; using AssetRipper.SourceGenerated.Extensions; using SharpGLTF.Scenes; +using SharpGLTF.Schema2; namespace AssetRipper.Export.PrimaryContent.Models; @@ -26,7 +27,7 @@ public sealed class GlbMeshExporter : IContentExtractor { SceneBuilder sceneBuilder = GlbMeshBuilder.Build((IMesh)asset); using FileStream fileStream = File.Create(path); - sceneBuilder.ToGltf2().WriteGLB(fileStream); + sceneBuilder.ToGltf2().WriteGLB(fileStream, new WriteSettings() { MergeBuffers = false }); return true; } } diff --git a/Source/AssetRipper.Export.PrimaryContent/Models/GlbModelExporter.cs b/Source/AssetRipper.Export.PrimaryContent/Models/GlbModelExporter.cs index 0fff4d32c..61167ac90 100644 --- a/Source/AssetRipper.Export.PrimaryContent/Models/GlbModelExporter.cs +++ b/Source/AssetRipper.Export.PrimaryContent/Models/GlbModelExporter.cs @@ -2,6 +2,7 @@ using AssetRipper.Export.Modules.Models; using AssetRipper.Processing; using SharpGLTF.Scenes; +using SharpGLTF.Schema2; namespace AssetRipper.Export.PrimaryContent.Models; @@ -32,7 +33,7 @@ public class GlbModelExporter : IContentExtractor { SceneBuilder sceneBuilder = GlbLevelBuilder.Build(assets, isScene); using FileStream fileStream = File.Create(path); - sceneBuilder.ToGltf2().WriteGLB(fileStream); + sceneBuilder.ToGltf2().WriteGLB(fileStream, new WriteSettings() { MergeBuffers = false }); return true; } } diff --git a/Source/AssetRipper.Export.PrimaryContent/Models/GlbNavMeshExporter.cs b/Source/AssetRipper.Export.PrimaryContent/Models/GlbNavMeshExporter.cs index da12beb02..6108a7068 100644 --- a/Source/AssetRipper.Export.PrimaryContent/Models/GlbNavMeshExporter.cs +++ b/Source/AssetRipper.Export.PrimaryContent/Models/GlbNavMeshExporter.cs @@ -7,6 +7,7 @@ using SharpGLTF.Geometry; using SharpGLTF.Geometry.VertexTypes; using SharpGLTF.Materials; using SharpGLTF.Scenes; +using SharpGLTF.Schema2; using System.Numerics; namespace AssetRipper.Export.PrimaryContent.Models; @@ -32,7 +33,7 @@ public sealed class GlbNavMeshExporter : IContentExtractor SceneBuilder sceneBuilder = new SceneBuilder(); AddAssetToSceneBuilder(sceneBuilder, (INavMeshData)asset); using FileStream fileStream = File.Create(path); - sceneBuilder.ToGltf2().WriteGLB(fileStream); + sceneBuilder.ToGltf2().WriteGLB(fileStream, new WriteSettings() { MergeBuffers = false }); return true; } diff --git a/Source/AssetRipper.Export.PrimaryContent/Models/GlbTerrainExporter.cs b/Source/AssetRipper.Export.PrimaryContent/Models/GlbTerrainExporter.cs index f53401cf5..4bce6de63 100644 --- a/Source/AssetRipper.Export.PrimaryContent/Models/GlbTerrainExporter.cs +++ b/Source/AssetRipper.Export.PrimaryContent/Models/GlbTerrainExporter.cs @@ -2,6 +2,7 @@ using AssetRipper.Export.Modules.Models; using AssetRipper.SourceGenerated.Classes.ClassID_156; using SharpGLTF.Scenes; +using SharpGLTF.Schema2; namespace AssetRipper.Export.PrimaryContent.Models; @@ -25,7 +26,7 @@ public sealed class GlbTerrainExporter : IContentExtractor { SceneBuilder sceneBuilder = GlbTerrainBuilder.Build((ITerrainData)asset); using FileStream fileStream = File.Create(path); - sceneBuilder.ToGltf2().WriteGLB(fileStream); + sceneBuilder.ToGltf2().WriteGLB(fileStream, new WriteSettings() { MergeBuffers = false }); return true; } } diff --git a/Source/AssetRipper.GUI.Web/Pages/Assets/AssetAPI.cs b/Source/AssetRipper.GUI.Web/Pages/Assets/AssetAPI.cs index f0e2dc7d3..8211e47bb 100644 --- a/Source/AssetRipper.GUI.Web/Pages/Assets/AssetAPI.cs +++ b/Source/AssetRipper.GUI.Web/Pages/Assets/AssetAPI.cs @@ -29,6 +29,7 @@ using AssetRipper.Web.Extensions; using AssetRipper.Yaml; using Microsoft.AspNetCore.Http; using SharpGLTF.Scenes; +using SharpGLTF.Schema2; using System.Globalization; using System.Runtime.InteropServices; @@ -209,7 +210,7 @@ internal static class AssetAPI try { SceneBuilder sceneBuilder = GlbMeshBuilder.Build(mesh); - sceneBuilder.ToGltf2().WriteGLB(stream); + sceneBuilder.ToGltf2().WriteGLB(stream, new WriteSettings() { MergeBuffers = false }); } catch (Exception ex) {