Fix for ui drawing not on top of everything. Less singletonmess. General cleanup

Author: pandr

Assets/DebugOverlay/Console.cs

@@ -51,18 +51,18 @@ void CmdHelp(string[] args)
 
  public void Init()
  {
- Init(80, 25);
+ Init(null);
  }
 
- public void Init(int width, int height)
+ public void Init(DebugOverlay debugOverlay)
  {
- Resize(width, height);
+ m_DebugOverlay = debugOverlay != null ? debugOverlay : DebugOverlay.instance;
+ Resize(m_DebugOverlay.width, m_DebugOverlay.height);
  Clear();
  }
 
  public void Shutdown()
  {
-
  }
 
  public delegate void CommandDelegate(string[] args);
@@ -235,7 +235,7 @@ public void TickLateUpdate()
  return;
 
  var yoffset = -(float)m_Height * (1.0f - m_ConsoleFoldout);
- DebugOverlay.DrawRect(0, 0 + yoffset, m_Width, m_Height, m_BackgroundColor);
+ m_DebugOverlay._DrawRect(0, 0 + yoffset, m_Width, m_Height, m_BackgroundColor);
 
  var line = m_LastVisibleLine;
  if ((m_LastVisibleLine == m_LastLine) && (m_LastColumn == 0))
@@ -260,7 +260,7 @@ public void TickLateUpdate()
  col.z = (float)((icol >> 8) & 0xff) / 255.0f;
  }
  if (c != '\0')
- DebugOverlay.instance.AddQuad(j, m_Height - 2 - i + yoffset, 1, 1, ch, col);
+ m_DebugOverlay.AddQuad(j, m_Height - 2 - i + yoffset, 1, 1, ch, col);
  }
  }
 
@@ -271,9 +271,9 @@ public void TickLateUpdate()
  {
  char c = m_InputFieldBuffer[i];
  if (c != '\0')
- DebugOverlay.instance.AddQuad(i - horizontalScroll, m_Height - 1 + yoffset, 1, 1, c, m_TextColor);
+ m_DebugOverlay.AddQuad(i - horizontalScroll, m_Height - 1 + yoffset, 1, 1, c, m_TextColor);
  }
- DebugOverlay.instance.AddQuad(m_CursorPos - horizontalScroll, m_Height - 1 + yoffset, 1, 1, '\0', m_CursorCol);
+ m_DebugOverlay.AddQuad(m_CursorPos - horizontalScroll, m_Height - 1 + yoffset, 1, 1, '\0', m_CursorCol);
  }
 
  void NewLine()
@@ -430,4 +430,5 @@ static int CommonPrefix(string a, string b)
  return minl;
  }
 
+ DebugOverlay m_DebugOverlay;
 }

Assets/DebugOverlay/DebugOverlay.cs

@@ -1,40 +1,29 @@
 using UnityEngine;
 using System.Collections;
 
-public class DebugOverlay : MonoBehaviour
+public class DebugOverlay
 {
- [Header("Overlay size")]
- [SerializeField]
- int width = 80;
- [SerializeField]
- int height = 25;
-
- [Header("Font material info")]
- public Material instanceMaterialProc;
- [Tooltip("Number of columns of glyphs on texture")]
- public int charCols = 30;
- [Tooltip("Number of rows of glyphs on texture")]
- public int charRows = 16;
- [Tooltip("Width in pixels of each glyph")]
- public int cellWidth = 32;
- [Tooltip("Height in pixels of each glyph")]
- public int cellHeight = 32;
-
- public Shader lineShaderProc;
+ public int width = 80;
+ public int height = 25;
 
  public static DebugOverlay instance;
+ static DebugOverlayResources resources;
 
  public static int Width { get { return instance.width; } }
  public static int Height { get { return instance.height; } }
 
- void Awake()
+ public void Init(int w, int h)
  {
- m_LineMaterial = new Material(lineShaderProc);
- }
+ if(resources == null)
+ {
+ resources = Resources.Load<DebugOverlayResources>("DebugOverlayResources");
+ Debug.Assert(resources != null, "Unable to load DebugOverlayResources");
+ }
+ if (instance == null)
+ instance = this;
 
- public void Init()
- {
- instance = this;
+ width = w;
+ height = h;
  }
 
  public void Shutdown()
@@ -49,7 +38,8 @@ public void Shutdown()
  m_LineInstanceBuffer = null;
  m_LineInstanceData = null;
 
- instance = null;
+ if (instance == this)
+ instance = null;
  }
 
  public void TickLateUpdate()
@@ -64,7 +54,7 @@ public void TickLateUpdate()
  }
 
  m_QuadInstanceBuffer = new ComputeBuffer(m_QuadInstanceData.Length, 16 + 16 + 16);
- instanceMaterialProc.SetBuffer("positionBuffer", m_QuadInstanceBuffer);
+ resources.glyphMaterial.SetBuffer("positionBuffer", m_QuadInstanceBuffer);
  }
 
  if (m_LineInstanceBuffer == null || m_LineInstanceBuffer.count != m_LineInstanceData.Length)
@@ -76,7 +66,7 @@ public void TickLateUpdate()
  }
 
  m_LineInstanceBuffer = new ComputeBuffer(m_LineInstanceData.Length, 16 + 16);
- m_LineMaterial.SetBuffer("positionBuffer", m_LineInstanceBuffer);
+ resources.lineMaterial.SetBuffer("positionBuffer", m_LineInstanceBuffer);
  }
 
  m_QuadInstanceBuffer.SetData(m_QuadInstanceData, 0, 0, m_NumQuadsUsed);
@@ -85,21 +75,17 @@ public void TickLateUpdate()
  m_LineInstanceBuffer.SetData(m_LineInstanceData, 0, 0, m_NumLinesUsed);
  m_NumLinesToDraw = m_NumLinesUsed;
 
