Simplified a bunch of stuff related to the text formatter

Author: pandr

Assets/DebugOverlay/Console.cs

@@ -336,28 +336,28 @@ public void _Write(char[] buf, int length)
  }
  }
 
- char[] _buf = new char[1024];
- public void _Write<T>(string format, T argList) where T : IArgList
- {
- var length = StringFormatter.__Write<T>(ref _buf, 0, format, argList);
- _Write(_buf, length);
- }
+ static char[] _buf = new char[1024];
 
  public void Write(string format)
  {
- _Write(format, new ArgList0());
+ var l = StringFormatter.Write(ref _buf, 0, format);
+ _Write(_buf, l);
  }
+
  public void Write<T>(string format, T arg)
  {
- _Write(format, new ArgList1<T>(arg));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg);
+ _Write(_buf, l);
  }
  public void Write<T0, T1>(string format, T0 arg0, T1 arg1)
  {
- _Write(format, new ArgList2<T0, T1>(arg0, arg1));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg0, arg1);
+ _Write(_buf, l);
  }
  public void Write<T0, T1, T2>(string format, T0 arg0, T1 arg1, T2 arg2)
  {
- _Write(format, new ArgList3<T0, T1, T2>(arg0, arg1, arg2));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg0, arg1, arg2);
+ _Write(_buf, l);
  }
 
  void Type(char c)

Assets/DebugOverlay/DebugOverlay.cs

@@ -113,41 +113,47 @@ public static void Write(float x, float y, string format)
  {
  if (instance == null)
  return;
- instance._Write(x, y, format, new ArgList0());
+ var l = StringFormatter.Write(ref _buf, 0, format);
+ instance._DrawText(x, y, ref _buf, l);
  }
  public static void Write<T>(float x, float y, string format, T arg)
  {
  if (instance == null)
  return;
- instance._Write(x, y, format, new ArgList1<T>(arg));
+ var l = StringFormatter.Write<T>(ref _buf, 0, format, arg);
+ instance._DrawText(x, y, ref _buf, l);
  }
  public static void Write<T>(Color col, float x, float y, string format, T arg)
  {
  if (instance == null)
  return;
  Color c = instance.m_CurrentColor;
  instance.m_CurrentColor = col;
- instance._Write(x, y, format, new ArgList1<T>(arg));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg);
+ instance._DrawText(x, y, ref _buf, l);
  instance.m_CurrentColor = c;
  }
  public static void Write<T0, T1>(float x, float y, string format, T0 arg0, T1 arg1)
  {
  if (instance == null)
  return;
- instance._Write(x, y, format, new ArgList2<T0, T1>(arg0, arg1));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg0, arg1);
+ instance._DrawText(x, y, ref _buf, l);
  }
  public static void Write<T0, T1, T2>(float x, float y, string format, T0 arg0, T1 arg1, T2 arg2)
  {
  if (instance == null)
  return;
- instance._Write(x, y, format, new ArgList3<T0, T1, T2>(arg0, arg1, arg2));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg0, arg1, arg2);
+ instance._DrawText(x, y, ref _buf, l);
  }
 
  public static void Write<T0, T1, T2, T3>(float x, float y, string format, T0 arg0, T1 arg1, T2 arg2, T3 arg3)
  {
  if (instance == null)
  return;
- instance._Write(x, y, format, new ArgList4<T0, T1, T2, T3>(arg0, arg1, arg2, arg3));
+ var l = StringFormatter.Write(ref _buf, 0, format, arg0, arg1, arg2, arg3);
+ instance._DrawText(x, y, ref _buf, l);
  }
 
  // Draw a histogram of one set of data. Data must contain non-negative datapoints.
@@ -349,12 +355,7 @@ void _Clear()
  SetOrigin(0, 0);
  }
 
- char[] _buf = new char[1024];
- void _Write<T>(float x, float y, string format, T argList) where T : IArgList
- {
- var num = StringFormatter.__Write<T>(ref _buf, 0, format, argList);
- _DrawText(x, y, ref _buf, num);
- }
+ static char[] _buf = new char[1024];
 
  public void Render()
  {

Assets/DebugOverlay/TextFormatter.cs

@@ -124,110 +124,39 @@ void ConvertInt(ref char* dst, char* end, int value, int argWidth, int integerWi
  }
 }
 
