From 3cb1a5913d5f4de71b445f8f209b7da4f0081c71 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Tue, 15 Jan 2019 17:49:38 -0600 Subject: [PATCH] forgot to add/change the imports after refactor. so here it is. --- RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs | 1 + RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs | 1 + .../TextureAtlas/TextureAtlasProcessor.cs | 1 + .../TextureAtlas/TextureAtlasWriter.cs | 6 +++--- RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs | 1 + RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs | 2 ++ RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs | 1 + 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs index 79f4df8..8423259 100644 --- a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs +++ b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchProcessor.cs @@ -1,5 +1,6 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Newtonsoft.Json; +using RecrownedAthenaeum.Serializable; namespace RecrownedAthenaeum.Pipeline.NinePatch { diff --git a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs index 853155c..6128377 100644 --- a/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs +++ b/RecrownedAthenaeum.Pipeline/NinePatch/NinePatchWriter.cs @@ -1,6 +1,7 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler; using Newtonsoft.Json; +using RecrownedAthenaeum.Serializable; namespace RecrownedAthenaeum.Pipeline.NinePatch { diff --git a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs index aabaf8b..3241b78 100644 --- a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs +++ b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasProcessor.cs @@ -1,5 +1,6 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Newtonsoft.Json; +using RecrownedAthenaeum.Serializable; namespace RecrownedAthenaeum.Pipeline.TextureAtlas { diff --git a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs index 30b2f32..9afeb0f 100644 --- a/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs +++ b/RecrownedAthenaeum.Pipeline/TextureAtlas/TextureAtlasWriter.cs @@ -1,19 +1,19 @@ using Microsoft.Xna.Framework.Content.Pipeline; using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Compiler; using Newtonsoft.Json; -using TWrite = RecrownedAthenaeum.Pipeline.TextureAtlas.TextureAtlasData; +using RecrownedAthenaeum.Serializable; namespace RecrownedAthenaeum.Pipeline.TextureAtlas { [ContentTypeWriter] - class TextureAtlasWriter : ContentTypeWriter + class TextureAtlasWriter : ContentTypeWriter { public override string GetRuntimeReader(TargetPlatform targetPlatform) { return "RecrownedAthenaeum.Pipeline, TextureAtlasDataReader"; } - protected override void Write(ContentWriter output, TWrite value) + protected override void Write(ContentWriter output, TextureAtlasData value) { output.Write(JsonConvert.SerializeObject(value)); } diff --git a/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs b/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs index 67a06c1..2a75a6c 100644 --- a/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs +++ b/RecrownedAthenaeum.Tools/NinePatchTools/NinePatchCommand.cs @@ -1,4 +1,5 @@ using Newtonsoft.Json; +using RecrownedAthenaeum.Pipeline.NinePatch; using RecrownedAthenaeum.Tools.CommandProcessor; using System; using System.IO; diff --git a/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs b/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs index 0b690b9..77a406b 100644 --- a/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs +++ b/RecrownedAthenaeum.Tools/TextureAtlasTools/TexturePacker.cs @@ -1,4 +1,6 @@ using Newtonsoft.Json; +using RecrownedAthenaeum.Pipeline.NinePatch; +using RecrownedAthenaeum.Pipeline.TextureAtlas; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; diff --git a/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs b/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs index d56df70..b8081b9 100644 --- a/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs +++ b/RecrownedAthenaeum/Pipeline/TextureAtlasDataReader.cs @@ -1,6 +1,7 @@ using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Graphics; using Newtonsoft.Json; +using RecrownedAthenaeum.Serializable; namespace RecrownedAthenaeum.Pipeline {