unitycoder
diff --git a/‎Analyzer/Resources/Init.sql‎
Lines changed: 17 additions & 1 deletion b/‎Analyzer/Resources/Init.sql‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎Analyzer/SQLite/SQLiteWriter.cs‎
Lines changed: 4 additions & 2 deletions b/‎Analyzer/SQLite/SQLiteWriter.cs‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎TextDumper/TextDumperTool.cs‎
Lines changed: 17 additions & 9 deletions b/‎TextDumper/TextDumperTool.cs‎
Lines changed: 17 additions & 9 deletions
@@ -37,7 +37,8 @@ CREATE TABLE refs
 (
     object INTEGER,
     referenced_object INTEGER,
-    property_path TEXT
+    property_path TEXT,
+    property_type TEXT
 );
 
 CREATE VIEW object_view AS
@@ -84,5 +85,20 @@ GROUP BY name, type, size
 HAVING instances > 1
 ORDER BY size DESC, instances DESC;
 
+CREATE VIEW view_material_shader_refs AS
+SELECT m.id material_id, m.name material_name, a.name material_path, m.asset_bundle material_asset_bundle, s.id shader_id, s.name shader_name, s.asset_bundle shader_asset_bundle
+FROM object_view m
+INNER JOIN refs r ON m.id = r.object AND r.property_path = 'm_Shader'
+INNER JOIN object_view s ON r.referenced_object = s.id
+LEFT JOIN assets a ON m.id = a.object;
+
+CREATE VIEW view_material_texture_refs AS
+SELECT m.id material_id, m.name material_name, a.name material_path, m.asset_bundle material_asset_bundle, t.id texture_id, t.name texture_name, t.asset_bundle texture_asset_bundle
+FROM object_view m
+INNER JOIN refs r ON r.object = m.id AND property_type = "Texture"
+INNER JOIN object_view t ON r.referenced_object = t.id
+LEFT JOIN assets a ON m.id = a.object
+WHERE m.type = "Material";
+
 PRAGMA synchronous = OFF;
 PRAGMA journal_mode = MEMORY;
@@ -105,10 +105,11 @@ private void CreateSQLiteCommands()
         m_AddSerializedFileCommand.Parameters.Add("@name", DbType.String);
 
         m_AddReferenceCommand = m_Database.CreateCommand();
-        m_AddReferenceCommand.CommandText = "INSERT INTO refs (object, referenced_object, property_path) VALUES (@object, @referenced_object, @property_path)";
+        m_AddReferenceCommand.CommandText = "INSERT INTO refs (object, referenced_object, property_path, property_type) VALUES (@object, @referenced_object, @property_path, @property_type)";
         m_AddReferenceCommand.Parameters.Add("@object", DbType.Int64);
         m_AddReferenceCommand.Parameters.Add("@referenced_object", DbType.Int64);
         m_AddReferenceCommand.Parameters.Add("@property_path", DbType.String);
+        m_AddReferenceCommand.Parameters.Add("@property_type", DbType.String);
 
         m_AddObjectCommand = m_Database.CreateCommand();
         m_AddObjectCommand.CommandText = "INSERT INTO objects (id, object_id, serialized_file, type, name, game_object, size) VALUES (@id, @object_id, @serialized_file, @type, @name, @game_object, @size)";
@@ -243,12 +244,13 @@ public void WriteSerializedFile(string filename, string fullPath)
         }
     }
 
-    public void AddReference(long objectId, int fileId, long pathId, string propertyPath)
+    public void AddReference(long objectId, int fileId, long pathId, string propertyPath, string propertyType)
     {
         var referencedObjectId = m_ObjectIdProvider.GetId((m_LocalToDbFileId[fileId], pathId));
         m_AddReferenceCommand.Parameters["@object"].Value = objectId;
         m_AddReferenceCommand.Parameters["@referenced_object"].Value = referencedObjectId;
         m_AddReferenceCommand.Parameters["@property_path"].Value = propertyPath;
+        m_AddReferenceCommand.Parameters["@property_type"].Value = propertyType;
         m_AddReferenceCommand.ExecuteNonQuery();
     }
 
 