-public unsafe interface IArgList
+/// <summary>
+/// Garbage free string formatter
+/// </summary>
+public static unsafe class StringFormatter
 {
- int Count { get; }
-
- void Format(ref char* dst, char* end, int argIndex, FormatSpec formatSpec);
-}
+ private class NoArg {}
 
-public unsafe struct ArgList0 : IArgList
-{
- public int Count { get { return 0; } }
- public void Format(ref char* dst, char* end, int argIndex, FormatSpec formatSpec)
+ public static int Write(ref char[] dst, int destIdx, string format)
  {
+ return Write<NoArg, NoArg, NoArg, NoArg, NoArg, NoArg>(ref dst, destIdx, format, null, null, null, null, null, null);
  }
-}
-public unsafe struct ArgList1<T0> : IArgList
-{
- public int Count { get { return 1; } }
- T0 t0;
- public ArgList1(T0 a0)
+ public static int Write<T0>(ref char[] dst, int destIdx, string format, T0 arg0)
  {
- t0 = a0;
+ return Write<T0, NoArg, NoArg, NoArg, NoArg, NoArg>(ref dst, destIdx, format, arg0, null, null, null, null, null);
  }
- public void Format(ref char* dst, char* end, int argIndex, FormatSpec formatSpec)
+ public static int Write<T0,T1>(ref char[] dst, int destIdx, string format, T0 arg0, T1 arg1)
  {
- switch (argIndex)
- {
- case 0: (Converter.instance as IConverter<T0>).Convert(ref dst, end, t0, formatSpec); break;
- }
+ return Write<T0, T1, NoArg, NoArg, NoArg, NoArg>(ref dst, destIdx, format, arg0, arg1, null, null, null, null);
  }
-}
-public unsafe struct ArgList2<T0, T1> : IArgList
-{
- public int Count { get { return 2; } }
- T0 t0;
- T1 t1;
- public ArgList2(T0 a0, T1 a1)
+ public static int Write<T0,T1,T2>(ref char[] dst, int destIdx, string format, T0 arg0, T1 arg1, T2 arg2)
  {
- t0 = a0;
- t1 = a1;
+ return Write<T0, T1, T2, NoArg, NoArg, NoArg>(ref dst, destIdx, format, arg0, arg1, arg2, null, null, null);
  }
- public void Format(ref char* dst, char* end, int argIndex, FormatSpec formatSpec)
+ public static int Write<T0,T1,T2,T3>(ref char[] dst, int destIdx, string format, T0 arg0, T1 arg1, T2 arg2, T3 arg3)
  {
- switch (argIndex)
- {
- case 0: (Converter.instance as IConverter<T0>).Convert(ref dst, end, t0, formatSpec); break;
- case 1: (Converter.instance as IConverter<T1>).Convert(ref dst, end, t1, formatSpec); break;
- }
+ return Write<T0, T1, T2, T3, NoArg, NoArg>(ref dst, destIdx, format, arg0, arg1, arg2, arg3, null, null);
  }
-}
-public unsafe struct ArgList3<T0, T1, T2> : IArgList
-{
- public int Count { get { return 3; } }
- T0 t0;
- T1 t1;
- T2 t2;
- public ArgList3(T0 a0, T1 a1, T2 a2)
+ public static int Write<T0,T1,T2,T3,T4>(ref char[] dst, int destIdx, string format, T0 arg0, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
  {
- t0 = a0;
- t1 = a1;
- t2 = a2;
+ return Write<T0, T1, T2, T3, T4, NoArg>(ref dst, destIdx, format, arg0, arg1, arg2, arg3, arg4, null);
  }
- public void Format(ref char* dst, char* end, int argIndex, FormatSpec formatSpec)
- {
- switch (argIndex)
- {
- case 0: (Converter.instance as IConverter<T0>).Convert(ref dst, end, t0, formatSpec); break;
- case 1: (Converter.instance as IConverter<T1>).Convert(ref dst, end, t1, formatSpec); break;
- case 2: (Converter.instance as IConverter<T2>).Convert(ref dst, end, t2, formatSpec); break;
- }
- }
-}
 
-public unsafe struct ArgList4<T0, T1, T2, T3> : IArgList
-{
- public int Count { get { return 4; } }
- T0 t0;
- T1 t1;
- T2 t2;
- T3 t3;
- public ArgList4(T0 a0, T1 a1, T2 a2, T3 a3)
- {
- t0 = a0;
- t1 = a1;
- t2 = a2;
- t3 = a3;
- }
- public void Format(ref char* dst, char* end, int argIndex, FormatSpec formatSpec)
- {
- switch (argIndex)
- {
- case 0: (Converter.instance as IConverter<T0>).Convert(ref dst, end, t0, formatSpec); break;
- case 1: (Converter.instance as IConverter<T1>).Convert(ref dst, end, t1, formatSpec); break;
- case 2: (Converter.instance as IConverter<T2>).Convert(ref dst, end, t2, formatSpec); break;
- case 3: (Converter.instance as IConverter<T3>).Convert(ref dst, end, t3, formatSpec); break;
- }
- }
-}
-
-/// <summary>
-/// Garbage free string formatter
-/// </summary>
-public static unsafe class StringFormatter
-{
- public static int __Write<T>(ref char[] dst, int destIdx, string format, T argList) where T : IArgList
+ public static int Write<T0, T1, T2, T3, T4, T5>(ref char[] dst, int destIdx, string format, T0 arg0, T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
  {
  int written = 0;
  fixed (char* p = format, d = &dst[0])
@@ -299,10 +228,17 @@ public static int __Write<T>(ref char[] dst, int destIdx, string format, T argLi
  else
  src++;
 
- if (argNum < 0 || argNum >= argList.Count)
- throw new IndexOutOfRangeException(argNum.ToString());
-
- argList.Format(ref dest, end, argNum, s);
+ switch(argNum)
+ {
+ case 0: ((IConverter<T0>)Converter.instance).Convert(ref dest, end, arg0, s); break;
+ case 1: ((IConverter<T1>)Converter.instance).Convert(ref dest, end, arg1, s); break;
+ case 2: ((IConverter<T2>)Converter.instance).Convert(ref dest, end, arg2, s); break;
+ case 3: ((IConverter<T3>)Converter.instance).Convert(ref dest, end, arg3, s); break;
+ case 4: ((IConverter<T4>)Converter.instance).Convert(ref dest, end, arg4, s); break;
+ case 5: ((IConverter<T5>)Converter.instance).Convert(ref dest, end, arg5, s); break;
+ default:
+ throw new IndexOutOfRangeException(argNum.ToString());
+ }
  }
  else
  {

ProjectSettings/DynamicsManager.asset

@@ -3,7 +3,7 @@
 --- !u!55 &1
 PhysicsManager:
  m_ObjectHideFlags: 0
- serializedVersion: 3
+ serializedVersion: 5
  m_Gravity: {x: 0, y: -9.81, z: 0}
  m_DefaultMaterial: {fileID: 0}
  m_BounceThreshold: 2
@@ -15,5 +15,9 @@ PhysicsManager:
  m_QueriesHitTriggers: 1
  m_EnableAdaptiveForce: 0
  m_EnablePCM: 1
+ m_ClothInterCollisionDistance: 0
+ m_ClothInterCollisionStiffness: 0
  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
  m_AutoSimulation: 1
+ m_AutoSyncTransforms: 1
+ m_ClothInterCollisionSettingsToggle: 0

ProjectSettings/Physics2DSettings.asset

@@ -24,6 +24,7 @@ Physics2DSettings:
  m_QueriesStartInColliders: 1
  m_ChangeStopsCallbacks: 0
  m_CallbacksOnDisable: 1
+ m_AutoSyncTransforms: 1
  m_AlwaysShowColliders: 0
  m_ShowColliderSleep: 1
  m_ShowColliderContacts: 0

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.1.0p5
+m_EditorVersion: 2017.3.0f3

UnityPackageManager/manifest.json

@@ -0,0 +1,4 @@
+{
+"dependencies": {
+}
+}