Abstract away settings logic using composition

Samples/BasicMenu/Components/MenuChangeVolume.cs

@@ -22,13 +22,13 @@ public override void DoAction()
 		{
 			base.DoAction();
 
-			float volume = DualityApp.UserData.SoundMasterVol;
+			float volume = DualityApp.UserData.Instance.SoundMasterVol;
 			volume += (this.changeAmount / 10f);
 
 			// make sure that the volume is between 0 and 1
 			volume = MathF.Min(MathF.Max(volume, 0), 1);
 
-			DualityApp.UserData.SoundMasterVol = volume;
+			DualityApp.UserData.Instance.SoundMasterVol = volume;
 		}
 	}
 }

Samples/BasicMenu/VolumeRenderer.cs

@@ -22,7 +22,7 @@ void ICmpUpdatable.OnUpdate()
 			}
 
 			// update the volume value
-			volumeText.Text.SourceText = String.Format("Volume {0:0.0}", DualityApp.UserData.SoundMasterVol);
+			volumeText.Text.SourceText = String.Format("Volume {0:0.0}", DualityApp.UserData.Instance.SoundMasterVol);
 		}
 	}
 }

Samples/Benchmarks/BenchmarkController.cs

@@ -199,12 +199,12 @@ public void EnterBenchmarkMode()
 			this.renderSetup = ContentProvider.GetAvailableContent<BenchmarkRenderSetup>().FirstOrDefault();
 
 			// Make sure the benchmark setup is used globally
