refactoring to comply with c# conventions

This commit is contained in:
Harrison Deng 2018-11-20 18:56:41 -06:00
parent efbaad9c1b
commit 3347316182
37 changed files with 115 additions and 115 deletions

View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Audio
namespace RhythmBullet.Audio
{
internal class MusicController : IDisposable
{

View File

@ -8,7 +8,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Audio
namespace RhythmBullet.Audio
{
internal delegate void SearchListener(MusicList musicList);

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Audio
namespace RhythmBullet.Audio
{
public enum SupportedFormats
{

View File

@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Audio
namespace RhythmBullet.Audio
{
public class TransparentSampleProvider : ISampleProvider
{

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.UI.Modular;
using RhythmBullet.UI.Modular;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Audio.Visualizer
namespace RhythmBullet.Audio.Visualizer
{
internal class HorizontalVisualizer : UIModule, IDisposable
{

View File

@ -1,11 +1,11 @@
using RhythmBullet.Zer01HD.Utilities.ContentSystem;
using RhythmBullet.Utilities.ContentSystem;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.ContentResolvers
namespace RhythmBullet.ContentResolvers
{
class FontContentResolver : IContentPathModifier
{

View File

@ -1,14 +1,14 @@
using RhythmBullet.Zer01HD.Preferences;
using RhythmBullet.Zer01HD.Utilities;
using RhythmBullet.Zer01HD.Utilities.ContentSystem;
using RhythmBullet.Zer01HD.Utilities.DataTypes;
using RhythmBullet.Preferences;
using RhythmBullet.Utilities;
using RhythmBullet.Utilities.ContentSystem;
using RhythmBullet.Utilities.DataTypes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.ContentResolvers
namespace RhythmBullet.ContentResolvers
{
class ResolutionContentResolver : IContentPathModifier
{

View File

@ -1,7 +1,7 @@
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Utilities.Persistence;
using RhythmBullet.Utilities.Persistence;
namespace RhythmBullet.Zer01HD.Preferences
namespace RhythmBullet.Preferences
{
public class Controls : Utilities.Persistence.Preferences
{

View File

@ -1,9 +1,9 @@
using System;
using System.Xml.Serialization;
using RhythmBullet.Zer01HD.Utilities.DataTypes;
using RhythmBullet.Zer01HD.Utilities.Persistence;
using RhythmBullet.Utilities.DataTypes;
using RhythmBullet.Utilities.Persistence;
namespace RhythmBullet.Zer01HD.Preferences
namespace RhythmBullet.Preferences
{
public class General : Utilities.Persistence.Preferences
{

View File

@ -47,44 +47,44 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Compile Include="Zer01HD\Audio\MusicController.cs" />
<Compile Include="Zer01HD\Audio\MusicList.cs" />
<Compile Include="Zer01HD\Audio\SupportedFormats.cs" />
<Compile Include="Zer01HD\Audio\TransparentSampleProvider.cs" />
<Compile Include="Zer01HD\Audio\Visualizer\HorizontalVisualizer.cs" />
<Compile Include="Zer01HD\Screens\MainMenu\MainPage.cs" />
<Compile Include="Zer01HD\Screens\Transitions\FadeAwayTransition.cs" />
<Compile Include="Zer01HD\Utilities\Camera\Camera2D.cs" />
<Compile Include="Zer01HD\Utilities\ContentSystem\NormalContentResolver.cs" />
<Compile Include="Zer01HD\Utilities\Input\IInputListener.cs" />
<Compile Include="Zer01HD\Utilities\Input\InputListener.cs" />
<Compile Include="Zer01HD\Utilities\Input\InputUtilities.cs" />
<Compile Include="Zer01HD\Utilities\Persistence\Preferences.cs" />
<Compile Include="Zer01HD\Utilities\ScreenSystem\ScreenManager.cs" />
<Compile Include="Zer01HD\Utilities\UI\Modular\Modules\Interactive\BasicButton.cs" />
<Compile Include="Zer01HD\Utilities\ScreenSystem\ITransition.cs" />
<Compile Include="Zer01HD\Utilities\ScreenSystem\LoadingScreen.cs" />
<Compile Include="Zer01HD\Screens\MainMenu\MainScreen.cs" />
<Compile Include="Zer01HD\Utilities\UI\Modular\Modules\Image.cs" />
<Compile Include="Zer01HD\Utilities\UI\Modular\UIModule.cs" />
<Compile Include="Zer01HD\Utilities\UI\Modular\UIModuleGroup.cs" />
<Compile Include="Audio\MusicController.cs" />
<Compile Include="Audio\MusicList.cs" />
<Compile Include="Audio\SupportedFormats.cs" />
<Compile Include="Audio\TransparentSampleProvider.cs" />
<Compile Include="Audio\Visualizer\HorizontalVisualizer.cs" />
<Compile Include="Screens\MainMenu\MainPage.cs" />
<Compile Include="Screens\Transitions\FadeAwayTransition.cs" />
<Compile Include="Utilities\Camera\Camera2D.cs" />
<Compile Include="Utilities\ContentSystem\NormalContentResolver.cs" />
<Compile Include="Utilities\Input\IInputListener.cs" />
<Compile Include="Utilities\Input\InputListener.cs" />
<Compile Include="Utilities\Input\InputUtilities.cs" />
<Compile Include="Utilities\Persistence\Preferences.cs" />
<Compile Include="Utilities\ScreenSystem\ScreenManager.cs" />
<Compile Include="Utilities\UI\Modular\Modules\Interactive\BasicButton.cs" />
<Compile Include="Utilities\ScreenSystem\ITransition.cs" />
<Compile Include="Utilities\ScreenSystem\LoadingScreen.cs" />
<Compile Include="Screens\MainMenu\MainScreen.cs" />
<Compile Include="Utilities\UI\Modular\Modules\Image.cs" />
<Compile Include="Utilities\UI\Modular\UIModule.cs" />
<Compile Include="Utilities\UI\Modular\UIModuleGroup.cs" />
<Compile Include="RhythmBulletGame.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Zer01HD\Utilities\UI\Book\Page.cs" />
<Compile Include="Zer01HD\Utilities\UI\Book\Book.cs" />
<Compile Include="Zer01HD\Utilities\UI\Modular\Modules\TextLabel.cs" />
<Compile Include="Zer01HD\Utilities\ScreenSystem\Screen.cs" />
<Compile Include="Zer01HD\Utilities\ContentSystem\ContentLoad.cs" />
<Compile Include="Zer01HD\ContentResolvers\FontContentResolver.cs" />
<Compile Include="Zer01HD\ContentResolvers\ResolutionContentResolver.cs" />
<Compile Include="Zer01HD\Utilities\ContentSystem\ContentManagerController.cs" />
<Compile Include="Zer01HD\Utilities\ContentSystem\IContentPathModifier.cs" />
<Compile Include="Zer01HD\Utilities\ParticleSystem\Particle.cs" />
<Compile Include="Zer01HD\Preferences\Controls.cs" />
<Compile Include="Zer01HD\Preferences\General.cs" />
<Compile Include="Zer01HD\Utilities\Persistence\PreferencesManager.cs" />
<Compile Include="Zer01HD\Utilities\DataTypes\Resolution.cs" />
<Compile Include="Utilities\UI\Book\Page.cs" />
<Compile Include="Utilities\UI\Book\Book.cs" />
<Compile Include="Utilities\UI\Modular\Modules\TextLabel.cs" />
<Compile Include="Utilities\ScreenSystem\Screen.cs" />
<Compile Include="Utilities\ContentSystem\ContentLoad.cs" />
<Compile Include="ContentResolvers\FontContentResolver.cs" />
<Compile Include="ContentResolvers\ResolutionContentResolver.cs" />
<Compile Include="Utilities\ContentSystem\ContentManagerController.cs" />
<Compile Include="Utilities\ContentSystem\IContentPathModifier.cs" />
<Compile Include="Utilities\ParticleSystem\Particle.cs" />
<Compile Include="Preferences\Controls.cs" />
<Compile Include="Preferences\General.cs" />
<Compile Include="Utilities\Persistence\PreferencesManager.cs" />
<Compile Include="Utilities\DataTypes\Resolution.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="BulletSharp, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">

View File

@ -1,17 +1,17 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Audio;
using RhythmBullet.Zer01HD.ContentResolvers;
using RhythmBullet.Zer01HD.Preferences;
using RhythmBullet.Zer01HD.Screens.MainMenu;
using RhythmBullet.Zer01HD.Utilities;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Zer01HD.Utilities.ContentSystem;
using RhythmBullet.Zer01HD.Utilities.DataTypes;
using RhythmBullet.Zer01HD.Utilities.Input;
using RhythmBullet.Zer01HD.Utilities.Persistence;
using RhythmBullet.Zer01HD.Utilities.ScreenSystem;
using RhythmBullet.Audio;
using RhythmBullet.ContentResolvers;
using RhythmBullet.Preferences;
using RhythmBullet.Screens.MainMenu;
using RhythmBullet.Utilities;
using RhythmBullet.Utilities.Camera;
using RhythmBullet.Utilities.ContentSystem;
using RhythmBullet.Utilities.DataTypes;
using RhythmBullet.Utilities.Input;
using RhythmBullet.Utilities.Persistence;
using RhythmBullet.Utilities.ScreenSystem;
using System;
using System.Diagnostics;

View File

@ -1,10 +1,10 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.UI.Book;
using RhythmBullet.Zer01HD.Utilities.ContentSystem;
using RhythmBullet.Zer01HD.Utilities.UI.Modular.Modules;
using RhythmBullet.UI.Book;
using RhythmBullet.Utilities.ContentSystem;
using RhythmBullet.Utilities.UI.Modular.Modules;
namespace RhythmBullet.Zer01HD.Screens.MainMenu
namespace RhythmBullet.Screens.MainMenu
{
internal class MainPage : Page
{

View File

@ -3,14 +3,14 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Screens.Transitions;
using RhythmBullet.Zer01HD.UI.Book;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Zer01HD.Utilities.ContentSystem;
using RhythmBullet.Zer01HD.Utilities.ScreenSystem;
using RhythmBullet.Screens.Transitions;
using RhythmBullet.UI.Book;
using RhythmBullet.Utilities.Camera;
using RhythmBullet.Utilities.ContentSystem;
using RhythmBullet.Utilities.ScreenSystem;
using System;
namespace RhythmBullet.Zer01HD.Screens.MainMenu
namespace RhythmBullet.Screens.MainMenu
{
class MainScreen : Screen
{

View File

@ -1,7 +1,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.Utilities.UI;
using RhythmBullet.Zer01HD.Utilities.ScreenSystem;
using RhythmBullet.Utilities.UI;
using RhythmBullet.Utilities.ScreenSystem;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@ -9,7 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Screens.Transitions
namespace RhythmBullet.Screens.Transitions
{
internal class FadeAwayTransition : IDisposable, ITransition
{

View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.Camera
namespace RhythmBullet.Utilities.Camera
{
public class Camera2D
{

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
namespace RhythmBullet.Utilities.ContentSystem
{
struct LoadableContent
{

View File

@ -9,7 +9,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
namespace RhythmBullet.Utilities.ContentSystem
{
public class ContentManagerController
{

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
namespace RhythmBullet.Utilities.ContentSystem
{
public interface IContentPathModifier
{

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
namespace RhythmBullet.Utilities.ContentSystem
{
class NormalContentResolver : IContentPathModifier
{

View File

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

View File

@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.Input
namespace RhythmBullet.Utilities.Input
{
public interface IInputListener
{

View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.Xna.Framework.Input;
namespace RhythmBullet.Zer01HD.Utilities.Input
namespace RhythmBullet.Utilities.Input
{
class InputListener : IInputListener
{

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Utilities.Input;
using RhythmBullet.Utilities.Input;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.Input
namespace RhythmBullet.Utilities.Input
{
public static class InputUtilities
{

View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ParticleSystem
namespace RhythmBullet.Utilities.ParticleSystem
{
class Particle
{

View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;
namespace RhythmBullet.Zer01HD.Utilities.Persistence
namespace RhythmBullet.Utilities.Persistence
{
public class Preferences
{

View File

@ -1,11 +1,11 @@
using RhythmBullet.Zer01HD.Preferences;
using RhythmBullet.Preferences;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Xml.Serialization;
namespace RhythmBullet.Zer01HD.Utilities.Persistence
namespace RhythmBullet.Utilities.Persistence
{
public class PreferencesManager
{

View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
namespace RhythmBullet.Utilities.ScreenSystem
{
public interface ITransition
{

View File

@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Graphics;
using System;
using System.Diagnostics;
namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
namespace RhythmBullet.Utilities.ScreenSystem
{
public class LoadingScreen : Screen, ITransition
{

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
namespace RhythmBullet.Utilities.ScreenSystem
{
public enum ScreenState { EnterTransition, ExitTransition, Normal }

View File

@ -1,6 +1,6 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
namespace RhythmBullet.Utilities.ScreenSystem
{
public delegate void FirstScreenChange(Screen screen);

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.UI.Book
namespace RhythmBullet.UI.Book
{
class Book
{

View File

@ -1,14 +1,14 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.UI.Modular;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.UI.Modular;
using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.UI.Book
namespace RhythmBullet.UI.Book
{
class Page : UIModuleGroup
{

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.UI.Modular;
using RhythmBullet.UI.Modular;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.UI.Modular.Modules
namespace RhythmBullet.Utilities.UI.Modular.Modules
{
class Image : UIModule
{

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.UI.Modular;
using RhythmBullet.Zer01HD.Utilities.Input;
using RhythmBullet.UI.Modular;
using RhythmBullet.Utilities.Input;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.Utilities.UI.Modular.Modules.Interactive
namespace RhythmBullet.Utilities.UI.Modular.Modules.Interactive
{
public delegate bool Clicked();

View File

@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.UI.Modular.Modules
namespace RhythmBullet.UI.Modular.Modules
{
public class TextLabel : UIModule
{

View File

@ -1,15 +1,15 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Zer01HD.Utilities.Input;
using RhythmBullet.Utilities.Camera;
using RhythmBullet.Utilities.Input;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace RhythmBullet.Zer01HD.UI.Modular
namespace RhythmBullet.UI.Modular
{
public class UIModule : IInputListener
{

View File

@ -6,10 +6,10 @@ using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
using RhythmBullet.Zer01HD.Utilities.Camera;
using RhythmBullet.Zer01HD.Utilities.Input;
using RhythmBullet.Utilities.Camera;
using RhythmBullet.Utilities.Input;
namespace RhythmBullet.Zer01HD.UI.Modular
namespace RhythmBullet.UI.Modular
{
public class UIModuleGroup : UIModule
{