Modified sorting code to allow for layered sorting

Finalized everything Perfect read write xml and binary Sorting for everything that needs it
TaleOfTwoWastelands · Jul 22, 2015 · deda3c5 · deda3c5
1 parent f095ca1
commit deda3c5
Show file tree

Hide file tree

Showing 225 changed files with 910 additions and 391 deletions.
diff --git a/ESPSharp/DataTypes/GeneratedCode/AlternateTexture.cs b/ESPSharp/DataTypes/GeneratedCode/AlternateTexture.cs
@@ -99,8 +99,16 @@ public object Clone()
 
         public int CompareTo(AlternateTexture other)
         {
-			return Index.CompareTo(other.Index);
-        }
+			int result = 0;
+
+			if (result == 0 && Name != null && other.Name != null)	
+				result = Name.CompareTo(other.Name);
+
+			if (result == 0 && Index != null && other.Index != null)	
+				result = Index.CompareTo(other.Index);
+
+			return result;
+		}
 
         public static bool operator >(AlternateTexture objA, AlternateTexture objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/AlternateTexture.tt b/ESPSharp/DataTypes/GeneratedCode/AlternateTexture.tt
@@ -1,8 +1,6 @@
 <#	
 	ClassTemplate template = new ClassTemplate();
 	template.ClassName = "AlternateTexture";
-	//template.implementReadData = false;
-	//template.implementWriteData = false;
 
 	ClassField tempField;
 
@@ -12,6 +10,7 @@
 			"Name",
 			"Name"
 			);
+	tempField.sortIndex = 0;
 	tempField.implementReadData = false;
 	tempField.implementWriteData = false;
 	template.Fields.Add(tempField);
@@ -30,6 +29,7 @@
 			"Index",
 			"Index"
 			);
+	tempField.sortIndex = 1;
 	template.hashKey = tempField;
 	template.Fields.Add(tempField);
 #>

