Merge pull request #35 from eelstork/dev

Dev

Author: eelstork

Editor/Core/UI/LogWindow-DebugChan.cs

@@ -42,7 +42,7 @@ void DrawLoggerTextView(float time, int? height){
     }
 
     string EvalTextContent(float time){
-        var logger = (Activ.Loggr.Logger<string, object>) DebugChan.logger;
+        var logger = (Activ.Loggr.Logger<LogMessage, object>) DebugChan.logger;
         if(logger == null){
             return "";  // "Debug-Chan: not running";
         }

Editor/Core/UI/LogWindow.cs

@@ -125,7 +125,7 @@ void DrawTextView(string text, int? height, ref Vector2 scroll){
     void ConfigTextAreaStyle(){
         var f = monofont;
         if(f == null) Debug.LogError("font not available");
-        var style = GUI.skin.button;
+        var style = GUI.skin.textArea;
         style.font = f;
         style.fontSize = FontSize;
         style.normal.textColor  = Color.white * 0.9f;

Editor/Core/UI/LogWindowModel.cs

@@ -14,8 +14,8 @@ public class LogWindowModel{
     public int? currentFrame;
     public PrologHistory filtered{ get; private set; }
     PrologFilter filter;
-    public PrologFrame   pgRange;  // selected prolog range
-    public Range<string> dcRange;  // selected debug-chan range
+    public PrologFrame       pgRange;  // selected prolog range
+    public Range<LogMessage> dcRange;  // selected debug-chan range
 
     public LogWindowModel(){
         PrologLogger.onFrame += OnPrologFrame;

Editor/DebugChan/LoggingManager.cs

@@ -13,7 +13,7 @@ static LoggingManager(){
     static void OnPlayState(PlayModeStateChange state){
         switch(state){
             case PlayModeStateChange.EnteredPlayMode:
-                DebugChan.logger = new Logger<string, object>();
+                DebugChan.logger = new Logger<LogMessage, object>();
                 DebugChan.logToConsole = Config.logToConsole;
                 DebugChan.maxMessages = Config.maxMessages == 0
                     ? (int?)null

Runtime/Core/Range.cs

@@ -38,9 +38,18 @@ public string Format(float time)
     => FormatSpan(time) + "\n" + messages.Format();
 
     string FormatSpan()
-    => $"[ {start.frame} → {end.frame} ]";
+    => spanFormat + ' ' + durationFormat;
 
     string FormatSpan(float time)
-    => $"[ {start.frame} → {end.frame} ] {(time - start.time):0.00}s ago ";
+    => spanFormat + $" {(time - start.time):0.00}s ago "
+       + durationFormat;
+
+    string spanFormat => duration == 0 ? $"[{start.frame}]"
+                       : $"[{start.frame} → {end.frame}]";
+
+    string durationFormat
+    => duration == 0 ? null : $"({duration:0.000}s)";
+
+    float duration => end.time - start.time;
 
 }}

Runtime/DebugChan/DebugChan.cs

@@ -1,3 +1,8 @@
+using System.Diagnostics;
+using S  = System.String;
+using P  = System.Runtime.CompilerServices.CallerFilePathAttribute;
+using M  = System.Runtime.CompilerServices.CallerMemberNameAttribute;
+using L  = System.Runtime.CompilerServices.CallerLineNumberAttribute;
 using UnityEngine;
 using Activ.Loggr; using Activ.LogChan;
 
@@ -6,12 +11,18 @@ public static class DebugChan{
     public static bool logToConsole;
     public static int? maxMessages = null;
 
-    public static Logger<string, object> logger;
+    public static Logger<LogMessage, object> logger;
 
-    public static void Print(string arg, object source){
-        logger?.Log(arg, RemapSource(source), maxMessages);
+    [Conditional("UNITY_EDITOR"), Conditional("DEBUG")]
+    public static void Print(
+        string arg, object source,
+        [P] S path="", [M] S member="", [L] int line=0)
+    {
+        logger?.Log(
+            new LogMessage(arg, path, member, line),
+            RemapSource(source), maxMessages);
         if(logToConsole)
-            Debug.Log(arg, source as UnityEngine.Object);
+            UnityEngine.Debug.Log(arg, source as UnityEngine.Object);
     }
 
     static object RemapSource(object arg){

Runtime/DebugChan/LogInfo.cs

@@ -0,0 +1,13 @@
+namespace Activ.Loggr{
+public readonly struct LogInfo{
+
+    readonly string path, member;
+    readonly int line;
+
+    public LogInfo(string path, string member, int line){
+        this.path = path;
+        this.member = member;
+        this.line = line;
+    }
+
+}}

Runtime/DebugChan/LogInfo.cs.meta

@@ -0,0 +1,31 @@
+namespace Activ.Loggr{
+public readonly struct LogMessage{
+
+    #if UNITY_EDITOR_WIN
+    const char pathsep = '\\';
+    #else
+    const char pathsep = '/';
+    #endif
+
+    readonly string message;
+    readonly LogInfo info;
+    readonly string quickFormat;
+
+    public LogMessage(string message,
+                      string path, string member, int line){
+        this.message = message;
+        this.info = new LogInfo(path, member, line);
+        var filename = QuickParseFileName(path);
+        quickFormat =
+            line.ToString().PadLeft(3, '0') + "| "
+            + filename + "." + member + ": " + message;
+    }
+
+    override public string ToString() => quickFormat;
+
+    static string QuickParseFileName(string arg){
+        var i = arg.LastIndexOf(pathsep);
+        return arg.Substring(i + 1, arg.Length - (i + 4));
+    }
+
+}}