DebugLogEntry now holds LogType rather than Sprite

Author: yasirkula

Plugins/IngameDebugConsole/Scripts/DebugLogEntry.cs

@@ -15,7 +15,7 @@ public class DebugLogEntry
 		private string completeLog;
 
 		// Sprite to show with this entry
-		public Sprite logTypeSpriteRepresentation;
+		public LogType logType;
 
 		// Collapsed count
 		public int count;

Plugins/IngameDebugConsole/Scripts/DebugLogItem.cs

@@ -149,7 +149,7 @@ public void SetContent( DebugLogEntry logEntry, DebugLogEntryTimestamp? logEntry
 			transformComponent.sizeDelta = size;
 
 			SetText( logEntry, logEntryTimestamp, isExpanded );
-			logTypeImage.sprite = logEntry.logTypeSpriteRepresentation;
+			logTypeImage.sprite = DebugLogManager.logSpriteRepresentations[(int) logEntry.logType];
 		}
 
 		// Show the collapsed count of the debug entry

Plugins/IngameDebugConsole/Scripts/DebugLogManager.cs

@@ -228,7 +228,7 @@ public class DebugLogManager : MonoBehaviour
 		[SerializeField]
 		private Sprite errorLog;
 
-		private Sprite[] logSpriteRepresentations;
+		internal static Sprite[] logSpriteRepresentations;
 
 		// Visuals for resize button
 		[SerializeField]
@@ -1192,7 +1192,7 @@ private void ProcessLog( QueuedDebugLogEntry queuedLogEntry, DebugLogEntryTimest
 			{
 				// It is not a duplicate,
 				// add it to the list of unique debug entries
-				logEntry.logTypeSpriteRepresentation = logSpriteRepresentations[(int) logType];
+				logEntry.logType = logType;
 				logEntry.collapsedIndex = collapsedLogEntries.Count;
 
 				collapsedLogEntries.Add( logEntry );
@@ -1222,7 +1222,6 @@ private void ProcessLog( QueuedDebugLogEntry queuedLogEntry, DebugLogEntryTimest
 			// If this debug entry matches the current filters,
 			// add it to the list of debug entries to show
 			int logEntryIndexInEntriesToShow = -1;
-			Sprite logTypeSpriteRepresentation = logEntry.logTypeSpriteRepresentation;
 			if( isCollapseOn && isEntryInCollapsedEntryList )
 			{
 				if( isLogWindowVisible || timestampsOfLogEntriesToShow != null )
@@ -1243,9 +1242,9 @@ private void ProcessLog( QueuedDebugLogEntry queuedLogEntry, DebugLogEntryTimest
 				}
 			}
 			else if( ( !isInSearchMode || queuedLogEntry.MatchesSearchTerm( searchTerm ) ) && ( logFilter == DebugLogFilter.All ||
-			   ( logTypeSpriteRepresentation == infoLog && ( ( logFilter & DebugLogFilter.Info ) == DebugLogFilter.Info ) ) ||
-			   ( logTypeSpriteRepresentation == warningLog && ( ( logFilter & DebugLogFilter.Warning ) == DebugLogFilter.Warning ) ) ||
-			   ( logTypeSpriteRepresentation == errorLog && ( ( logFilter & DebugLogFilter.Error ) == DebugLogFilter.Error ) ) ) )
+			   ( logType == LogType.Log && ( ( logFilter & DebugLogFilter.Info ) == DebugLogFilter.Info ) ) ||
+			   ( logType == LogType.Warning && ( ( logFilter & DebugLogFilter.Warning ) == DebugLogFilter.Warning ) ) ||
+			   ( logType != LogType.Log && logType != LogType.Warning && ( ( logFilter & DebugLogFilter.Error ) == DebugLogFilter.Error ) ) ) )
 			{
 				logEntriesToShow.Add( logEntry );
 				logEntryIndexInEntriesToShow = logEntriesToShow.Count - 1;
@@ -1327,9 +1326,9 @@ private void RemoveUncollapsedLogEntry( DebugLogEntry logEntry )
 			if( !isCollapseOn && logEntriesToShow[removedLogEntriesToShowCount] == logEntry )
 				removedLogEntriesToShowCount++;
 
-			if( logEntry.logTypeSpriteRepresentation == infoLog )
+			if( logEntry.logType == LogType.Log )
 				infoEntryCount--;
-			else if( logEntry.logTypeSpriteRepresentation == warningLog )
+			else if( logEntry.logType == LogType.Warning )
 				warningEntryCount--;
 			else
 				errorEntryCount--;
@@ -1733,12 +1732,12 @@ private void FilterLogs()
 							continue;
 
 						bool shouldShowLog = false;
-						if( logEntry.logTypeSpriteRepresentation == infoLog )
+						if( logEntry.logType == LogType.Log )
 						{
 							if( isInfoEnabled )
 								shouldShowLog = true;
 						}
-						else if( logEntry.logTypeSpriteRepresentation == warningLog )
+						else if( logEntry.logType == LogType.Warning )
 						{
 							if( isWarningEnabled )
 								shouldShowLog = true;