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

Continued transition to new asset manager.

Browse Source
This commit is contained in:
Harrison Deng 2019-12-12 14:43:36 -05:00
parent e3946c526f
commit 3e60760292
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
View File

@ -1,10 +1,10 @@
using RecrownedAthenaeum.ContentSystem; using RecrownedAthenaeum.Assets;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.Types;
using System.Diagnostics; using System.Diagnostics;
namespace RhythmBullet.ContentResolvers namespace RhythmBullet.ContentResolvers
{ {
internal class ResolutionContentResolver : IContentPathResolver internal class ResolutionContentResolver : IAssetPathResolver
{ {
int width, height; int width, height;
bool updated; bool updated;

8
RhythmBullet/RhythmBulletGame.cs
View File

@ -2,11 +2,11 @@
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using RecrownedAthenaeum.Render; using RecrownedAthenaeum.Render;
using RecrownedAthenaeum.ContentSystem; using RecrownedAthenaeum.Assets;
using RecrownedAthenaeum.Input; using RecrownedAthenaeum.Input;
using RecrownedAthenaeum.Persistence; using RecrownedAthenaeum.Persistence;
using RecrownedAthenaeum.UI.ScreenSystem; using RecrownedAthenaeum.UI.ScreenSystem;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.Types;
using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem;
using RecrownedAthenaeum.UI.SkinSystem.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
using RhythmBullet.Audio; using RhythmBullet.Audio;
@ -30,7 +30,7 @@ namespace RhythmBullet
GraphicsDeviceManager graphics; GraphicsDeviceManager graphics;
ConsistentSpriteBatch spriteBatch; ConsistentSpriteBatch spriteBatch;
public readonly ContentManagerController assets; public readonly AssetManager assets;
public PreferencesManager preferencesManager; public PreferencesManager preferencesManager;
private ScreenManager screenManager; private ScreenManager screenManager;
public Camera2D Camera { get; private set; } public Camera2D Camera { get; private set; }
@ -46,7 +46,7 @@ namespace RhythmBullet
{ {
graphics = new GraphicsDeviceManager(this); graphics = new GraphicsDeviceManager(this);
Content.RootDirectory = "Content"; Content.RootDirectory = "Content";
assets = new ContentManagerController(Content); assets = new AssetManager();
//Add the content resolvers. //Add the content resolvers.
assets.AddContentPathResolver(typeof(Texture2D), resolutionContentResolver); assets.AddContentPathResolver(typeof(Texture2D), resolutionContentResolver);
fontContentResolver = new FontContentResolver(resolutionContentResolver); fontContentResolver = new FontContentResolver(resolutionContentResolver);