diff --git a/Assets/UIEffect/Editor/UIEffectCapturedImageEditor.cs b/Assets/UIEffect/Editor/UIEffectCapturedImageEditor.cs index d8d5a98..eb40e5b 100644 --- a/Assets/UIEffect/Editor/UIEffectCapturedImageEditor.cs +++ b/Assets/UIEffect/Editor/UIEffectCapturedImageEditor.cs @@ -34,10 +34,15 @@ namespace Coffee.UIExtensions protected override void OnEnable() { base.OnEnable(); + _spTexture = serializedObject.FindProperty("m_Texture"); + _spColor = serializedObject.FindProperty("m_Color"); + _spRaycastTarget = serializedObject.FindProperty("m_RaycastTarget"); _spDesamplingRate = serializedObject.FindProperty("m_DesamplingRate"); _spReductionRate = serializedObject.FindProperty("m_ReductionRate"); _spFilterMode = serializedObject.FindProperty("m_FilterMode"); _spIterations = serializedObject.FindProperty("m_Iterations"); + _spKeepSizeToRootCanvas = serializedObject.FindProperty("m_KeepCanvasSize"); + _customAdvancedOption = (qualityMode == QualityMode.Custom); } @@ -52,9 +57,9 @@ namespace Coffee.UIExtensions //================ // Basic properties. //================ - EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Texture")); - EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Color")); - EditorGUILayout.PropertyField(serializedObject.FindProperty("m_RaycastTarget")); + EditorGUILayout.PropertyField(_spTexture); + EditorGUILayout.PropertyField(_spColor); + EditorGUILayout.PropertyField(_spRaycastTarget); //================ // Capture effect. @@ -86,6 +91,7 @@ namespace Coffee.UIExtensions EditorGUILayout.PropertyField(_spFilterMode);// Filter Mode. EditorGUILayout.PropertyField(_spIterations);// Iterations. } + EditorGUILayout.PropertyField(_spKeepSizeToRootCanvas);// Iterations. serializedObject.ApplyModifiedProperties(); @@ -110,10 +116,14 @@ namespace Coffee.UIExtensions const int Bits4 = (1 << 4) - 1; const int Bits2 = (1 << 2) - 1; bool _customAdvancedOption = false; + SerializedProperty _spTexture; + SerializedProperty _spColor; + SerializedProperty _spRaycastTarget; SerializedProperty _spDesamplingRate; SerializedProperty _spReductionRate; SerializedProperty _spFilterMode; SerializedProperty _spIterations; + SerializedProperty _spKeepSizeToRootCanvas; QualityMode qualityMode { diff --git a/Assets/UIEffect/UIEffectCapturedImage.cs b/Assets/UIEffect/UIEffectCapturedImage.cs index eae815f..d20425c 100644 --- a/Assets/UIEffect/UIEffectCapturedImage.cs +++ b/Assets/UIEffect/UIEffectCapturedImage.cs @@ -54,6 +54,7 @@ namespace Coffee.UIExtensions [SerializeField] FilterMode m_FilterMode = FilterMode.Bilinear; [SerializeField] Material m_EffectMaterial; [SerializeField][Range(1, 8)] int m_Iterations = 1; + [SerializeField] bool m_KeepCanvasSize = true; //################################ @@ -119,6 +120,11 @@ namespace Coffee.UIExtensions /// public int iterations { get { return m_Iterations; } set { m_Iterations = value; } } + /// + /// Fits graphic size to the root canvas. + /// + public bool keepCanvasSize { get { return m_KeepCanvasSize; } set { m_KeepCanvasSize = value; } } + /// /// This function is called when the MonoBehaviour will be destroyed. /// @@ -276,11 +282,15 @@ namespace Coffee.UIExtensions _camera.AddCommandBuffer(kCameraEvent, _buffer); // StartCoroutine by CanvasScaler. -#if UNITY_5_4_OR_NEWER - canvas.rootCanvas.GetComponent().StartCoroutine(_CoUpdateTextureOnNextFrame()); -#else - canvas.GetComponentInParent().StartCoroutine(_CoUpdateTextureOnNextFrame()); -#endif + var rootCanvas = canvas.rootCanvas; + var scaler = rootCanvas.GetComponent(); + scaler.StartCoroutine(_CoUpdateTextureOnNextFrame()); + if (m_KeepCanvasSize) + { + var size = (rootCanvas.transform as RectTransform).rect.size; + rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); + rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y); + } } ///