@@ -59,24 +59,30 @@ public int Dump(string path, string outputPath, bool skipLargeArrays)
     void RecursiveDump(TypeTreeNode node, ref long offset, int level)
     {
         bool skipChildren = false;
-            
+
         if (!node.IsArray)
         {
             m_StringBuilder.Append(' ', level * 2);
 
-            // Name is useless for the root.
             if (level != 0)
             {
                 m_StringBuilder.Append(node.Name);
                 m_StringBuilder.Append(' ');
+                m_StringBuilder.Append('(');
+                m_StringBuilder.Append(node.Type);
+                m_StringBuilder.Append(')');
+            }
+            else
+            {
+                // Name is useless for the root.
+                m_StringBuilder.Append(' ');
+                m_StringBuilder.Append(node.Type);
             }
-
-            m_StringBuilder.Append(node.Type);
-            m_StringBuilder.Append(' ');
 
             // Basic data type.
             if (node.IsBasicType)
             {
+                m_StringBuilder.Append(' ');
                 m_StringBuilder.Append(ReadValue(node, offset));
 
                 offset += node.Size;
@@ -85,6 +91,7 @@ void RecursiveDump(TypeTreeNode node, ref long offset, int level)
             {
                 var stringSize = m_Reader.ReadInt32(offset);
 
+                m_StringBuilder.Append(' ');
                 m_StringBuilder.Append(m_Reader.ReadString(offset + 4, stringSize));
 
                 offset += stringSize + 4;
@@ -95,7 +102,7 @@ void RecursiveDump(TypeTreeNode node, ref long offset, int level)
 
             m_Writer.WriteLine(m_StringBuilder);
             m_StringBuilder.Clear();
-                
+            
             if (node.IsManagedReferenceRegistry)
             {
                 DumpManagedReferenceRegistry(node, ref offset, level + 1);
@@ -143,10 +150,11 @@ void DumpArray(TypeTreeNode node, ref long offset, int level)
         offset += 4;
 
         m_StringBuilder.Append(' ', level * 2);
-        m_StringBuilder.Append("Array [Size=");
-        m_StringBuilder.Append(arraySize);
-        m_StringBuilder.Append(" Type=");
+        m_StringBuilder.Append("Array");
+        m_StringBuilder.Append('<');
         m_StringBuilder.Append(dataNode.Type);
+        m_StringBuilder.Append(">[");
+        m_StringBuilder.Append(arraySize);
         m_StringBuilder.Append(']');
 
         m_Writer.WriteLine(m_StringBuilder);
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,11 @@ private void CreateSQLiteCommands()`
`105`	`105`	`m_AddSerializedFileCommand.Parameters.Add("@name", DbType.String);`
`106`	`106`
`107`	`107`	`m_AddReferenceCommand = m_Database.CreateCommand();`
`108`		`- m_AddReferenceCommand.CommandText = "INSERT INTO refs (object, referenced_object, property_path) VALUES (@object, @referenced_object, @property_path)";`
	`108`	`+ m_AddReferenceCommand.CommandText = "INSERT INTO refs (object, referenced_object, property_path, property_type) VALUES (@object, @referenced_object, @property_path, @property_type)";`
`109`	`109`	`m_AddReferenceCommand.Parameters.Add("@object", DbType.Int64);`
`110`	`110`	`m_AddReferenceCommand.Parameters.Add("@referenced_object", DbType.Int64);`
`111`	`111`	`m_AddReferenceCommand.Parameters.Add("@property_path", DbType.String);`
	`112`	`+ m_AddReferenceCommand.Parameters.Add("@property_type", DbType.String);`
`112`	`113`
`113`	`114`	`m_AddObjectCommand = m_Database.CreateCommand();`
`114`	`115`	`m_AddObjectCommand.CommandText = "INSERT INTO objects (id, object_id, serialized_file, type, name, game_object, size) VALUES (@id, @object_id, @serialized_file, @type, @name, @game_object, @size)";`
`@@ -243,12 +244,13 @@ public void WriteSerializedFile(string filename, string fullPath)`
`243`	`244`	`}`
`244`	`245`	`}`
`245`	`246`
`246`		`- public void AddReference(long objectId, int fileId, long pathId, string propertyPath)`
	`247`	`+ public void AddReference(long objectId, int fileId, long pathId, string propertyPath, string propertyType)`
`247`	`248`	`{`
`248`	`249`	`var referencedObjectId = m_ObjectIdProvider.GetId((m_LocalToDbFileId[fileId], pathId));`
`249`	`250`	`m_AddReferenceCommand.Parameters["@object"].Value = objectId;`
`250`	`251`	`m_AddReferenceCommand.Parameters["@referenced_object"].Value = referencedObjectId;`
`251`	`252`	`m_AddReferenceCommand.Parameters["@property_path"].Value = propertyPath;`
	`253`	`+ m_AddReferenceCommand.Parameters["@property_type"].Value = propertyType;`
`252`	`254`	`m_AddReferenceCommand.ExecuteNonQuery();`
`253`	`255`	`}`
`254`	`256`