-			DualityApp.AppData.RenderingSetup = this.renderSetup.As<RenderSetup>();
+			DualityApp.AppData.Instance.RenderingSetup = this.renderSetup.As<RenderSetup>();
 		}
 		public void LeaveBenchmarkMode()
 		{
 			// Uninstall the benchmark setup we set globally
-			DualityApp.AppData.RenderingSetup = null;
+			DualityApp.AppData.Instance.RenderingSetup = null;
 
 			// Discard local references to content, since we know the controller 
 			// itself won't be discarded due to being static

Samples/Benchmarks/RenderSetupInfo.cs

@@ -64,7 +64,7 @@ void ICmpInitializable.OnActivate()
 		{
 			if (DualityApp.ExecContext == DualityApp.ExecutionContext.Game)
 			{
-				this.renderSetup = DualityApp.AppData.RenderingSetup.As<BenchmarkRenderSetup>();
+				this.renderSetup = DualityApp.AppData.Instance.RenderingSetup.As<BenchmarkRenderSetup>();
 				this.text = new FormattedText();
 				this.text.LineAlign = Alignment.Right;
 				this.text.MaxWidth = 200;

Samples/Physics/PhysicsSampleController.cs

@@ -101,7 +101,7 @@ void ICmpRenderer.Draw(IDrawDevice device)
 
 			// When the mouse is hovering over the game area and the system cursor 
 			// is disabled, draw a custom cursor as a replacement
-			if (!DualityApp.UserData.SystemCursorVisible && DualityApp.Mouse.IsAvailable)
+			if (!DualityApp.UserData.Instance.SystemCursorVisible && DualityApp.Mouse.IsAvailable)
 			{
 				canvas.State.ColorTint = (this.dragObj != null) ? this.interactionColor : this.defaultColor;
 				canvas.FillThickLine(

Source/Core/Duality/Audio/SoundDevice.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading;
-using System.Linq;
-using System.Diagnostics;
 
 using Duality.Resources;
 using Duality.Components;
@@ -23,7 +20,6 @@ public sealed class SoundDevice : IDisposable
 		private	int						numPlaying3D	= 0;
 		private	bool					mute			= false;
 
-
 		/// <summary>
 		/// [GET / SET] The current listener object. This is automatically set to an available
 		/// <see cref="SoundListener"/>.
@@ -113,10 +109,14 @@ public IEnumerable<SoundInstance> Playing
 			get { return this.sounds; }
 		}
 
+		private readonly SettingsContainer<DualityAppData> appData;
+		private readonly SettingsContainer<DualityUserData> userData;
 
-		public SoundDevice()
+		public SoundDevice(SettingsContainer<DualityAppData> appData, SettingsContainer<DualityUserData> userData)
 		{
-			DualityApp.AppDataChanged += this.DualityApp_AppDataChanged;
+			this.appData = appData;
+			this.userData = userData;
+			this.appData.Changed += this.AppDataChanged;
 			UpdateWorldSettings();
 		}
 		~SoundDevice()
@@ -133,7 +133,7 @@ private void Dispose(bool manually)
 			if (!this.disposed)
 			{
 				this.disposed = true;
-				DualityApp.AppDataChanged -= this.DualityApp_AppDataChanged;
+				this.appData.Changed -= this.AppDataChanged;
 
 				// Clear all playing sounds
 				foreach (SoundInstance inst in this.sounds) inst.Dispose();
@@ -225,8 +225,8 @@ private void UpdateListener()
 		private void UpdateWorldSettings()
 		{
 			DualityApp.AudioBackend.UpdateWorldSettings(
-				DualityApp.AppData.SpeedOfSound, // Already in meters per second / audio units
-				DualityApp.AppData.SoundDopplerFactor);
+				this.appData.Instance.SpeedOfSound, // Already in meters per second / audio units
+				this.appData.Instance.SoundDopplerFactor);
 		}
 
 		/// <summary>
@@ -236,7 +236,7 @@ private void UpdateWorldSettings()
 		/// <returns>A new <see cref="SoundInstance"/> representing the playing sound.</returns>
 		public SoundInstance PlaySound(ContentRef<Sound> snd)
 		{
-			SoundInstance inst = new SoundInstance(snd);
+			SoundInstance inst = new SoundInstance(this.userData, snd);
 			this.sounds.Add(inst);
 			return inst;
 		}
@@ -248,7 +248,7 @@ public SoundInstance PlaySound(ContentRef<Sound> snd)
 		/// <returns>A new <see cref="SoundInstance"/> representing the playing sound.</returns>
 		public SoundInstance PlaySound3D(ContentRef<Sound> snd, Vector3 pos)
 		{
-			SoundInstance inst = new SoundInstance(snd, pos);
+			SoundInstance inst = new SoundInstance(this.userData, snd, pos);
 			this.sounds.Add(inst);
 			return inst;
 		}
@@ -261,7 +261,7 @@ public SoundInstance PlaySound3D(ContentRef<Sound> snd, Vector3 pos)
 		/// <returns>A new <see cref="SoundInstance"/> representing the playing sound.</returns>
 		public SoundInstance PlaySound3D(ContentRef<Sound> snd, GameObject attachTo, bool trackVelocity)
 		{
-			SoundInstance inst = new SoundInstance(snd, attachTo, trackVelocity);
+			SoundInstance inst = new SoundInstance(this.userData, snd, attachTo, trackVelocity);
 			this.sounds.Add(inst);
 			return inst;
 		}
@@ -275,7 +275,7 @@ public SoundInstance PlaySound3D(ContentRef<Sound> snd, GameObject attachTo, boo
 		/// <returns>A new <see cref="SoundInstance"/> representing the playing sound.</returns>
 		public SoundInstance PlaySound3D(ContentRef<Sound> snd, GameObject attachTo, Vector3 relativePos, bool trackVelocity)
 		{
-			SoundInstance inst = new SoundInstance(snd, attachTo, trackVelocity);
+			SoundInstance inst = new SoundInstance(this.userData, snd, attachTo, trackVelocity);
 			inst.Pos = relativePos;
 			this.sounds.Add(inst);
 			return inst;
@@ -291,7 +291,7 @@ public void StopAll()
 			}
 		}
 
-		private void DualityApp_AppDataChanged(object sender, EventArgs e)
+		private void AppDataChanged(object sender, EventArgs e)
 		{
 			UpdateWorldSettings();
 		}

Source/Core/Duality/Audio/SoundInstance.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.Concurrent;
-using System.Threading;
 
 using Duality.Resources;
 using Duality.Backend;
@@ -193,6 +190,7 @@ public Vector3 Vel
 			set { this.vel = value; }
 		}
 
+		private readonly SettingsContainer<DualityUserData> userData;
 
 		~SoundInstance()
 		{
@@ -228,8 +226,9 @@ private void OnDisposed(bool manually)
 		}
 
 
-		internal SoundInstance(ContentRef<Sound> sound, GameObject attachObj, bool trackVelocity)
+		internal SoundInstance(SettingsContainer<DualityUserData> userData, ContentRef<Sound> sound, GameObject attachObj, bool trackVelocity)
 		{
+			this.userData = userData;
 			if (attachObj != null && trackVelocity)
 				attachObj.AddComponent<VelocityTracker>();
 
@@ -238,15 +237,17 @@ internal SoundInstance(ContentRef<Sound> sound, GameObject attachObj, bool track
 			this.sound = sound;
 			this.audioData = this.sound.IsAvailable ? this.sound.Res.FetchData() : null;
 		}
-		internal SoundInstance(ContentRef<Sound> sound, Vector3 pos)
+		internal SoundInstance(SettingsContainer<DualityUserData> userData, ContentRef<Sound> sound, Vector3 pos)
 		{
+			this.userData = userData;
 			this.pos = pos;
 			this.is3D = true;
 			this.sound = sound;
 			this.audioData = this.sound.IsAvailable ? this.sound.Res.FetchData() : null;
 		}
-		internal SoundInstance(ContentRef<Sound> sound)
+		internal SoundInstance(SettingsContainer<DualityUserData> userData, ContentRef<Sound> sound)
 		{
+			this.userData = userData;
 			this.sound = sound;
 			this.is3D = false;
 			this.audioData = this.sound.IsAvailable ? this.sound.Res.FetchData() : null;
@@ -387,22 +388,22 @@ private float GetTypeVolFactor()
 			switch (this.sound.IsAvailable ? this.sound.Res.Type : SoundType.World)
 			{
 				case SoundType.UserInterface:
-					optVolFactor = DualityApp.UserData.SoundEffectVol;
+					optVolFactor = this.userData.Instance.SoundEffectVol;
 					break;
 				case SoundType.World:
-					optVolFactor = DualityApp.UserData.SoundEffectVol;
+					optVolFactor = this.userData.Instance.SoundEffectVol;
 					break;
 				case SoundType.Speech:
-					optVolFactor = DualityApp.UserData.SoundSpeechVol;
+					optVolFactor = this.userData.Instance.SoundSpeechVol;
 					break;
 				case SoundType.Music:
-					optVolFactor = DualityApp.UserData.SoundMusicVol;
+					optVolFactor = this.userData.Instance.SoundMusicVol;
 					break;
 				default:
 					optVolFactor = 1.0f;
 					break;
 			}
-			return optVolFactor * DualityApp.UserData.SoundMasterVol * 0.5f;
+			return optVolFactor * this.userData.Instance.SoundMasterVol * 0.5f;
 		}
 		private void RegisterPlaying()
 		{

Source/Core/Duality/Backend/Dummy/DummyNativeWindow.cs

@@ -15,7 +15,7 @@ void INativeWindow.Run()
 			while (DualityApp.ExecContext != DualityApp.ExecutionContext.Terminated)
 			{
 				DualityApp.Update();
-				DualityApp.Render(null, new Rect(DualityApp.UserData.WindowSize), DualityApp.UserData.WindowSize);
+				DualityApp.Render(null, new Rect(DualityApp.UserData.Instance.WindowSize), DualityApp.UserData.Instance.WindowSize);
 			}
 		}
 

Source/Core/Duality/Components/Camera.cs

@@ -156,7 +156,7 @@ public RenderSetup ActiveRenderSetup
 			{
 				return 
 					this.renderSetup.Res ?? 
-					DualityApp.AppData.RenderingSetup.Res ?? 
+					DualityApp.AppData.Instance.RenderingSetup.Res ?? 
 					RenderSetup.Default.Res;
 			}
 		}

Source/Core/Duality/Components/Physics/PhysicsWorld.cs

@@ -65,7 +65,7 @@ public float InterpolateAlpha
 		/// </summary>
 		public bool IsFixedTimestep
 		{
-			get { return DualityApp.AppData.PhysicsFixedTime && !this.lowFramerateMode; }
+			get { return DualityApp.AppData.Instance.PhysicsFixedTime && !this.lowFramerateMode; }
 		}
 
 
@@ -384,7 +384,7 @@ public bool QueryRect(Vector2 worldCoord, Vector2 size, List<RigidBody> queriedB
 
 		private void UpdateNativeSettings()
 		{
-			Settings.VelocityThreshold = PhysicsUnit.VelocityToPhysical * DualityApp.AppData.PhysicsVelocityThreshold;
+			Settings.VelocityThreshold = PhysicsUnit.VelocityToPhysical * DualityApp.AppData.Instance.PhysicsVelocityThreshold;
 		}
 	}
 }