- instanceMaterialProc.SetVector("scales", new Vector4(
+ resources.glyphMaterial.SetVector("scales", new Vector4(
  1.0f / width,
  1.0f / height,
- (float)cellWidth / instanceMaterialProc.mainTexture.width,
- (float)cellHeight / instanceMaterialProc.mainTexture.height));
+ (float)resources.cellWidth / resources.glyphMaterial.mainTexture.width,
+ (float)resources.cellHeight / resources.glyphMaterial.mainTexture.height));
 
- m_LineMaterial.SetVector("scales", new Vector4(1.0f / width, 1.0f / height, 1.0f / 1280.0f, 1.0f / 720.0f));
+ resources.lineMaterial.SetVector("scales", new Vector4(1.0f / width, 1.0f / height, 1.0f / 1280.0f, 1.0f / 720.0f));
 
  _Clear();
  }
 
- /// <summary>
- /// Set color of text. 
- /// </summary>
- /// <param name="col"></param>
  public static void SetColor(Color col)
  {
  if (instance == null)
@@ -351,7 +337,7 @@ void _DrawHist(float x, float y, float w, float h, float[][] data, int startSamp
  }
  }
 
- void _DrawRect(float x, float y, float w, float h, Color col)
+ public void _DrawRect(float x, float y, float w, float h, Color col)
  {
  AddQuad(m_OriginX + x, m_OriginY + y, w, h, '\0', col);
  }
@@ -370,11 +356,11 @@ void _Write<T>(float x, float y, string format, T argList) where T : IArgList
  _DrawText(x, y, ref _buf, num);
  }
 
- void OnPostRender()
+ public void Render()
  {
- m_LineMaterial.SetPass(0);
+ resources.lineMaterial.SetPass(0);
  Graphics.DrawProcedural(MeshTopology.Triangles, m_NumLinesToDraw * 6, 1);
- instanceMaterialProc.SetPass(0);
+ resources.glyphMaterial.SetPass(0);
  Graphics.DrawProcedural(MeshTopology.Triangles, m_NumQuadsToDraw * 6, 1);
  }
 
@@ -412,8 +398,8 @@ public unsafe void AddQuad(float x, float y, float w, float h, char c, Vector4 c
  {
  if (c != '\0')
  {
- d->positionAndUV.z = (c - 32) % charCols;
- d->positionAndUV.w = (c - 32) / charCols;
+ d->positionAndUV.z = (c - 32) % resources.charCols;
+ d->positionAndUV.w = (c - 32) / resources.charCols;
  col.w = 0.0f;
  }
  else
@@ -461,6 +447,4 @@ struct LineInstanceData
  int m_NumLinesToDraw = 0;
  QuadInstanceData[] m_QuadInstanceData = new QuadInstanceData[128];
  LineInstanceData[] m_LineInstanceData = new LineInstanceData[128];
-
- Material m_LineMaterial;
 }

Assets/DebugOverlay/DebugOverlayResources.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu]
+public class DebugOverlayResources : ScriptableObject
+{
+ [Tooltip("Number of columns of glyphs on texture")]
+ public int charCols = 30;
+ [Tooltip("Number of rows of glyphs on texture")]
+ public int charRows = 16;
+ [Tooltip("Width in pixels of each glyph")]
+ public int cellWidth = 32;
+ [Tooltip("Height in pixels of each glyph")]
+ public int cellHeight = 32;
+
+ public Material lineMaterial;
+ public Material glyphMaterial;
+}

Assets/DebugOverlay/DebugOverlayResources.cs.meta

@@ -6,7 +6,7 @@ Material:
  m_ObjectHideFlags: 0
  m_PrefabParentObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
- m_Name: GlyphMatProc
+ m_Name: GlyphMaterial
  m_Shader: {fileID: 4800000, guid: e77d75abe795e9040a2f1c7a49576231, type: 3}
  m_ShaderKeywords: 
  m_LightmapFlags: 4

Assets/DebugOverlay/GlyphMatProc.mat Assets/DebugOverlay/GlyphMaterial.matAssets/DebugOverlay/GlyphMatProc.mat renamed to Assets/DebugOverlay/GlyphMaterial.mat

@@ -63,6 +63,7 @@ Shader "Instanced/GlyphShaderProc" {
 
 // Generate position
 float2 p = (v_pos*scale + pos_uv.xy) * scales.xy;
+p.y = 1.0 - p.y;
 p = float2(-1, -1) + p * 2.0;
 
 v2f o;

Assets/DebugOverlay/GlyphMatProc.mat.meta …sets/DebugOverlay/GlyphMaterial.mat.metaAssets/DebugOverlay/GlyphMatProc.mat.meta renamed to Assets/DebugOverlay/GlyphMaterial.mat.meta Assets/DebugOverlay/GlyphMatProc.mat.meta renamed to Assets/DebugOverlay/GlyphMaterial.mat.meta

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_Name: LineMaterial
+ m_Shader: {fileID: 4800000, guid: b0127e7e38d54ef4394014ff4ccab268, type: 3}
+ m_ShaderKeywords: 
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: dfd2b625635c1ee439ec40cb25a86661, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/DebugOverlay/GlyphShaderProc.shader

@@ -60,6 +60,7 @@ Shader "Instanced/LineShaderProc" {
 float2 dir = pos.zw - pos.xy;
 float2 pdir = normalize(float2(-dir.y, dir.x));
 float2 p = (pos.xy + dir*v_pos.y)*scales.xy + pdir * 3.0 * v_pos.x * scales.zw;
+p.y = 1.0 - p.y;
 p = float2(-1, -1) + p * 2.0;
 
 v2f o;