Prepping for world bounds fix push.

Author: emotitron

Assets/emotitron/Compression/Bitpackers/ArrayPackBitsExt.cs

@@ -26,8 +26,6 @@
 #define UNITY_ASSERTIONS
 #endif
 
-using emotitron.Compression.Utilities;
-
 namespace emotitron.Compression
 {
 	/// <summary>

Assets/emotitron/Compression/Bitpackers/ArraySerializeExt.cs

@@ -389,7 +389,7 @@ public static void Write(this byte[] buffer, ulong value, ref int bitposition, i
 			const int MODULUS = MAXBITS - 1;
 			int offset = bitposition & MODULUS;
 			int index = bitposition >> 3;
-
+			
 			ulong mask = ulong.MaxValue >> (64 - bits);
 			ulong offsetmask = mask << offset;
 			ulong offsetcomp = value << offset;
@@ -399,7 +399,7 @@ public static void Write(this byte[] buffer, ulong value, ref int bitposition, i
 			offset = MAXBITS - offset;
 
 			// These are complete overwrites of the array element, so no masking is required
-			while (offset < (bits - 8))
+			while (offset < (bits-8))
 			{
 				index++;
 				offsetcomp = value >> offset;
@@ -428,7 +428,7 @@ public static void Write(this uint[] buffer, ulong value, ref int bitposition, i
 			const int MODULUS = MAXBITS - 1;
 			int offset = bitposition & MODULUS;
 			int index = bitposition >> 5;
-
+			
 
 			ulong mask = ulong.MaxValue >> (64 - bits);
 			ulong offsetmask = mask << offset;
@@ -600,7 +600,7 @@ public static ulong Read(this ulong[] buffer, ref int bitposition, int bits)
 		#endregion
 
 		#region Secondary Readers
-
+		
 		// Ulong
 		[System.Obsolete("Just use Read(), it return a ulong already.")]
 		public static ulong ReadUInt64(this byte[] buffer, ref int bitposition, int bits = 64)

Assets/emotitron/Compression/Bitpackers/PrimitiveSerializeExt.cs

@@ -317,7 +317,7 @@ public static byte WritetBool(this byte buffer, bool value, ref int bitposition)
 
 		public static void Inject(this bool value, ref ulong buffer, ref int bitposition)
 		{
-			Inject((ulong)(value ? 1 : 0), ref buffer, ref bitposition, 1);
+			Inject((ulong)(value ? 1 : 0), ref buffer,  ref bitposition, 1);
 		}
 		public static void Inject(this bool value, ref uint buffer, ref int bitposition)
 		{

Assets/emotitron/Compression/TransformCrusher.meta

@@ -27,6 +27,9 @@
 using System.Runtime.InteropServices;
 using System;
 
+/// <summary>
+/// Temporariliy using the Utilities namespace to avoid collisions with the DLL still in use by NST
+/// </summary>
 namespace emotitron.Compression.Utilities
 {
 
@@ -217,7 +220,7 @@ public void ExtractByteArray(byte[] targetArray)
 			if (len > 2) targetArray[3] = byte3;
 			if (len > 3) targetArray[4] = byte4;
 			if (len > 4) targetArray[5] = byte5;
-			if (len > 5) targetArray[3] = byte6;
+			if (len > 5) targetArray[6] = byte6;
 			if (len > 6) targetArray[7] = byte7;
 		}
 

Assets/emotitron/Compression/TransformCrusher/WorldBounds.meta

@@ -2,41 +2,47 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public static class ZigZagExt
+
+namespace emotitron.Compression
 {
-	public static ulong ZigZag(this long s)
-	{
-		return (ulong)((s << 1) ^ (s >> 63));
-	}
-	public static long UnZigZag(this ulong u)
-	{
-		return ((long)(u >> 1) ^ (-(long)(u & 1)));
-	}
+	public static class ZigZagExt
+	{
+		public static ulong ZigZag(this long s)
+		{
+			return (ulong)((s << 1) ^ (s >> 63));
+		}
+		public static long UnZigZag(this ulong u)
+		{
+			return ((long)(u >> 1) ^ (-(long)(u & 1)));
+		}
 
-	public static uint ZigZag(this int s)
-	{
-		return (uint)((s << 1) ^ (s >> 31));
-	}
-	public static int UnZigZag(this uint u)
-	{
-		return (int)((u >> 1) ^ (-(int)(u & 1)));
-	}
+		public static uint ZigZag(this int s)
+		{
+			return (uint)((s << 1) ^ (s >> 31));
+		}
+		public static int UnZigZag(this uint u)
+		{
+			return (int)((u >> 1) ^ (-(int)(u & 1)));
+		}
 
-	public static ushort ZigZag(this short s)
-	{
-		return (ushort)((s << 1) ^ (s >> 15));
-	}
-	public static short UnZigZag(this ushort u)
-	{
-		return (short)((u >> 1) ^ (-(short)(u & 1)));
-	}
+		public static ushort ZigZag(this short s)
+		{
+			return (ushort)((s << 1) ^ (s >> 15));
+		}
+		public static short UnZigZag(this ushort u)
+		{
+			return (short)((u >> 1) ^ (-(short)(u & 1)));
+		}
 
-	public static byte ZigZag(this sbyte s)
-	{
-		return (byte)((s << 1) ^ (s >> 7));
-	}
-	public static sbyte UnZigZag(this byte u)
-	{
-		return (sbyte)((u >> 1) ^ (-(sbyte)(u & 1)));
+		public static byte ZigZag(this sbyte s)
+		{
+			return (byte)((s << 1) ^ (s >> 7));
+		}
+		public static sbyte UnZigZag(this byte u)
+		{
+			return (sbyte)((u >> 1) ^ (-(sbyte)(u & 1)));
+		}
 	}
+
 }
+