From 3a4dfb94ac3475150a19d6d85d25a2f06c9e527d Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Mon, 29 Oct 2018 00:33:26 -0500
Subject: [PATCH] clean up.

---
 RhythmBullet/RhythmBullet.csproj                          | 2 +-
 .../Game/ContentResolvers/ResolutionContentResolver.cs    | 1 +
 .../Zer01HD/Utilities/ContentSystem/ContentLoad.cs        | 4 ++--
 .../Zer01HD/Utilities/ContentSystem/ContentSystem.cs      | 8 ++++----
 .../Zer01HD/Utilities/{ => DataTypes}/Resolution.cs       | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename RhythmBullet/Zer01HD/Utilities/{ => DataTypes}/Resolution.cs (92%)

diff --git a/RhythmBullet/RhythmBullet.csproj b/RhythmBullet/RhythmBullet.csproj
index ae99007..59d09a0 100644
--- a/RhythmBullet/RhythmBullet.csproj
+++ b/RhythmBullet/RhythmBullet.csproj
@@ -65,7 +65,7 @@
     <Compile Include="Zer01HD\Game\Preferences\Controls.cs" />
     <Compile Include="Zer01HD\Game\Preferences\General.cs" />
     <Compile Include="Zer01HD\Utilities\Persistence\PreferencesManager.cs" />
-    <Compile Include="Zer01HD\Utilities\Resolution.cs" />
+    <Compile Include="Zer01HD\Utilities\DataTypes\Resolution.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="BulletSharp, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/RhythmBullet/Zer01HD/Game/ContentResolvers/ResolutionContentResolver.cs b/RhythmBullet/Zer01HD/Game/ContentResolvers/ResolutionContentResolver.cs
index 902b600..128a230 100644
--- a/RhythmBullet/Zer01HD/Game/ContentResolvers/ResolutionContentResolver.cs
+++ b/RhythmBullet/Zer01HD/Game/ContentResolvers/ResolutionContentResolver.cs
@@ -1,6 +1,7 @@
 using RhythmBullet.Zer01HD.Game.Preferences;
 using RhythmBullet.Zer01HD.Utilities;
 using RhythmBullet.Zer01HD.Utilities.ContentSystem;
+using RhythmBullet.Zer01HD.Utilities.DataTypes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs b/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs
index 5f20794..602a8a7 100644
--- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs
+++ b/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs
@@ -6,12 +6,12 @@ using System.Threading.Tasks;
 
 namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
 {
-    class ContentLoad
+    class LoadableContent
     {
         internal Type type;
         internal string assetName;
 
-        public ContentLoad(string assetName, Type type)
+        public LoadableContent(string assetName, Type type)
         {
             this.type = type;
             this.assetName = assetName;
diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs b/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs
index 062b690..50eaeac 100644
--- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs
+++ b/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs
@@ -14,7 +14,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
         volatile bool queued;
         Thread thread;
         readonly ContentManager contentManager;
-        readonly Queue<ContentLoad> queue;
+        readonly Queue<LoadableContent> queue;
         Dictionary<string, IDisposable> assets;
         public readonly Dictionary<Type, IContentResolver> contentResolver;
 
@@ -22,7 +22,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
         {
             this.contentManager = contentManager;
             assets = new Dictionary<string, IDisposable>();
-            queue = new Queue<ContentLoad>();
+            queue = new Queue<LoadableContent>();
             contentResolver = new Dictionary<Type, IContentResolver>();
         }
 
@@ -39,7 +39,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
             {
                 lock (queue)
                 {
-                    ContentLoad content = queue.Dequeue();
+                    LoadableContent content = queue.Dequeue();
                     Load(content.assetName, content.type);
                 }
                 queued = false;
@@ -61,7 +61,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
             {
                 if (!assets.ContainsKey(assetName))
                 {
-                    queue.Enqueue(new ContentLoad(assetName, type));
+                    queue.Enqueue(new LoadableContent(assetName, type));
                 }
             }
         }
diff --git a/RhythmBullet/Zer01HD/Utilities/Resolution.cs b/RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs
similarity index 92%
rename from RhythmBullet/Zer01HD/Utilities/Resolution.cs
rename to RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs
index f10d671..5c3f849 100644
--- a/RhythmBullet/Zer01HD/Utilities/Resolution.cs
+++ b/RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace RhythmBullet.Zer01HD.Game.Preferences
+namespace RhythmBullet.Zer01HD.Utilities.DataTypes
 {
     public class Resolution : IComparable<Resolution>
     {