ydeng/rhythmbullet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up.

Browse Source
This commit is contained in:
Harrison Deng 2018-10-29 00:33:26 -05:00
parent 8d762c7841
commit 3a4dfb94ac
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RhythmBullet/RhythmBullet.csproj
View File

@ -65,7 +65,7 @@
<Compile Include="Zer01HD\Game\Preferences\Controls.cs" /> <Compile Include="Zer01HD\Game\Preferences\Controls.cs" />
<Compile Include="Zer01HD\Game\Preferences\General.cs" /> <Compile Include="Zer01HD\Game\Preferences\General.cs" />
<Compile Include="Zer01HD\Utilities\Persistence\PreferencesManager.cs" /> <Compile Include="Zer01HD\Utilities\Persistence\PreferencesManager.cs" />
<Compile Include="Zer01HD\Utilities\Resolution.cs" /> <Compile Include="Zer01HD\Utilities\DataTypes\Resolution.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="BulletSharp, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="BulletSharp, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">

1
RhythmBullet/Zer01HD/Game/ContentResolvers/ResolutionContentResolver.cs
View File

@ -1,6 +1,7 @@
using RhythmBullet.Zer01HD.Game.Preferences; using RhythmBullet.Zer01HD.Game.Preferences;
using RhythmBullet.Zer01HD.Utilities; using RhythmBullet.Zer01HD.Utilities;
using RhythmBullet.Zer01HD.Utilities.ContentSystem; using RhythmBullet.Zer01HD.Utilities.ContentSystem;
using RhythmBullet.Zer01HD.Utilities.DataTypes;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

4
RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs
View File

@ -6,12 +6,12 @@ using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ContentSystem namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
{ {
class ContentLoad class LoadableContent
{ {
internal Type type; internal Type type;
internal string assetName; internal string assetName;
public ContentLoad(string assetName, Type type) public LoadableContent(string assetName, Type type)
{ {
this.type = type; this.type = type;
this.assetName = assetName; this.assetName = assetName;

8
RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs
View File

@ -14,7 +14,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
volatile bool queued; volatile bool queued;
Thread thread; Thread thread;
readonly ContentManager contentManager; readonly ContentManager contentManager;
readonly Queue<ContentLoad> queue; readonly Queue<LoadableContent> queue;
Dictionary<string, IDisposable> assets; Dictionary<string, IDisposable> assets;
public readonly Dictionary<Type, IContentResolver> contentResolver; public readonly Dictionary<Type, IContentResolver> contentResolver;
@ -22,7 +22,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
{ {
this.contentManager = contentManager; this.contentManager = contentManager;
assets = new Dictionary<string, IDisposable>(); assets = new Dictionary<string, IDisposable>();
queue = new Queue<ContentLoad>(); queue = new Queue<LoadableContent>();
contentResolver = new Dictionary<Type, IContentResolver>(); contentResolver = new Dictionary<Type, IContentResolver>();
} }
@ -39,7 +39,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
{ {
lock (queue) lock (queue)
{ {
ContentLoad content = queue.Dequeue(); LoadableContent content = queue.Dequeue();
Load(content.assetName, content.type); Load(content.assetName, content.type);
} }
queued = false; queued = false;
@ -61,7 +61,7 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
{ {
if (!assets.ContainsKey(assetName)) if (!assets.ContainsKey(assetName))
{ {
queue.Enqueue(new ContentLoad(assetName, type)); queue.Enqueue(new LoadableContent(assetName, type));
} }
} }
} }

2
RhythmBullet/Zer01HD/Utilities/Resolution.cs → RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Game.Preferences namespace RhythmBullet.Zer01HD.Utilities.DataTypes
{ {
public class Resolution : IComparable<Resolution> public class Resolution : IComparable<Resolution>
{ {