diff --git a/ESPSharp/DataTypes/GeneratedCode/Color.cs b/ESPSharp/DataTypes/GeneratedCode/Color.cs
@@ -109,8 +109,10 @@ public object Clone()
 
         public int CompareTo(Color other)
         {
-			return Red.CompareTo(other.Red);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(Color objA, Color objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/DataTypeTemplate.t4 b/ESPSharp/DataTypes/GeneratedCode/DataTypeTemplate.t4
@@ -95,8 +95,15 @@ namespace ESPSharp.DataTypes
 <# if(template.isComparable) { #>
         public int CompareTo(<#= template.ClassName #> other)
         {
-			<# WriteCompareHashKeyCommand(template); #>
-        }
+			int result = 0;
+<# foreach (var field in template.Fields.Where(f => f.sortIndex >= 0).OrderBy(o => o.sortIndex)) { #>
+
+			if (result == 0 && <#= field.Name#> != null && other.<#= field.Name#> != null)	
+				<# WriteCompareCommand(field); #>
+<# } #>
+
+			return result;
+		}
 
         public static bool operator >(<#= template.ClassName #> objA, <#= template.ClassName #> objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/DateStamp.cs b/ESPSharp/DataTypes/GeneratedCode/DateStamp.cs
@@ -85,8 +85,10 @@ public object Clone()
 
         public int CompareTo(DateStamp other)
         {
-			return MonthsSince2001.CompareTo(other.MonthsSince2001);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(DateStamp objA, DateStamp objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/FormID.cs b/ESPSharp/DataTypes/GeneratedCode/FormID.cs
@@ -71,8 +71,13 @@ public object Clone()
 
         public int CompareTo(FormID other)
         {
-			return RawValue.CompareTo(other.RawValue);
-        }
+			int result = 0;
+
+			if (result == 0 && RawValue != null && other.RawValue != null)	
+				result = RawValue.CompareTo(other.RawValue);
+
+			return result;
+		}
 
         public static bool operator >(FormID objA, FormID objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/FormID.tt b/ESPSharp/DataTypes/GeneratedCode/FormID.tt
@@ -13,6 +13,7 @@
 	tempField.implementReadXML = false;
 	tempField.implementWriteXML = false;
 	template.hashKey = tempField;
+	tempField.sortIndex = 0;
 	tempField.isReadOnly = true;
 	template.Fields.Add(tempField);
 #>

diff --git a/ESPSharp/DataTypes/GeneratedCode/IMADTimeColor.cs b/ESPSharp/DataTypes/GeneratedCode/IMADTimeColor.cs
@@ -121,8 +121,10 @@ public object Clone()
 
         public int CompareTo(IMADTimeColor other)
         {
-			return Time.CompareTo(other.Time);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(IMADTimeColor objA, IMADTimeColor objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/IMADTimeValue.cs b/ESPSharp/DataTypes/GeneratedCode/IMADTimeValue.cs
@@ -85,8 +85,10 @@ public object Clone()
 
         public int CompareTo(IMADTimeValue other)
         {
-			return Time.CompareTo(other.Time);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(IMADTimeValue objA, IMADTimeValue objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/NavMeshDoor.cs b/ESPSharp/DataTypes/GeneratedCode/NavMeshDoor.cs
@@ -100,8 +100,10 @@ public object Clone()
 
         public int CompareTo(NavMeshDoor other)
         {
-			return Door.CompareTo(other.Door);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(NavMeshDoor objA, NavMeshDoor objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/NavMeshExternalConnection.cs b/ESPSharp/DataTypes/GeneratedCode/NavMeshExternalConnection.cs
@@ -102,8 +102,10 @@ public object Clone()
 
         public int CompareTo(NavMeshExternalConnection other)
         {
-			return NavigationMesh.CompareTo(other.NavigationMesh);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(NavMeshExternalConnection objA, NavMeshExternalConnection objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/NavMeshTriangle.cs b/ESPSharp/DataTypes/GeneratedCode/NavMeshTriangle.cs
@@ -145,8 +145,10 @@ public object Clone()
 
         public int CompareTo(NavMeshTriangle other)
         {
-			return Vertex1.CompareTo(other.Vertex1);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(NavMeshTriangle objA, NavMeshTriangle objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/RegionGrass.cs b/ESPSharp/DataTypes/GeneratedCode/RegionGrass.cs
@@ -90,8 +90,10 @@ public object Clone()
 
         public int CompareTo(RegionGrass other)
         {
-			return Form.CompareTo(other.Form);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(RegionGrass objA, RegionGrass objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/RegionObject.cs b/ESPSharp/DataTypes/GeneratedCode/RegionObject.cs
@@ -302,8 +302,10 @@ public object Clone()
 
         public int CompareTo(RegionObject other)
         {
-			return Object.CompareTo(other.Object);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(RegionObject objA, RegionObject objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/RegionSound.cs b/ESPSharp/DataTypes/GeneratedCode/RegionSound.cs
@@ -98,8 +98,10 @@ public object Clone()
 
         public int CompareTo(RegionSound other)
         {
-			return Sound.CompareTo(other.Sound);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(RegionSound objA, RegionSound objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/StaticPlacement.cs b/ESPSharp/DataTypes/GeneratedCode/StaticPlacement.cs
@@ -145,8 +145,31 @@ public object Clone()
 
         public int CompareTo(StaticPlacement other)
         {
-			return PositionX.CompareTo(other.PositionX);
-        }
+			int result = 0;
+
+			if (result == 0 && PositionZ != null && other.PositionZ != null)	
+				result = PositionZ.CompareTo(other.PositionZ);
+
+			if (result == 0 && PositionX != null && other.PositionX != null)	
+				result = PositionX.CompareTo(other.PositionX);
+
+			if (result == 0 && PositionY != null && other.PositionY != null)	
+				result = PositionY.CompareTo(other.PositionY);
+
+			if (result == 0 && RotationX != null && other.RotationX != null)	
+				result = RotationX.CompareTo(other.RotationX);
+
+			if (result == 0 && RotationY != null && other.RotationY != null)	
+				result = RotationY.CompareTo(other.RotationY);
+
+			if (result == 0 && RotationZ != null && other.RotationZ != null)	
+				result = RotationZ.CompareTo(other.RotationZ);
+
+			if (result == 0 && Scale != null && other.Scale != null)	
+				result = Scale.CompareTo(other.Scale);
+
+			return result;
+		}
 
         public static bool operator >(StaticPlacement objA, StaticPlacement objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/StaticPlacement.tt b/ESPSharp/DataTypes/GeneratedCode/StaticPlacement.tt
@@ -10,6 +10,7 @@
 			"PositionX",
 			"Position/X"
 			);
+	tempField.sortIndex = 1;
 	template.hashKey = tempField;
 	template.Fields.Add(tempField);
 
@@ -19,6 +20,7 @@
 			"PositionY",
 			"Position/Y"
 			);
+	tempField.sortIndex = 2;
 	template.Fields.Add(tempField);
 
 	tempField = 
@@ -27,6 +29,7 @@
 			"PositionZ",
 			"Position/Z"
 			);
+	tempField.sortIndex = 0;
 	template.Fields.Add(tempField);
 
 	tempField = 
@@ -35,6 +38,7 @@
 			"RotationX",
 			"Rotation/X"
 			);
+	tempField.sortIndex = 3;
 	template.Fields.Add(tempField);
 
 	tempField = 
@@ -43,6 +47,7 @@
 			"RotationY",
 			"Rotation/Y"
 			);
+	tempField.sortIndex = 4;
 	template.Fields.Add(tempField);
 
 	tempField = 
@@ -51,6 +56,7 @@
 			"RotationZ",
 			"Rotation/Z"
 			);
+	tempField.sortIndex = 5;
 	template.Fields.Add(tempField);
 
 	tempField = 
@@ -59,6 +65,7 @@
 			"Scale",
 			"Scale"
 			);
+	tempField.sortIndex = 6;
 	template.Fields.Add(tempField);
 #>
 <#@ include file="DataTypeTemplate.t4" once="true" #>
diff --git a/ESPSharp/DataTypes/GeneratedCode/TimeOfDayColors.cs b/ESPSharp/DataTypes/GeneratedCode/TimeOfDayColors.cs
@@ -139,8 +139,10 @@ public object Clone()
 
         public int CompareTo(TimeOfDayColors other)
         {
-			return Sunrise.CompareTo(other.Sunrise);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(TimeOfDayColors objA, TimeOfDayColors objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/WeatherChance.cs b/ESPSharp/DataTypes/GeneratedCode/WeatherChance.cs
@@ -99,8 +99,10 @@ public object Clone()
 
         public int CompareTo(WeatherChance other)
         {
-			return Weather.CompareTo(other.Weather);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(WeatherChance objA, WeatherChance objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/XYFloat.cs b/ESPSharp/DataTypes/GeneratedCode/XYFloat.cs
@@ -85,8 +85,10 @@ public object Clone()
 
         public int CompareTo(XYFloat other)
         {
-			return X.CompareTo(other.X);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(XYFloat objA, XYFloat objB)
         {

diff --git a/ESPSharp/DataTypes/GeneratedCode/XYZFloat.cs b/ESPSharp/DataTypes/GeneratedCode/XYZFloat.cs
@@ -97,8 +97,10 @@ public object Clone()
 
         public int CompareTo(XYZFloat other)
         {
-			return X.CompareTo(other.X);
-        }
+			int result = 0;
+
+			return result;
+		}
 
         public static bool operator >(XYZFloat objA, XYZFloat objB)
         {

diff --git a/ESPSharp/Records/GeneratedCode/Creature.cs b/ESPSharp/Records/GeneratedCode/Creature.cs
@@ -336,8 +336,11 @@ public override void WriteData(ESPWriter writer)
 			if (BaseStats != null)
 				BaseStats.WriteBinary(writer);
 			if (Factions != null)
+			{
+				Factions.Sort();
 				foreach (var item in Factions)
 					item.WriteBinary(writer);
+			}
 			if (DeathItem != null)
 				DeathItem.WriteBinary(writer);
 			if (VoiceType != null)
@@ -458,6 +461,7 @@ public override void WriteDataXML(XElement ele, ElderScrollsPlugin master)
 				ele.TryPathTo("Factions", true, out subEle);
 				List<string> xmlNames = new List<string>{"Faction"};
 				int i = 0;
+				Factions.Sort();
 				foreach (var entry in Factions)
 				{
 					i = i % xmlNames.Count();

diff --git a/ESPSharp/Records/GeneratedCode/Creature.tt b/ESPSharp/Records/GeneratedCode/Creature.tt
@@ -109,6 +109,7 @@
 			"Factions",
 			"Factions"
 			);
+	tempField.isSorted = true;
 	tempField.XMLSubNames = new List<string>{"Faction"};
 	template.Fields.Add(tempField);