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

Content loading system functioning.

Browse Source
This commit is contained in:
Harrison Deng
2018-10-30 18:29:54 -05:00
parent 3a4dfb94ac
commit a9647f2146
14 changed files with 189 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RhythmBullet/Zer01HD/Game/ContentResolvers/FontContentResolver.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Game.ContentResolvers
{
class FontContentResolver : IContentResolver
class FontContentResolver : IContentPathModifier
{
readonly ResolutionContentResolver rcr;
@@ -16,9 +16,9 @@ namespace RhythmBullet.Zer01HD.Game.ContentResolvers
this.rcr = rcr;
}
public string Load(string assetName)
public string Modify(string assetName)
{
return rcr.Load("fonts/" + assetName);
return rcr.Modify("fonts/" + assetName);
}
}
}

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

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Game.ContentResolvers
{
class ResolutionContentResolver : IContentResolver
class ResolutionContentResolver : IContentPathModifier
{
int width, height;
bool updated;
@@ -98,7 +98,7 @@ namespace RhythmBullet.Zer01HD.Game.ContentResolvers
return best;
}
public string Load(string path)
public string Modify(string path)
{
if (updated)
{

20
RhythmBullet/Zer01HD/Game/Preferences/Controls.cs
View File

@@ -1,18 +1,14 @@
using RhythmBullet.Zer01HD.Utilities.Persistence;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Utilities.Persistence;
namespace RhythmBullet.Zer01HD.Game.Preferences
{
public class Controls : IPreferences
public class Controls : Utilities.Persistence.Preferences
{
public int Forward;
public int Backward;
public int Left;
public int Right;
public int Shoot;
public Keys Forward = Keys.Up;
public Keys Backward = Keys.Down;
public Keys Left = Keys.Left;
public Keys Right = Keys.Right;
public Keys Shoot = Keys.Space;
}
}

20
RhythmBullet/Zer01HD/Game/Preferences/General.cs
View File

@@ -1,20 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using RhythmBullet.Zer01HD.Utilities;
using System.Xml.Serialization;
using RhythmBullet.Zer01HD.Utilities.DataTypes;
using RhythmBullet.Zer01HD.Utilities.Persistence;
namespace RhythmBullet.Zer01HD.Game.Preferences
{
public class General : IPreferences
public class General : Utilities.Persistence.Preferences
{
public Resolution Resolution;
public bool Fullscreen;
public float MusicVolume;
public float FXVolume;
public string MusicDirectory;
public string GameDirectory;
public Resolution Resolution = new Resolution(1920, 1080);
public bool Fullscreen = false;
public float MusicVolume = 1f;
public float FXVolume = 1f;
public string MusicDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyMusic);
}
}