Finalized testing of Particle Systems

Works even with non-symmetric bullets.

I planned on moving the code for the rendering to a more generalized
system in UnityUtilLib, but opted not to. "Don't break what's not
broken".

Author: james7132

Assets/External/DanmakU/Core/Danmaku.cs

@@ -476,12 +476,7 @@ public void MatchPrefab(DanmakuPrefab prefab) {
 			layer = runtime.cachedLayer;
 			colliderMask = collisionMask [layer];
 
-			IDanmakuController[] pcbs = runtime.ExtraControllers;
-			if (pcbs.Length > 0) {
-				for (int i = 0; i < pcbs.Length; i++) {
-					controllerUpdate += pcbs[i].UpdateDanmaku;
-				}
-			}
+			controllerUpdate += runtime.ExtraControllers;
 		}
 
 		#region IPooledObject implementation

Assets/External/DanmakU/Core/DanmakuPool.cs

@@ -115,10 +115,6 @@ internal class DanmakuPool : IPool<Danmaku> {
 //			
 //			#endregion
 
-
-
-
-
 			internal int[] queue;
 			internal Danmaku[] all;
 

Assets/External/DanmakU/Core/DanmakuPrefab.cs

@@ -43,39 +43,24 @@ static DanmakuPrefab() {
 			hiddenParticle.axisOfRotation = Vector3.forward;
 		}
 
+
+
 		[SerializeField]
 		private IDanmakuController[] extraControllers;
-		internal IDanmakuController[] ExtraControllers {
+
+		private DanmakuController controllerAggregate;
+
+		internal DanmakuController ExtraControllers {
 			get {
-				return extraControllers;
+				return controllerAggregate;
 			}
 		}
 
 		public void Add(Danmaku danmaku) {
-//			Debug.Log("Add");
-//			if (currentDanmaku == null) {
-//				currentDanmaku = new Danmaku[128];
-//			}
-//			danmakuCount++;
-//			if (danmakuCount >= currentDanmaku.Length) {
-//				Danmaku[] temp = new Danmaku[Mathf.NextPowerOfTwo(danmakuCount + 1)];
-//				System.Array.Copy(currentDanmaku, temp, currentDanmaku.Length);
-//				currentDanmaku = temp;
-//			}
-//			danmaku.renderIndex = danmakuCount;
-//			currentDanmaku [danmakuCount] = danmaku;
 			currentDanmaku.Add(danmaku);
 		}
 
 		public void Remove(Danmaku danmaku) {
-//			Debug.Log("remove");
-//			int deadIndex = danmaku.poolIndex;;
-//			Danmaku temp = currentDanmaku [danmakuCount];
-//			currentDanmaku [danmakuCount] = danmaku;
-//			currentDanmaku [deadIndex] = temp;
-//			danmaku.renderIndex = danmakuCount;
-//			danmaku.renderIndex = deadIndex;
-//			danmakuCount--;
 			currentDanmaku.Remove(danmaku);
 		}
 
@@ -94,9 +79,7 @@ void Update() {
 			}
 
 			int count2 = runtimeSystem.GetParticles(particles);
-//			if(count > count2) {
-//				Debug.Log(count + ", " + count2);
-//			}
+				Debug.Log(count2);
 			Vector3 forward = Vector3.forward;
 			bool done;
 			IEnumerator<Danmaku> enumerator = currentDanmaku.GetEnumerator();
@@ -165,18 +148,16 @@ void Update() {
 					}
 				}
 			}
