*misc

5 files changed, 27 insertions, 33 deletions

diff --git a/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs b/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs
index 93981bfd..94e5f6a7 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffectBase.cs
@@ -14,10 +14,10 @@ public abstract class LensEffectBase
 {

     public enum EStage

     {

-        Before ,  // 迭代之前

-        Iterate , // 迭代renderer

-        After ,   // 迭代之后

-        Finished, // 渲染角色之后（所有lens effect结束）

+        BeforeIterate, // 迭代之前

+        Iterate,       // 迭代renderer

+        AfterIterate,  // 迭代之后

+        FinishRender,  // 渲染角色之后（所有lens effect结束）

     }

 

     public abstract ERenderingEvent renderingEvents { get; }

@@ -31,7 +31,7 @@ public abstract class LensEffectBase
     public UnitController owner;

     #endregion

 

-    private static MaterialEntry _ClaimMaterial(string shader)

+    private static MaterialEntry ClaimMaterial(string shader)

     {

         List<MaterialEntry> mats;

         if (m_MaterailPool.TryGetValue(shader, out mats) && mats.Count > 0)

@@ -47,7 +47,7 @@ public abstract class LensEffectBase
         return entry;

     }

 

-    private static void _ReleaseMaterial(MaterialEntry entry)

+    private static void ReleaseMaterial(MaterialEntry entry)

     {

         List<MaterialEntry> mats;

         if (!m_MaterailPool.TryGetValue(entry.shader, out mats))

@@ -58,24 +58,18 @@ public abstract class LensEffectBase
         mats.Add(entry);

     }
 
-    protected MaterialEntry ClaimMaterial(string shader)

+    protected MaterialEntry GetTempMaterial(string shader)

     {

-        MaterialEntry entry = _ClaimMaterial(shader);

+        MaterialEntry entry = ClaimMaterial(shader);

         m_InUseMaterials.Add(entry);

         return entry;

     }
 
-    protected void ReleaseMaterial(MaterialEntry entry)

-    {

-        m_InUseMaterials.Remove(entry);

-        _ReleaseMaterial(entry);

-    }
-
     protected void ReleaseAllInUsedMaterials()

     {

         for(int i = 0; i < m_InUseMaterials.Count; ++i)

         {

-            _ReleaseMaterial(m_InUseMaterials[i]);

+            ReleaseMaterial(m_InUseMaterials[i]);

         }

         m_InUseMaterials.Clear();

     }
diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs
index 5260a751..db0c1956 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs
@@ -18,7 +18,7 @@ public class LensEffect_BlurRim : LensEffectBase
 

 	public override void AfterForwardOpaque(EStage stage, CommandBuffer cb)

     {

-        if (stage == EStage.Before)

+        if (stage == EStage.BeforeIterate)

         {

 			Before(cb);
         }

@@ -26,11 +26,11 @@ public class LensEffect_BlurRim : LensEffectBase
         {

 			Iterate(cb);
 		}

-        else if (stage == EStage.After)

+        else if (stage == EStage.AfterIterate)

         {

 			After(cb);
         }

-        else if (stage == EStage.Finished)

+        else if (stage == EStage.FinishRender)

         {

         }

     }

@@ -64,7 +64,7 @@ public class LensEffect_BlurRim : LensEffectBase
 

 		for (int i = 0; i < subMeshCount; ++i)

 		{

-			MaterialEntry mat = ClaimMaterial(StaticDefine.shaders[EShader.SolidColor].name);

+			MaterialEntry mat = GetTempMaterial(StaticDefine.shaders[EShader.SolidColor].name);

 			mat.material.SetColor("_Color", rimColor);

 			mat.material.SetMatrix("_ObjectToWorld", obj2Wod);

 			mat.material.SetTexture("_MainTex", curBodypartRenderer.renderer.sharedMaterial.GetTexture("_MainTex"));

@@ -74,7 +74,7 @@ public class LensEffect_BlurRim : LensEffectBase
 

 	void After(CommandBuffer cb)

 	{

-		MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.Blur].name);

+		MaterialEntry blur = GetTempMaterial(StaticDefine.shaders[EShader.Blur].name);

 

 		Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);

 		blur.material.SetVector("_UnitTileOffset", tileOffset);

diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs
index 6aa06d01..252efc6e 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_Buzz.cs
@@ -15,11 +15,11 @@ public class LensEffect_Buzz : LensEffectBase
 
 	public override void AfterForwardAlpha(EStage stage, CommandBuffer cb)
 	{
-		if (stage == EStage.Before)
+		if (stage == EStage.BeforeIterate)
 		{
 			Before(cb);
 		}
-		else if (stage == EStage.After)
+		else if (stage == EStage.AfterIterate)
 		{
 			After(cb);
 		}
@@ -27,7 +27,7 @@ public class LensEffect_Buzz : LensEffectBase
 
 	void Before(CommandBuffer cb)
 	{
-		MaterialEntry buzz = ClaimMaterial(StaticDefine.shaders[EShader.Buzz].name);
+		MaterialEntry buzz = GetTempMaterial(StaticDefine.shaders[EShader.Buzz].name);
 
 		cb.SetGlobalTexture("_UnitDepthTexture", owner.unitPreprocessing.unitDepthTexture);
 		cb.Blit(BuiltinRenderTextureType.CameraTarget, BuiltinRenderTextureType.CameraTarget, buzz.material);
diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs
index 0ff16e3a..d5d368d0 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs
@@ -28,15 +28,15 @@ public class LensEffect_Dash : LensEffectBase
 
 	public override void AfterForwardOpaque(EStage stage, CommandBuffer cb)
 	{
-		if (stage == EStage.Before)
+		if (stage == EStage.BeforeIterate)
 		{
 			Before(cb);
 		}
-		else if (stage == EStage.After)
+		else if (stage == EStage.AfterIterate)
 		{
 			After(cb);
 		}
-		else if (stage == EStage.Finished)
+		else if (stage == EStage.FinishRender)
 		{
 		}
 	}
@@ -58,7 +58,7 @@ public class LensEffect_Dash : LensEffectBase
 		Quaternion rot = smr.rootBone.transform.rotation;

 		obj2Wod = MatrixUtility.RotateAndTranslate(pos, rot);

 

-		MaterialEntry mat = ClaimMaterial(StaticDefine.shaders[EShader.SolidColor].name);

+		MaterialEntry mat = GetTempMaterial(StaticDefine.shaders[EShader.SolidColor].name);

 		mat.material.SetColor("_Color", rimColor);

 		mat.material.SetMatrix("_ObjectToWorld", obj2Wod);

 		mat.material.SetTexture("_MainTex", snapshot.renderers[0].sharedMaterial.GetTexture("_MainTex"));

@@ -70,7 +70,7 @@ public class LensEffect_Dash : LensEffectBase
 	{

 		curTime += Time.deltaTime;

 

-		MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.MotionBlur].name);
+		MaterialEntry blur = GetTempMaterial(StaticDefine.shaders[EShader.MotionBlur].name);
 
 		Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, trs.position, 6);

 		blur.material.SetVector("_UnitTileOffset", tileOffset);

diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs
index b76666ff..371186d0 100644
--- a/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs
+++ b/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs
@@ -15,7 +15,7 @@ public class LensEffect_MotionBlur : LensEffectBase
 

     public override void AfterImageEffectsOpaque(EStage stage, CommandBuffer cb)

     {

-        if (stage == EStage.Before)

+        if (stage == EStage.BeforeIterate)

         {

             tempID = Shader.PropertyToID("_Temp1");

 

@@ -43,16 +43,16 @@ public class LensEffect_MotionBlur : LensEffectBase
 

             for (int i = 0; i < subMeshCount; ++i)

             {

-                MaterialEntry mat = ClaimMaterial(StaticDefine.shaders[EShader.SolidColor].name);

+                MaterialEntry mat = GetTempMaterial(StaticDefine.shaders[EShader.SolidColor].name);

                 mat.material.SetColor("_Color", Color.red);

                 mat.material.SetMatrix("_ObjectToWorld", obj2Wod);

 

                 cb.DrawRenderer(curBodypartRenderer.renderer, mat.material, i);

             }
         }

-        else if(stage == EStage.After)

+        else if(stage == EStage.AfterIterate)

         {

-            MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.Blur].name);

+            MaterialEntry blur = GetTempMaterial(StaticDefine.shaders[EShader.Blur].name);

 

             Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);

             blur.material.SetVector("_UnitTileOffset", tileOffset);

@@ -61,7 +61,7 @@ public class LensEffect_MotionBlur : LensEffectBase
             tempID = Shader.PropertyToID("_Temp1");

             cb.ReleaseTemporaryRT(tempID);
         }

-        else if(stage == EStage.Finished)

+        else if(stage == EStage.FinishRender)

         {

         }

     }