diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectCapturedImageEditor.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectCapturedImageEditor.cs
index 902a8d8..26a23d6 100644
--- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectCapturedImageEditor.cs
+++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Editor/UIEffectCapturedImageEditor.cs
@@ -125,24 +125,28 @@ namespace Coffee.UIExtensions
GUILayout.Label("Debug");
if (GUILayout.Button("Capture", "ButtonLeft"))
- UpdateTexture(true);
+ {
+ graphic.Release();
+ EditorApplication.delayCall += graphic.Capture;
+ }
EditorGUI.BeginDisabledGroup(!(target as UIEffectCapturedImage).capturedTexture);
if (GUILayout.Button("Release", "ButtonRight"))
- UpdateTexture(false);
+ {
+ graphic.Release();
+ }
EditorGUI.EndDisabledGroup();
}
// Warning message for overlay rendering.
- var graphic = (target as UIEffectCapturedImage);
if(graphic && graphic.canvas)
{
var canvas = graphic.canvas.rootCanvas;
- if( canvas && canvas.renderMode != RenderMode.ScreenSpaceCamera)
+ if( canvas && canvas.renderMode == RenderMode.WorldSpace)
{
using (new GUILayout.HorizontalScope())
{
- EditorGUILayout.HelpBox("'ScreenSpace - Overlay' and 'WorldSpace - Camera' render modes are not supported. Change render mode of root canvas to 'ScreenSpace - Camera'.", MessageType.Warning);
+ EditorGUILayout.HelpBox("'WorldSpace - Camera' render modes is not supported. Change render mode of root canvas.", MessageType.Warning);
if (GUILayout.Button("Canvas"))
{
Selection.activeGameObject = canvas.gameObject;
@@ -210,20 +214,5 @@ namespace Coffee.UIExtensions
GUILayout.Label(string.Format("{0}x{1}", w, h), EditorStyles.miniLabel);
}
}
-
- ///
- /// Updates the texture.
- ///
- void UpdateTexture(bool capture)
- {
- var current = target as UIEffectCapturedImage;
- bool enable = current.enabled;
- current.enabled = false;
- current.Release();
- if (capture)
- current.Capture();
-
- EditorApplication.delayCall += () => current.enabled = enable;
- }
}
}
\ No newline at end of file
diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs
index 3129c72..883695e 100644
--- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs
+++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffectCapturedImage.cs
@@ -1,4 +1,5 @@
using System.Collections;
+using System.Linq;
using UnityEngine;
using UnityEngine.Serialization;
using UnityEngine.Rendering;
@@ -110,7 +111,7 @@ namespace Coffee.UIExtensions
/// Captured texture.
///
public RenderTexture capturedTexture { get { return m_TargetTexture ? m_TargetTexture : _rt; } }
-
+
///
/// Blur iterations.
///
@@ -185,6 +186,16 @@ namespace Coffee.UIExtensions
///
public void Capture()
{
+ var rootCanvas = canvas.rootCanvas;
+ if (m_KeepCanvasSize)
+ {
+ var rootTransform = rootCanvas.transform as RectTransform;
+ var size = rootTransform.rect.size;
+ rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x);
+ rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y);
+ rectTransform.position = rootTransform.position;
+ }
+
// Camera for command buffer.
_camera = canvas.worldCamera ?? Camera.main;
@@ -224,82 +235,129 @@ namespace Coffee.UIExtensions
_rt.hideFlags = HideFlags.HideAndDontSave;
}
}
+ SetupCommandBuffer();
+ }
- // Create command buffer.
- if (_buffer == null)
+ void SetupCommandBuffer()
+ {
+ if (_buffer != null)
{
- var rtId = new RenderTargetIdentifier(m_TargetTexture ? m_TargetTexture : _rt);
+ return;
+ }
- // Material for effect.
- Material mat = effectMaterial;
+ bool isOverlay = canvas.rootCanvas.renderMode == RenderMode.ScreenSpaceOverlay;
+ int w, h;
+ GetDesamplingSize(m_DesamplingRate, out w, out h);
- _buffer = new CommandBuffer();
- _buffer.name = mat ? mat.name : "noeffect";
- if (_rt)
+ var rtId = new RenderTargetIdentifier(m_TargetTexture ? m_TargetTexture : _rt);
+
+ // Material for effect.
+ Material mat = effectMaterial;
+
+ _buffer = new CommandBuffer();
+ _buffer.name = mat ? mat.name : "noeffect";
+ if (_rt)
+ {
+ _rt.name = _buffer.name;
+ }
+
+ // Copy to temporary RT.
+ _buffer.GetTemporaryRT(s_CopyId, -1, -1, 0, m_FilterMode);
+
+ if (isOverlay)
+ {
+ if (!s_renderedResult)
{
- _rt.name = _buffer.name;
+ s_renderedResult = new Texture2D(Screen.width, Screen.height, TextureFormat.ARGB32, false, false);
+ s_renderedResult.filterMode = FilterMode.Point;
+ }
+ else if (s_renderedResult.width != Screen.width || s_renderedResult.height != Screen.height)
+ {
+ s_renderedResult.Resize(Screen.width, Screen.height, TextureFormat.ARGB32, false);
}
-
- // Copy to temporary RT.
- _buffer.GetTemporaryRT(s_CopyId, -1, -1, 0, m_FilterMode);
+#if UNITY_EDITOR
+ if (!Application.isPlaying)
+ {
+ RenderTexture.active = Resources.FindObjectsOfTypeAll().FirstOrDefault(x=>x.name == "GameView RT");
+ s_renderedResult.ReadPixels(new Rect(0, 0, s_renderedResult.width, s_renderedResult.height), 0, 0);
+ s_renderedResult.Apply(false, false);
+ RenderTexture.active = null;
+ }
+#endif
+
+ _buffer.Blit(new RenderTargetIdentifier(s_renderedResult), s_CopyId);
+ }
+ else
+ {
_buffer.Blit(BuiltinRenderTextureType.CurrentActive, s_CopyId);
-
- // Set properties.
- _buffer.SetGlobalVector(s_EffectFactorId, new Vector4(toneLevel, 0));
- _buffer.SetGlobalVector(s_ColorFactorId, new Vector4(effectColor.r, effectColor.g, effectColor.b, effectColor.a));
-
- // Blit without effect.
- if (!mat)
- {
- _buffer.Blit(s_CopyId, rtId);
- _buffer.ReleaseTemporaryRT(s_CopyId);
- }
- // Blit with effect.
- else
- {
- GetDesamplingSize(m_ReductionRate, out w, out h);
- _buffer.GetTemporaryRT(s_EffectId1, w, h, 0, m_FilterMode);
-
- // Apply base effect (copied screen -> effect1).
- _buffer.Blit(s_CopyId, s_EffectId1, mat, 0);
- _buffer.ReleaseTemporaryRT(s_CopyId);
-
- // Iterate the operation.
- if(m_BlurMode != BlurMode.None)
- {
- _buffer.GetTemporaryRT(s_EffectId2, w, h, 0, m_FilterMode);
- for (int i = 0; i < m_BlurIterations; i++)
- {
- // Apply effect (effect1 -> effect2, or effect2 -> effect1).
- _buffer.SetGlobalVector(s_EffectFactorId, new Vector4(blur, 0));
- _buffer.Blit(s_EffectId1, s_EffectId2, mat, 1);
- _buffer.SetGlobalVector(s_EffectFactorId, new Vector4(0, blur));
- _buffer.Blit(s_EffectId2, s_EffectId1, mat, 1);
- }
- _buffer.ReleaseTemporaryRT(s_EffectId2);
- }
-
- _buffer.Blit(s_EffectId1, rtId);
- _buffer.ReleaseTemporaryRT(s_EffectId1);
- }
}
- // Add command buffer to camera.
- _camera.AddCommandBuffer(kCameraEvent, _buffer);
+ // Set properties.
+ _buffer.SetGlobalVector(s_EffectFactorId, new Vector4(toneLevel, 0));
+ _buffer.SetGlobalVector(s_ColorFactorId, new Vector4(effectColor.r, effectColor.g, effectColor.b, effectColor.a));
- // StartCoroutine by CanvasScaler.
- var rootCanvas = canvas.rootCanvas;
- var scaler = rootCanvas.GetComponent();
- scaler.StartCoroutine(_CoUpdateTextureOnNextFrame());
- if (m_KeepCanvasSize)
+ // Blit without effect.
+ if (!mat)
{
- var rootTransform = rootCanvas.transform as RectTransform;
- var size = rootTransform.rect.size;
- rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x);
- rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y);
- rectTransform.position = rootTransform.position;
+ _buffer.Blit(s_CopyId, rtId);
+ _buffer.ReleaseTemporaryRT(s_CopyId);
}
+ // Blit with effect.
+ else
+ {
+ GetDesamplingSize(m_ReductionRate, out w, out h);
+ _buffer.GetTemporaryRT(s_EffectId1, w, h, 0, m_FilterMode);
+
+ // Apply base effect (copied screen -> effect1).
+ _buffer.Blit(s_CopyId, s_EffectId1, mat, 0);
+ _buffer.ReleaseTemporaryRT(s_CopyId);
+
+ // Iterate the operation.
+ if (m_BlurMode != BlurMode.None)
+ {
+ _buffer.GetTemporaryRT(s_EffectId2, w, h, 0, m_FilterMode);
+ for (int i = 0; i < m_BlurIterations; i++)
+ {
+ // Apply effect (effect1 -> effect2, or effect2 -> effect1).
+ _buffer.SetGlobalVector(s_EffectFactorId, new Vector4(blur, 0));
+ _buffer.Blit(s_EffectId1, s_EffectId2, mat, 1);
+ _buffer.SetGlobalVector(s_EffectFactorId, new Vector4(0, blur));
+ _buffer.Blit(s_EffectId2, s_EffectId1, mat, 1);
+ }
+ _buffer.ReleaseTemporaryRT(s_EffectId2);
+ }
+
+ _buffer.Blit(s_EffectId1, rtId);
+ _buffer.ReleaseTemporaryRT(s_EffectId1);
+ }
+
+#if UNITY_EDITOR
+ // Start rendering for editor mode.
+ if (!Application.isPlaying)
+ {
+ _cameraEvent = CameraEvent.AfterEverything;
+ _camera.AddCommandBuffer(_cameraEvent, _buffer);
+ texture = null;
+ _SetDirty();
+
+ UnityEditor.EditorApplication.delayCall += () =>
+ {
+ _Release(false);
+ texture = capturedTexture;
+ _SetDirty();
+ };
+ return;
+ }
+#endif
+
+ // Start rendering coroutine by CanvasScaler.
+ var scaler = canvas.rootCanvas.GetComponent();
+ scaler.StartCoroutine(
+ isOverlay
+ ? _CoUpdateTextureOnNextFrameOverlay()
+ : _CoUpdateTextureOnNextFrame()
+ );
}
///
@@ -308,6 +366,8 @@ namespace Coffee.UIExtensions
public void Release()
{
_Release(true);
+ texture = null;
+ _SetDirty();
}
#if UNITY_EDITOR
@@ -361,7 +421,7 @@ namespace Coffee.UIExtensions
{
material = null;
m_EffectMaterial = mat;
- UnityEditor.EditorUtility.SetDirty(this);
+ _SetDirty();
}
}
#endif
@@ -371,12 +431,13 @@ namespace Coffee.UIExtensions
//################################
// Private Members.
//################################
- const CameraEvent kCameraEvent = CameraEvent.AfterEverything;
+ CameraEvent _cameraEvent = CameraEvent.AfterEverything;
Camera _camera;
RenderTexture _rt;
RenderTexture _rtToRelease;
CommandBuffer _buffer;
+ public Texture2D s_renderedResult;
static int s_CopyId;
static int s_EffectId1;
static int s_EffectId2;
@@ -392,26 +453,40 @@ namespace Coffee.UIExtensions
if (releaseRT || m_TargetTexture)
{
texture = null;
-
- if (_rt != null)
- {
- _rt.Release();
- _rt = null;
- }
+ _Release(ref _rt);
}
if (_buffer != null)
{
if (_camera != null)
- _camera.RemoveCommandBuffer(kCameraEvent, _buffer);
+ _camera.RemoveCommandBuffer(_cameraEvent, _buffer);
_buffer.Release();
_buffer = null;
}
- if (_rtToRelease)
+ _Release(ref _rtToRelease);
+ }
+
+ [System.Diagnostics.Conditional("UNITY_EDITOR")]
+ void _SetDirty()
+ {
+#if UNITY_EDITOR
+ UnityEditor.EditorUtility.SetDirty(this);
+#endif
+ }
+
+ void _Release(ref RenderTexture obj)
+ {
+ if (obj)
{
- _rtToRelease.Release();
- _rtToRelease = null;
+ obj.Release();
+#if UNITY_EDITOR
+ if(!Application.isPlaying)
+ DestroyImmediate(obj);
+ else
+#endif
+ Destroy(obj);
+ obj = null;
}
}
@@ -420,10 +495,31 @@ namespace Coffee.UIExtensions
///
IEnumerator _CoUpdateTextureOnNextFrame()
{
+ // Add command buffer to camera.
+ _cameraEvent = CameraEvent.AfterEverything;
+ _camera.AddCommandBuffer(_cameraEvent, _buffer);
yield return new WaitForEndOfFrame();
_Release(false);
texture = m_TargetTexture ? m_TargetTexture : _rt;
}
+
+ ///
+ /// Set texture on next frame (for overlay).
+ ///
+ IEnumerator _CoUpdateTextureOnNextFrameOverlay()
+ {
+ // Add command buffer to camera.
+ yield return new WaitForEndOfFrame();
+ s_renderedResult.ReadPixels(new Rect(0, 0, s_renderedResult.width, s_renderedResult.height), 0, 0);
+ s_renderedResult.Apply(false, false);
+
+ _cameraEvent = CameraEvent.BeforeForwardOpaque;
+ _camera.AddCommandBuffer(_cameraEvent, _buffer);
+ texture = m_TargetTexture ? m_TargetTexture : _rt;
+
+ yield return new WaitForEndOfFrame();
+ _Release(false);
+ }
}
}
\ No newline at end of file