add more wallobject flags, comment some old code out, fix some csproj settings

Author: LeftofZen

Core/Objects/WallObject.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel;
+using System.ComponentModel;
 using OpenLoco.ObjectEditor.Data;
 using OpenLoco.ObjectEditor.DatFileParsing;
 
@@ -9,13 +9,25 @@ public enum WallObjectFlags : uint8_t
 	{
 		None = 0,
 		HasPrimaryColour = 1 << 0,
-		unk1 = 1 << 1,
+		HasGlass = 1 << 1,  // unused? only for rct2?
 		OnlyOnLevelLand = 1 << 2,
-		unk3 = 1 << 3,
-		unk4 = 1 << 4,
-		unk5 = 1 << 5,
+		DoubleSided = 1 << 3, // unused? only for rct2?
+		Door = 1 << 4, // unused? only for rct2?
+		LongDoorAnimation = 1 << 5, // unused? only for rct2?
 		HasSecondaryColour = 1 << 6,
-		HasTertiaryColour = 1 << 7,
+		HasTertiaryColour = 1 << 7, // unused? only for rct2?
+	};
+
+	// this is copied from OpenRCT2: https://github.com/OpenRCT2/OpenRCT2/blob/develop/src/openrct2/object/WallSceneryEntry.h
+	[Flags]
+	public enum WallObjectFlags2 : uint8_t
+	{
+		None = 0,
+		NoSelectPrimaryColour = 1 << 0,
+		DoorSoundMask = 1 << 1,  // unused? only for rct2?
+		DoorSoundShift = 1 << 2, // unused? only for rct2?
+		IsOpaque = 1 << 3, // unused? only for rct2?
+		Animated = 1 << 4, // unused? only for rct2?
 	};
 
 	[TypeConverter(typeof(ExpandableObjectConverter))]
@@ -25,9 +37,9 @@ public enum WallObjectFlags : uint8_t
 	public record WallObject(
 		[property: LocoStructOffset(0x00), LocoString, Browsable(false)] string_id Name,
 		[property: LocoStructOffset(0x02), Browsable(false)] image_id Image,
-		[property: LocoStructOffset(0x06), LocoPropertyMaybeUnused] uint8_t var_06,
+		[property: LocoStructOffset(0x06), LocoPropertyMaybeUnused] uint8_t ToolId,
 		[property: LocoStructOffset(0x07)] WallObjectFlags Flags,
 		[property: LocoStructOffset(0x08)] uint8_t Height,
-		[property: LocoStructOffset(0x09), LocoPropertyMaybeUnused] uint8_t var_09
+		[property: LocoStructOffset(0x09), LocoPropertyMaybeUnused] WallObjectFlags2 Flags2
 	) : ILocoStruct;
 }

Gui/Gui.csproj

@@ -8,6 +8,14 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationIcon>..\loco_icon.ico</ApplicationIcon>
+    <StartupObject>OpenLoco.ObjectEditor.Gui.Program</StartupObject>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/OpenLoco/OpenLocoObjectEditor</RepositoryUrl>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+    <AssemblyName>ObjectEditor</AssemblyName>
+    <Authors>LeftofZen</Authors>
+    <Product>$(AssemblyName) $(AssemblyVersion)</Product>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,13 +24,20 @@
 
   <ItemGroup>
     <EmbeddedResource Include="..\palette.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="..\version.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="NAudio" Version="2.2.1" />
   </ItemGroup>

Gui/PaletteHelpers.cs

@@ -1,4 +1,4 @@
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
 
 namespace OpenLoco.ObjectEditor.Gui
 {
@@ -21,26 +21,26 @@ public static Color[] PaletteFromBitmap(Bitmap img)
 			return palette;
 		}
 
-		public static byte[] Palettise(Bitmap img)
-		{
-			var pixels = img.Width * img.Height;
-			var bytes = new byte[pixels];
+		//public static byte[] Palettise(Bitmap img)
+		//{
+		//	var pixels = img.Width * img.Height;
+		//	var bytes = new byte[pixels];
 
-			var rect = new Rectangle(0, 0, img.Width, img.Height);
-			var imgData = img.LockBits(rect, ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+		//	var rect = new Rectangle(0, 0, img.Width, img.Height);
+		//	var imgData = img.LockBits(rect, ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
 
-			for (var y = 0; y < img.Height; ++y)
-			{
-				for (var x = 0; x < img.Width; ++x)
-				{
-					var paletteIndex = (y * img.Width) + x;
-					bytes[paletteIndex] = ColorToPaletteIndex(ImageHelpers.GetPixel(imgData, x, y));
-				}
-			}
+		//	for (var y = 0; y < img.Height; ++y)
+		//	{
+		//		for (var x = 0; x < img.Width; ++x)
+		//		{
+		//			var paletteIndex = (y * img.Width) + x;
+		//			bytes[paletteIndex] = ColorToPaletteIndex(ImageHelpers.GetPixel(imgData, x, y));
+		//		}
+		//	}
 
-			return bytes;
-		}
+		//	return bytes;
+		//}
 
-		static byte ColorToPaletteIndex(Color c) => 0;
+		//static byte ColorToPaletteIndex(Color c) => 0;
 	}
-}
+}

README.md

@@ -74,4 +74,6 @@ A modern implementation of 'LocoTool' for Locomotion `dat` file parsing and edit
 - Dark modern
 - Cross-platform support
 - Full unit-testing suite
+- Blank template objects for object creation from scratch
+- Use a proper C# image library for image creation instead of WinForms
 - ...many more things