Serialize content to/from binary using BinaryPack

Source/Mocha.Common/Apparatus.Core.Common.csproj

@@ -12,6 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="BinaryPack" Version="1.0.3" />
 		<PackageReference Include="Veldrid.SPIRV" Version="1.0.15" />
 	</ItemGroup>
 

Source/Mocha.Common/Globals.cs

@@ -9,6 +9,8 @@
 
 global using static Globals;
 
+global using Apparatus.Core.Common;
+
 public static class Globals
 {
 	public static Logger Log { get; } = new();

Source/Mocha.Common/Serializer.cs

@@ -0,0 +1,45 @@
+using BinaryPack;
+using System.IO.Compression;
+
+namespace Apparatus.Core.Common;
+
+public static class Serializer
+{
+    public static byte[] Serialize<T>(T obj) where T : new()
+    {
+        var serialized = BinaryConverter.Serialize(obj);
+
+        return Compress(serialized);
+    }
+
+    public static T? Deserialize<T>(byte[] data) where T : new()
+    {
+        var serialized = Decompress(data);
+
+        return BinaryConverter.Deserialize<T>(serialized);
+    }
+
+    public static byte[] Compress(byte[] uncompressedData)
+    {
+        using var stream = new MemoryStream();
+        using var deflate = new DeflateStream(stream, CompressionLevel.Fastest);
+
+        deflate.Write(uncompressedData);
+        deflate.Close();
+
+        return stream.ToArray();
+    }
+
+    public static byte[] Decompress(byte[] compressedData)
+    {
+        using var outputStream = new MemoryStream();
+
+        using (var compressStream = new MemoryStream(compressedData))
+        {
+            using var deflateStream = new DeflateStream(compressStream, CompressionMode.Decompress);
+            deflateStream.CopyTo(outputStream);
+        }
+
+        return outputStream.ToArray();
+    }
+}

Source/Mocha.Example/MyApp.cs

@@ -9,11 +9,11 @@ public class MyApp : MochaApplication
 	private ImageTexture _imageTexture = null!;
 
 	private readonly float[] _vertices = [
-		// vec2 pos,	vec3 color		vec2 uv
-		-1,-1,			0,0,1,			0,0,
-		1,-1,			0,1,1,			1,0,
-		1,1,			1,1,0,			1,1,
-		-1,1,			1,0,0,			0,1
+		// vec2 pos,	vec2 uv
+		-1,-1,			0,0,
+		1,-1,			1,0,
+		1,1,			1,1,
+		-1,1,			0,1
 	];
 
 	private readonly uint[] _indices = [0, 1, 2, 2, 3, 0];
@@ -97,7 +97,6 @@ protected override void OnBootstrap()
 			Descriptors = [_descriptor],
 			VertexAttributes = [
 				new VertexAttributeInfo() { Format = VertexAttributeFormat.Float2, Name = "Position" },
-				new VertexAttributeInfo() { Format = VertexAttributeFormat.Float3, Name = "Color" },
 				new VertexAttributeInfo() { Format = VertexAttributeFormat.Float2, Name = "TexCoord" },
 			]
 		} );

Source/Mocha.Example/fs/src/shaders/default.shader.glsl

@@ -8,29 +8,24 @@
 Vertex 
 {
   layout(location = 0) in vec2 inPosition;
-  layout(location = 1) in vec3 inColor;
-  layout(location = 2) in vec2 inTexCoord;
+  layout(location = 1) in vec2 inTexCoord;
 
-  layout(location = 0) out vec3 fragColor;
-  layout(location = 1) out vec2 texCoord;
+  layout(location = 0) out vec2 texCoord;
 
   void main() {
     gl_Position = vec4(inPosition, 0.0, 1.0);
-    fragColor = inColor;
     texCoord = inTexCoord;
   }
 }
 
 Fragment 
 {
-  layout(location = 0) in vec3 fragColor;
-  layout(location = 1) in vec2 texCoord;
+  layout(location = 0) in vec2 texCoord;
   layout(location = 0) out vec4 outColor;
 
   layout(binding = 0) uniform sampler2D textureSampler;
 
   void main() {
-    vec4 texColor = texture(textureSampler, texCoord);
-    outColor = vec4(fragColor, 1.0) * texColor;
+    outColor = texture(textureSampler, texCoord);
   }
 }

