LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-29 18:34:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Imageutil to ImageExtentions and improved util classes

Browse Source
This commit is contained in:
miku-666
2023-03-04 12:17:56 +01:00
parent f29780d7c0
commit e45be4300a
5 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PCK-Studio/Classes/Utils/ImageUtils.cs → PCK-Studio/Classes/Extentions/ImageExtentions.cs
View File

@@ -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<Image> CreateImageList(Image source, int size)
public static IEnumerable<Image> CreateImageList(this Image source, int size)
{
int img_row_count = source.Width / size;
int img_column_count = source.Height / size;

17
PCK-Studio/Forms/Utilities/AnimationUtil.cs
View File

@@ -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);

19
PCK-Studio/Forms/Utilities/BehaviourUtil.cs
View File

@@ -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);

18
PCK-Studio/Forms/Utilities/MaterialUtil.cs
View File

@@ -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);

2
PCK-Studio/PckStudio.csproj
View File

@@ -200,7 +200,7 @@
<Compile Include="Classes\Models\DefaultModels\Steve64x64Model.cs" />
<Compile Include="Classes\Utils\3DS\3DSUtil.cs" />
<Compile Include="Classes\Utils\ARC\ARCUtil.cs" />
<Compile Include="Classes\Utils\ImageUtils.cs" />
<Compile Include="Classes\Extentions\ImageExtentions.cs" />
<Compile Include="Classes\Utils\SkinANIM.cs" />
<Compile Include="Classes\FileTypes\PCKProperties.cs" />
<Compile Include="Classes\FileTypes\PCKFile.cs" />