Dump from Dogfight

Assets/External Libraries/DanmakuUnity2D/Attack Patterns/Burst.cs

@@ -28,7 +28,7 @@ public abstract class Burst : AttackPattern {
 		/// An overridable factory method for subclasses to control the various 
 		/// </summary>
 		/// <value>The controller to be used with the bullets fired with this attack pattern</value>
-		protected abstract IProjectileGroupController BurstController {
+		protected abstract IProjectileController BurstController {
 			get;
 		}
 

Assets/External Libraries/DanmakuUnity2D/Attack Patterns/ControlledBurst.cs

@@ -18,7 +18,7 @@ public class ControlledBurst : Burst {
 
 		#region implemented abstract members of Burst
 
-		protected override IProjectileGroupController BurstController {
+		protected override IProjectileController BurstController {
 			get {
 //				if(controller is ControllerWrapperBehavior<ProjectileControlBehavior>) {
 //					return (controller as ControllerWrapperBehavior<ProjectileControlBehavior>).Controller;

Assets/External Libraries/DanmakuUnity2D/Attack Patterns/CurvedBurst.cs

@@ -17,7 +17,7 @@ public class CurvedBurst : Burst {
 
 		#region implemented abstract members of Burst
 
-		protected override IProjectileGroupController BurstController {
+		protected override IProjectileController BurstController {
 			get {
 				return CurvedController;
 			}

Assets/External Libraries/DanmakuUnity2D/Attack Patterns/LinearBurst.cs

@@ -18,7 +18,7 @@ public class LinearBurst : Burst {
 
 		#region implemented abstract members of Burst
 
-		protected override IProjectileGroupController BurstController {
+		protected override IProjectileController BurstController {
 			get {
 				return LinearController;
 			}

Assets/External Libraries/DanmakuUnity2D/Controllers/Projectile Cotnrollers/AggregateProjectileController.cs

@@ -3,21 +3,22 @@
 
 namespace Danmaku2D.ProjectileControllers {
 
-	public class AggregateProjectileController : ProjectileController, ICollection<IProjectileController> {
+	public class AggregateProjectileController : IProjectileController, ICollection<IProjectileController> {
 
 		private List<IProjectileController> children;
 
 		public AggregateProjectileController(params IProjectileController[] children) {
 			this.children = new List<IProjectileController> (children);
 		}
 
-		#region implemented abstract members of ProjectileController
-		public override void UpdateProjectile (float dt) {
+		#region IProjectileController implementation
+
+		public void UpdateProjectile (Projectile projectile, float dt) {
 			for(int i = 0; i < children.Count; i++) {
-				children[i].Projectile = Projectile;
-				children[i].UpdateProjectile(dt);
+				children[i].UpdateProjectile(projectile, dt);
 			}
 		}
+
 		#endregion
 
 		#region ICollection implementation

Assets/External Libraries/DanmakuUnity2D/Controllers/Projectile Cotnrollers/AnimationCurveControl.cs

@@ -15,25 +15,12 @@ protected override AnimationCurveController CreateController () {
 	}
 
 	[System.Serializable]
-	public class AnimationCurveController : ProjectileController, IProjectileGroupController {
+	public class AnimationCurveController : IProjectileController {
 
 		[SerializeField]
 		private AnimationCurve velocityCurve;
 
-		#region implemented abstract members of ProjectileController
-
-		public sealed override void UpdateProjectile (float dt) {
-			UpdateProjectile (Projectile, dt);
-		}
-
-		#endregion
-
-		#region IProjectileGroupController implementation
-
-		public ProjectileGroup ProjectileGroup {
-			get;
-			set;
-		}
+		#region IProjectileController implementation
 
 		public virtual void UpdateProjectile (Projectile projectile, float dt) {
 			//			if(acceleration != 0) {

Assets/External Libraries/DanmakuUnity2D/Controllers/Projectile Cotnrollers/ControllerWrapperBehavior.cs

@@ -10,25 +10,25 @@ namespace Danmaku2D.ProjectileControllers {
 	/// An abstract generic superclass to mirror the functionality of any implementor of IPorjectileGroupController in a ProjectileControlBehavior.
 	/// It can be used with other ProjectileControlBehavior implementations; however it is best used with IProjectileGroupController implementations that don't derive from ProjectileControlBehavior.
 	/// </summary>
-	public abstract class ControllerWrapperBehavior<T> : ProjectileControlBehavior where T : IProjectileGroupController {
+	public abstract class ControllerWrapperBehavior<T> : ProjectileControlBehavior where T : IProjectileController {
 
-		private T controller;
+		private T projectileController;
 
 		/// <summary>
 		/// Gets the underlying IProjectileGroupController.
 		/// </summary>
 		/// <value>The underlying controller.</value>
 		public T Controller {
 			get {
-				return controller;
+				return projectileController;
 			}
 		}
 
 		public override void Awake () {
 			base.Awake ();
-			if (controller == null) {
-				controller = CreateController ();
-				if (controller == null) {
+			if (projectileController == null) {
+				projectileController = CreateController ();
+				if (projectileController == null) {
 					throw new System.NotImplementedException(GetType().ToString() + " does not implement CreateController() properly");
 				}
 			}
@@ -43,7 +43,7 @@ public override void Awake () {
 
 		#region implemented abstract members of ProjectileControlBehavior
 		public sealed override void UpdateProjectile (Projectile projectile, float dt) {
-			controller.UpdateProjectile(projectile, dt);
+			projectileController.UpdateProjectile(projectile, dt);
 		}
 		#endregion
 

Assets/External Libraries/DanmakuUnity2D/Controllers/Projectile Cotnrollers/IProjectileController.cs

@@ -12,18 +12,12 @@ namespace Danmaku2D {
 	/// </summary>
 	public interface IProjectileController {
 
-		/// <summary>
-		/// Gets or sets the projectile controlled by this controller.
-		/// </summary>
-		/// <value>The projectile controlled by this controller</value>
-		Projectile Projectile { get; set; }
-
 		/// <summary>
 		/// Updates the Projectile controlled by the controller instance.
 		/// </summary>
 		/// <returns>the displacement from the Projectile's original position after udpating</returns>
 		/// <param name="dt">the change in time since the last update</param>
-		void UpdateProjectile (float dt);
+		void UpdateProjectile (Projectile projectile, float dt);
 
 	}
 }

Assets/External Libraries/DanmakuUnity2D/Controllers/Projectile Cotnrollers/LinearProjectileControl.cs

@@ -25,7 +25,7 @@ namespace Danmaku2D {
 	/// A ProjectileController or ProjectileGroupController for creating bullets that move along a straight path.
 	/// </summary>
 	[System.Serializable]
-	public class LinearProjectile : ProjectileController, IProjectileGroupController {
+	public class LinearProjectile : IProjectileController {
 
 		[SerializeField]
 		private float velocity = 5;
@@ -75,19 +75,6 @@ public void SetAcceleration(float accel, float cap) {
 
 		#region IProjectileController implementation
 
-		public sealed override void UpdateProjectile (float dt) {
-			UpdateProjectile (Projectile, dt);
-		}
-
-		#endregion
-
-		#region IProjectileGroupController implementation
-
-		public ProjectileGroup ProjectileGroup {
-			get;
-			set;
-		}
-
 		public virtual void UpdateProjectile (Projectile projectile, float dt) {
 //			if(acceleration != 0) {
 //				float accelSign = Util.Sign(acceleration);

Assets/External Libraries/DanmakuUnity2D/Controllers/Projectile Cotnrollers/ProjectileControlBehavior.cs

@@ -3,7 +3,7 @@
 
 namespace Danmaku2D {
 
-	public abstract class ProjectileControlBehavior : MonoBehaviour, IProjectileGroupController {
+	public abstract class ProjectileControlBehavior : MonoBehaviour, IProjectileController {
 
 		private SpriteRenderer spriteRenderer;
 		public SpriteRenderer SpriteRenderer {
@@ -32,8 +32,12 @@ public virtual void Awake() {
 			ProjectileGroup = new ProjectileGroup ();
 			ProjectileGroup.Controller = this;
 		}
-
-		public abstract void UpdateProjectile(Projectile projectile, float dt);
+
+		#region IProjectileController implementation
+
+		public abstract void UpdateProjectile (Projectile projectile, float dt);
+
+		#endregion
 	}
 }