From e45be4300adfc18d48a9cd636cd9d44c6c997a02 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 4 Mar 2023 12:17:56 +0100 Subject: [PATCH] Rename Imageutil to ImageExtentions and improved util classes --- .../ImageExtentions.cs} | 6 +++--- PCK-Studio/Forms/Utilities/AnimationUtil.cs | 17 +++++------------ PCK-Studio/Forms/Utilities/BehaviourUtil.cs | 19 +++++-------------- PCK-Studio/Forms/Utilities/MaterialUtil.cs | 18 ++++-------------- PCK-Studio/PckStudio.csproj | 2 +- 5 files changed, 18 insertions(+), 44 deletions(-) rename PCK-Studio/Classes/{Utils/ImageUtils.cs => Extentions/ImageExtentions.cs} (88%) diff --git a/PCK-Studio/Classes/Utils/ImageUtils.cs b/PCK-Studio/Classes/Extentions/ImageExtentions.cs similarity index 88% rename from PCK-Studio/Classes/Utils/ImageUtils.cs rename to PCK-Studio/Classes/Extentions/ImageExtentions.cs index 83b5ad59..c3f4826d 100644 --- a/PCK-Studio/Classes/Utils/ImageUtils.cs +++ b/PCK-Studio/Classes/Extentions/ImageExtentions.cs @@ -3,11 +3,11 @@ using System.Drawing.Drawing2D; using System.Drawing; using System.Diagnostics; -namespace PckStudio.Classes.Utils +namespace PckStudio.Classes.Extentions { - internal class ImageUtils + internal static class ImageExtentions { - public static IEnumerable CreateImageList(Image source, int size) + public static IEnumerable CreateImageList(this Image source, int size) { int img_row_count = source.Width / size; int img_column_count = source.Height / size; diff --git a/PCK-Studio/Forms/Utilities/AnimationUtil.cs b/PCK-Studio/Forms/Utilities/AnimationUtil.cs index dd7e6dd4..55e38a4b 100644 --- a/PCK-Studio/Forms/Utilities/AnimationUtil.cs +++ b/PCK-Studio/Forms/Utilities/AnimationUtil.cs @@ -1,14 +1,12 @@ using Newtonsoft.Json.Linq; -using System.Collections.Generic; -using System.Drawing.Drawing2D; using System.Drawing; using System.Linq; +using System.IO; using PckStudio.Properties; using PckStudio.Classes.FileTypes; using System.Drawing.Imaging; -using PckStudio.Classes.Utils; -using System.IO; +using PckStudio.Classes.Extentions; namespace PckStudio.Forms.Utilities { @@ -18,14 +16,9 @@ namespace PckStudio.Forms.Utilities public static readonly JObject tileData = JObject.Parse(Resources.tileData); private static Image[] _tileImages; - public static Image[] tileImages - { - get { - if (_tileImages == null) - _tileImages = ImageUtils.CreateImageList(Resources.terrain_sheet, 16).Concat(ImageUtils.CreateImageList(Resources.items_sheet, 16)).ToArray(); - return _tileImages; - } - } + + public static Image[] tileImages => _tileImages ??= Resources.terrain_sheet.CreateImageList(16).Concat(Resources.items_sheet.CreateImageList(16)).ToArray(); + public static PCKFile.FileData CreateNewAnimationFile(Image source, string tileName, bool isItem) { PCKFile.FileData file = new PCKFile.FileData($"res/textures/{GetAnimationSection(isItem)}/{tileName}.png", PCKFile.FileData.FileType.TextureFile); diff --git a/PCK-Studio/Forms/Utilities/BehaviourUtil.cs b/PCK-Studio/Forms/Utilities/BehaviourUtil.cs index ff3f88a0..40f6c06e 100644 --- a/PCK-Studio/Forms/Utilities/BehaviourUtil.cs +++ b/PCK-Studio/Forms/Utilities/BehaviourUtil.cs @@ -1,16 +1,12 @@ using Newtonsoft.Json.Linq; -using System.Collections.Generic; -using System.Drawing.Drawing2D; using System.Drawing; using System.Linq; +using System.IO; using PckStudio.Properties; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.Behaviour; -using PckStudio.Classes.Utils; -using System.Diagnostics; -using System.Drawing.Imaging; -using System.IO; +using PckStudio.Classes.Extentions; namespace PckStudio.Forms.Utilities { @@ -18,14 +14,9 @@ namespace PckStudio.Forms.Utilities { public static readonly JObject entityData = JObject.Parse(Resources.entityBehaviourData); private static Image[] _entityImages; - public static Image[] entityImages - { - get { - if (_entityImages == null) - _entityImages = ImageUtils.CreateImageList(Resources.entities_sheet, 32).ToArray(); - return _entityImages; - } - } + + public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); + public static PCKFile.FileData CreateNewBehaviourFile() { PCKFile.FileData file = new PCKFile.FileData($"behaviours.bin", PCKFile.FileData.FileType.BehavioursFile); diff --git a/PCK-Studio/Forms/Utilities/MaterialUtil.cs b/PCK-Studio/Forms/Utilities/MaterialUtil.cs index 28d041fb..3a3908bf 100644 --- a/PCK-Studio/Forms/Utilities/MaterialUtil.cs +++ b/PCK-Studio/Forms/Utilities/MaterialUtil.cs @@ -1,16 +1,12 @@ using Newtonsoft.Json.Linq; -using System.Collections.Generic; -using System.Drawing.Drawing2D; using System.Drawing; using System.Linq; +using System.IO; using PckStudio.Properties; using PckStudio.Classes.FileTypes; using PckStudio.Classes.IO.Materials; -using PckStudio.Classes.Utils; -using System.Diagnostics; -using System.Drawing.Imaging; -using System.IO; +using PckStudio.Classes.Extentions; namespace PckStudio.Forms.Utilities { @@ -18,14 +14,8 @@ namespace PckStudio.Forms.Utilities { public static readonly JObject entityData = JObject.Parse(Resources.entityMaterialData); private static Image[] _entityImages; - public static Image[] entityImages - { - get { - if (_entityImages == null) - _entityImages = ImageUtils.CreateImageList(Resources.entities_sheet, 32).ToArray(); - return _entityImages; - } - } + public static Image[] entityImages => _entityImages ??= Resources.entities_sheet.CreateImageList(32).ToArray(); + public static PCKFile.FileData CreateNewMaterialsFile() { PCKFile.FileData file = new PCKFile.FileData($"entityMaterials.bin", PCKFile.FileData.FileType.MaterialFile); diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj index f57f660d..710c27ab 100644 --- a/PCK-Studio/PckStudio.csproj +++ b/PCK-Studio/PckStudio.csproj @@ -200,7 +200,7 @@ - +