Source/Mocha.Generators/ResourceGenerator.cs

@@ -15,7 +15,7 @@ public class ResourceGenerator : IIncrementalGenerator
 
 		private const string ResourceAttribute = "Mocha.ResourceAttribute";
 		private const string FileSystemContent = "global::Mocha.FileSystem.Content";
-		private const string FileSystemReadAllTextMethod = "ReadAllText";
+		private const string FileSystemReadAllBytesMethod = "ReadAllBytes";
 
 		public void Initialize( IncrementalGeneratorInitializationContext context )
 		{
@@ -94,8 +94,8 @@ private void Execute( SourceProductionContext context, ImmutableArray<ResourceDa
 					writer.WriteLine( "{" );
 					writer.Indent++;
 
-					writer.WriteLine( $"var file = {FileSystemContent}.{FileSystemReadAllTextMethod}( filePath );" );
-					writer.WriteLine( $"return global::System.Text.Json.JsonSerializer.Deserialize<{entry.TypeName}>( file );" );
+					writer.WriteLine( $"var file = {FileSystemContent}.{FileSystemReadAllBytesMethod}( filePath );" );
+					writer.WriteLine( $"return global::Apparatus.Core.Common.Serializer.Deserialize<{entry.TypeName}>( file );" );
 
 					writer.Indent--;
 					writer.WriteLine( "}" );
@@ -115,7 +115,7 @@ private void Execute( SourceProductionContext context, ImmutableArray<ResourceDa
 					writer.WriteLine( "{" );
 					writer.Indent++;
 
-					writer.WriteLine( $"return global::System.Text.Json.JsonSerializer.Deserialize<{entry.TypeName}>( data );" );
+					writer.WriteLine( $"return global::Apparatus.Core.Common.Serializer.Deserialize<{entry.TypeName}>( data );" );
 
 					writer.Indent--;
 					writer.WriteLine( "}" );

Source/Mocha.ResourceCompiler/Compilers/MaterialCompiler.cs

@@ -16,7 +16,7 @@ public async Task<CompileResult> CompileFile( CompileInput compileInput )
 			// todo: Process?
 			//
 
-			return CompileResult.Success( JsonSerializer.SerializeToUtf8Bytes( materialData ) );
+			return CompileResult.Success( Serializer.Serialize( materialData ) );
 		} );
 	}
 }

Source/Mocha.ResourceCompiler/Compilers/Shader/ShaderCompiler.cs

@@ -127,6 +127,6 @@ public async Task<CompileResult> CompileFile( CompileInput compileInput )
 		if ( shaderFile.Fragment != null )
 			shader.FragmentData = await CompileShader( shaderFile.Common, shaderFile.Fragment, ShaderStages.Fragment, debugName );
 
-		return CompileResult.Success( JsonSerializer.SerializeToUtf8Bytes( shader ) );
+		return CompileResult.Success( Serializer.Serialize( shader ) );
 	}
 }

Source/Mocha.ResourceCompiler/Compilers/TextureCompiler.cs

@@ -32,6 +32,6 @@ public async Task<CompileResult> CompileFile( CompileInput compileInput )
 			Format = TextureFormat.Bc3,
 		};
 
-		return CompileResult.Success( JsonSerializer.SerializeToUtf8Bytes( textureData ) );
+		return CompileResult.Success( Serializer.Serialize( textureData ) );
 	}
 }

Source/Mocha.ResourceCompiler/Globals.cs

@@ -6,3 +6,5 @@
 global using System.Linq;
 global using System.Threading;
 global using System.Threading.Tasks;
+
+global using Apparatus.Core.Common;

Source/Mocha.ResourceCompiler/Preprocess/PBRTextureConverter.cs

@@ -116,7 +116,7 @@ private static void WriteMaterialFile( string destinationPath )
 			PackedTexture = $"{assetPath.NormalizePath()}_packed.png"
 		};
 
-		var fileData = JsonSerializer.Serialize( materialData );
-		File.WriteAllText( destinationPath + ".material.json", fileData );
+		var fileData = Serializer.Serialize( materialData );
+		File.WriteAllBytes( destinationPath + ".material.json", fileData );
 	}
 }