-
-//			for(; index < count; index++) {
-//				particles[index].lifetime = 10000;
-//				particles[index].position = Vector2.up * 20;
-//				particles[index].size = 0f;
-//			}
 			runtimeSystem.SetParticles(particles, danmakuCount);
 		}
 
 		public override void Awake() {
 			base.Awake();
 
+			for (int i = 0; i < extraControllers.Length; i++) {
+				controllerAggregate += extraControllers[i].UpdateDanmaku;
+			}
+
 			GetComponent<SpriteRenderer>().enabled = false;
 			GetComponent<CircleCollider2D>().enabled = false;
 
@@ -203,14 +184,15 @@ public override void Awake() {
 			runtimeSystem.gravityModifier = 0f;
 			runtimeSystem.startSpeed = 0f;
 			runtimeSystem.enableEmission = false;
-			
-			runtimeSystem.Emit(runtimeSystem.maxParticles);
 
 			particles = new ParticleSystem.Particle[runtimeSystem.particleCount];
 
 			Material renderMaterial = new Material(Material);
 			renderMaterial.mainTexture = Sprite.texture;
 
+			MaterialPropertyBlock propertyBlock = new MaterialPropertyBlock();
+			propertyBlock.AddTexture("_MainTex", Sprite.texture);
+
 			if (useMesh) {
 				spriteMesh = new Mesh();
 
@@ -241,6 +223,7 @@ public override void Awake() {
 				runtimeRenderer.renderMode = ParticleSystemRenderMode.Billboard;
 			}
 			runtimeRenderer.sharedMaterial = renderMaterial;
+			runtimeRenderer.SetPropertyBlock(propertyBlock);
 			runtimeRenderer.sortingLayerID = cachedSortingLayer;
 			runtimeRenderer.sortingOrder = cachedSortingOrder;
 			runtimeRenderer.reflectionProbeUsage = UnityEngine.Rendering.ReflectionProbeUsage.Off;

Assets/External/DanmakU/Core/DanmakuStatic.cs

@@ -111,11 +111,10 @@ public static void DeactivateInCircle(Vector2 center, float radius, int layerMas
 		public static void DirectDeactivateInCircle(Vector2 center, float radius, int layerMask = ~0) {
 			Danmaku[] all = danmakuPool.all;
 			Danmaku target;
-			float sqrRadius = radius * radius, DRadius;
+			float sqrRadius = radius * radius;
 			for (int i = 0; i < all.Length; i++) {
 				target = all[i];
 				if((layerMask & (1 << target.layer)) != 0) {
-					DRadius = target.colliderRadius;
 					if(sqrRadius >= (target.Position - center).sqrMagnitude) {
 						target.DeactivateImmediate();
 					}

Assets/Testing/Danmaku Particle System.prefab

@@ -203,7 +203,7 @@ ParticleSystem:
         rgba: 4294967295
       maxColor:
         serializedVersion: 2
-        rgba: 4278190335
+        rgba: 4294967295
       minMaxState: 0
     startSize:
       scalar: 1
@@ -289,7 +289,7 @@ ParticleSystem:
     m_Mesh: {fileID: 0}
     randomDirection: 0
   EmissionModule:
-    enabled: 1
+    enabled: 0
     m_Type: 0
     rate:
       scalar: 10
@@ -1113,7 +1113,7 @@ ParticleSystemRenderer:
   m_LengthScale: 2
   m_SortingFudge: 0
   m_NormalDirection: 1
-  m_SortMode: 3
+  m_SortMode: 2
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}

Assets/Testing/Danmaku Prefab.prefab

@@ -73,12 +73,12 @@ MonoBehaviour:
       - '[]'
       - '{"$content":1}'
       - '{"$content":2}'
-      - true
+      - false
   _id: 0
   dbg: 0
   circleCollider: {fileID: 5818048}
   spriteRenderer: {fileID: 21290588}
-  symmetric: 1
+  symmetric: 0
   danmakuParticlePrefab: {fileID: 19897468, guid: f56f0572d67cbfa4f818e56887908592,
     type: 2}
   useMesh: 1

Assets/Testing/Test Scene 2.unity

@@ -205,7 +205,7 @@ MonoBehaviour:
   playerSpawnLocation: {x: .5, y: .25}
   camera2D: {fileID: 1407123246}
   camera3D: {fileID: 0}
-  bottomLeft: {x: -26.638298, y: -20}
+  bottomLeft: {x: -26.7073174, y: -20}
   viewportRect:
     serializedVersion: 2
     x: 0
@@ -284,7 +284,7 @@ MonoBehaviour:
       range: 0
     Count:
       type: 0
-      centerValue: 500
+      centerValue: 20
       range: 0
     DeltaVelocity:
       type: 0