Fixed an error in Camera Type v2 that caused values to be forced to 0.

Editor/Editor/Templates/EntityTemplates.cs

@@ -743,44 +743,44 @@ public byte CameraPointIndex
 		}
 
 
-		protected byte m_Padding1;
+		protected byte m_Unknown1;
 
-		[WProperty("Misc.", "Padding 1", true)]
-		 public byte Padding1
+		[WProperty("Misc.", "Unknown 1", true)]
+		 public byte Unknown1
 		{ 
-			get { return m_Padding1; }
+			get { return m_Unknown1; }
 			set
 			{
-				m_Padding1 = value;
-				OnPropertyChanged("Padding1");
+				m_Unknown1 = value;
+				OnPropertyChanged("Unknown1");
 			}
 		}
 
 
-		protected byte m_Unknown1;
+		protected byte m_Unknown2;
 
-		[WProperty("Misc.", "Unknown 1", true)]
-		 public byte Unknown1
+		[WProperty("Misc.", "Unknown 2", true)]
+		 public byte Unknown2
 		{ 
-			get { return m_Unknown1; }
+			get { return m_Unknown2; }
 			set
 			{
-				m_Unknown1 = value;
-				OnPropertyChanged("Unknown1");
+				m_Unknown2 = value;
+				OnPropertyChanged("Unknown2");
 			}
 		}
 
 
-		protected byte m_Padding3;
+		protected byte m_Unknown3;
 
-		[WProperty("Misc.", "Padding 3", true)]
-		 public byte Padding3
+		[WProperty("Misc.", "Unknown 3", true)]
+		 public byte Unknown3
 		{ 
-			get { return m_Padding3; }
+			get { return m_Unknown3; }
 			set
 			{
-				m_Padding3 = value;
-				OnPropertyChanged("Padding3");
+				m_Unknown3 = value;
+				OnPropertyChanged("Unknown3");
 			}
 		}
 
@@ -791,18 +791,18 @@ public CameraType_v2(FourCC fourCC, WWorld world) : base(fourCC, world)
 		{
 			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Camera Type", TargetProperties = new string[] { "CameraType"} });
 			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Camera Point Index", TargetProperties = new string[] { "CameraPointIndex"} });
-			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Padding 1", TargetProperties = new string[] { "Padding1"} });
 			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Unknown 1", TargetProperties = new string[] { "Unknown1"} });
-			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Padding 3", TargetProperties = new string[] { "Padding3"} });
+			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Unknown 2", TargetProperties = new string[] { "Unknown2"} });
+			VisibleProperties.Add(new Xceed.Wpf.Toolkit.PropertyGrid.PropertyDefinition() { DisplayName = "Unknown 3", TargetProperties = new string[] { "Unknown3"} });
 		}
 
 		override public void Load(EndianBinaryReader stream)
 		{
 			m_CameraType = stream.ReadString(16).Trim(new[] { '\0' }); 
 			m_CameraPointIndex = stream.ReadByte(); 
-			m_Padding1 = stream.ReadByte(); Trace.Assert(m_Padding1 == 0xFF || m_Padding1== 0); // Padding
 			m_Unknown1 = stream.ReadByte(); 
-			m_Padding3 = stream.ReadByte(); Trace.Assert(m_Padding3 == 0xFF || m_Padding3== 0); // Padding
+			m_Unknown2 = stream.ReadByte(); 
+			m_Unknown3 = stream.ReadByte(); 
 		}
 
 		override public void Save(EndianBinaryWriter stream)
@@ -813,9 +813,9 @@ override public void Save(EndianBinaryWriter stream)
 
 			stream.Write(CameraType.PadRight(16, '\0').ToCharArray());
 			stream.Write((byte)CameraPointIndex);
-			stream.Write((byte)0); // Padding
 			stream.Write((byte)Unknown1);
-			stream.Write((byte)0); // Padding
+			stream.Write((byte)Unknown2);
+			stream.Write((byte)Unknown3);
 		}
 	}
 

Editor/resources/templates/Camera Type (v2).json

@@ -5,8 +5,8 @@
 	[
 		{"Name" : "Camera Type", "Type" : "FixedLengthString" , "Length" : 16},
 		{"Name" : "Camera Point Index", "Type" : "Byte"},
-		{"Name" : "Padding 1", "Type" : "Byte"},
 		{"Name" : "Unknown 1", "Type" : "Byte"},
-		{"Name" : "Padding 3", "Type" : "Byte"}
+		{"Name" : "Unknown 2", "Type" : "Byte"},
+		{"Name" : "Unknown 3", "Type" : "Byte"}
 	]
 }