Update ReadMe, Version and some housekeeping

--HG--
branch : develop_4.6

README.md

@@ -3,8 +3,6 @@
 This is an extension project for the new Unity UI system which can be found at:
 [Unity UI Source](https://bitbucket.org/Unity-Technologies/ui)
 
-#Updated for 5.2 - new asset package#
-
 ##Intro##
 For more info, here's a little introduction video for the project:
 
@@ -17,7 +15,6 @@ In this repository is a collection of extension scripts to enhance your Unity UI
 You can either download / fork the project to access the scripts, or you can download this precompiled Unity Asset, chock full of goodness
 ### [Unity UI Extensions Unity 4.x Asset](https://bitbucket.org/ddreaper/unity-ui-extensions/downloads/UnityUIExtensions-4.x.unitypackage)###
 ### [Unity UI Extensions Unity 5.1 Asset](https://bitbucket.org/ddreaper/unity-ui-extensions/downloads/UnityUIExtensions-5.1.unitypackage)###
-### [Unity UI Extensions Unity 5.2 Asset](https://bitbucket.org/ddreaper/unity-ui-extensions/downloads/UnityUIExtensions-5.2.unitypackage)###
 
 ##Getting Started##
 To get started with the project, here's a little guide:
@@ -27,6 +24,9 @@ To get started with the project, here's a little guide:
 ## Updates: ##
 Update 1.0.0.4
 [![View Getting Started Video](http://img.youtube.com/vi/oF48Qpaq3ls/0.jpg)](http://www.youtube.com/watch?v=oF48Qpaq3ls "Update 1.0.0.4 for the Unity UI Extensions Project")
+
+Update 1.0.0.6
+New set of controls including some shader ennhanced solutions
 ---
 ## Controls and extensions listed in this project are: ##
 
@@ -87,6 +87,8 @@ Effect   | Description | Component Command | Notes  | Credits
 **NicerOutline** | Another outline control | UI / Effects / Extensions / Nicer Outline | | Melang
 **RaycastMask** | An example of an enhanced mask component able to work with the image data. Enables picking on image parts and not just the Rect Transform | UI / Effects / Extensions / Raycast Mask | | senritsu
 **UIFlippable** | Image component effect to flip the graphic | UI / Effects / Extensions / UI Flippable | | ChoMPHi
+**UIImageCrop** | Shader based mask system which clips to specific ranges X&Y | UI / Effects / Extensions / UI Image Crop | | 00christian00
+**SoftAlphaMask** | Shader based mask able to clip images using an alpha mask | UI / Effects / Extensions / Soft Mask Script | | NemoKrad
 
 
 ## VR Components##

Scripts/Effects/SoftMaskScript.cs

@@ -1,164 +1,164 @@
-using UnityEngine;
+/// Credit NemoKrad (aka Charles Humphrey)
-using UnityEngine.UI;
+/// Sourced from - http://www.randomchaos.co.uk/SoftAlphaUIMask.aspx
 
-using System.Collections;
+namespace UnityEngine.UI.Extensions
-
-[ExecuteInEditMode]
-[AddComponentMenu("UI/Effects/Extensions/SoftMaskScript")]
-public class SoftMaskScript : MonoBehaviour
 {
-    Material mat;
+    [ExecuteInEditMode]
-    Canvas canvas;
+    [AddComponentMenu("UI/Effects/Extensions/SoftMaskScript")]
-
+    public class SoftMaskScript : MonoBehaviour
-    [Tooltip("The area that is to be used as the container.")]
-    public RectTransform MaskArea;
-    RectTransform myRect;
-
-    [Tooltip("Texture to be used to do the soft alpha")]
-    public Texture AlphaMask;
-
-    [Tooltip("At what point to apply the alpha min range 0-1")]
-    [Range(0, 1)]
-    public float CutOff = 0;
-
-    [Tooltip("Implement a hard blend based on the Cutoff")]
-    public bool HardBlend = false;
-
-    Vector3[] worldCorners;
-
-    Vector2 AlphaUV;
-
-    Vector2 min;
-    Vector2 max = Vector2.one;
-    Vector2 p;
-    Vector2 siz;
-
-    Rect maskRect;
-    Rect contentRect;
-
-    Vector2 centre;
-
-    bool isText = false;
-
-    // Use this for initialization
-    void Start()
     {
-        myRect = GetComponent<RectTransform>();
+        Material mat;
+        Canvas canvas;
 
-        if (!MaskArea)
+        [Tooltip("The area that is to be used as the container.")]
+        public RectTransform MaskArea;
+        RectTransform myRect;
+
+        [Tooltip("Texture to be used to do the soft alpha")]
+        public Texture AlphaMask;
+
+        [Tooltip("At what point to apply the alpha min range 0-1")]
+        [Range(0, 1)]
+        public float CutOff = 0;
+
+        [Tooltip("Implement a hard blend based on the Cutoff")]
+        public bool HardBlend = false;
+
+        Vector3[] worldCorners;
+
+        Vector2 AlphaUV;
+
+        Vector2 min;
+        Vector2 max = Vector2.one;
+        Vector2 p;
+        Vector2 siz;
+
+        Rect maskRect;
+        Rect contentRect;
+
+        Vector2 centre;
+
+        bool isText = false;
+
+        // Use this for initialization
+        void Start()
         {
-            MaskArea = myRect;
+            myRect = GetComponent<RectTransform>();
-        }
 
-        if (GetComponent<Graphic>() != null)
+            if (!MaskArea)
-        {
-            mat = new Material(Shader.Find("UI Extensions/SoftMaskShader"));
-            GetComponent<Graphic>().material = mat;
-        }
-
-        if (GetComponent<Text>())
-        {
-            isText = true;
-            mat = new Material(Shader.Find("UI Extensions/SoftMaskShaderText"));
-            GetComponent<Text>().material = mat;
-
-            GetCanvas();
-
-            // For some reason, having the mask control on the parent and disabled stops the mouse interacting
-            // with the texture layer that is not visible.. Not needed for the Image.
-            if (transform.parent.GetComponent<Mask>() == null)
-                transform.parent.gameObject.AddComponent<Mask>();
-
-            transform.parent.GetComponent<Mask>().enabled = false;
-        }
-    }
-
-    void GetCanvas()
-    {
-        Transform t = transform;
-
-        int lvlLimit = 100;
-        int lvl = 0;
-
-        while (canvas == null && lvl < lvlLimit)
-        {
-            canvas = t.gameObject.GetComponent<Canvas>();
-            if (canvas == null)
-                t = GetParentTranform(t);
-
-            lvl++;
-        }
-    }
-
-    Transform GetParentTranform(Transform t)
-    {
-        return t.parent;
-    }
-
-    void Update()
-    {
-        SetMask();
-    }
-    
-    void SetMask()
-    {
-        // Get the two rectangle areas
-        maskRect = MaskArea.rect;
-        contentRect = myRect.rect;
-
-        if (isText) // Need to do our calculations in world for Text
-        {
-            if (canvas.renderMode == RenderMode.ScreenSpaceOverlay && Application.isPlaying)
             {
-                p = canvas.transform.InverseTransformPoint(MaskArea.transform.position);
+                MaskArea = myRect;
-                siz = new Vector2(maskRect.width, maskRect.height);
-            }
-            else
-            {
-                worldCorners = new Vector3[4];
-                MaskArea.GetWorldCorners(worldCorners);
-                siz = (worldCorners[2] - worldCorners[0]);
-                p = MaskArea.transform.position;
             }
 
-            min = p - (new Vector2(siz.x, siz.y) * .5f);
+            if (GetComponent<Graphic>() != null)
-            max = p + (new Vector2(siz.x, siz.y) * .5f);
+            {
+                mat = new Material(Shader.Find("UI Extensions/SoftMaskShader"));
+                GetComponent<Graphic>().material = mat;
+            }
+
+            if (GetComponent<Text>())
+            {
+                isText = true;
+                mat = new Material(Shader.Find("UI Extensions/SoftMaskShaderText"));
+                GetComponent<Text>().material = mat;
+
+                GetCanvas();
+
+                // For some reason, having the mask control on the parent and disabled stops the mouse interacting
+                // with the texture layer that is not visible.. Not needed for the Image.
+                if (transform.parent.GetComponent<Mask>() == null)
+                    transform.parent.gameObject.AddComponent<Mask>();
+
+                transform.parent.GetComponent<Mask>().enabled = false;
+            }
         }
-        else // Need to do our calculations in tex space for Image.
+
+        void GetCanvas()
         {
-            // Get the centre offset
+            Transform t = transform;
-            centre = myRect.transform.InverseTransformPoint(MaskArea.transform.position);
 
-            // Set the scale for mapping texcoords mask
+            int lvlLimit = 100;
-            AlphaUV = new Vector2(maskRect.width / contentRect.width, maskRect.height / contentRect.height);
+            int lvl = 0;
 
-            // set my min and max to the centre offest
+            while (canvas == null && lvl < lvlLimit)
-            min = centre;
+            {
-            max = min;
+                canvas = t.gameObject.GetComponent<Canvas>();
-
+                if (canvas == null)
-            siz = new Vector2(maskRect.width, maskRect.height) * .5f;
+                    t = GetParentTranform(t);
-            // Move them out to the min max extreams
-            min -= siz;
-            max += siz;
-
-            // Now move these into texture space. 0 - 1
-            min = new Vector2(min.x / contentRect.width, min.y / contentRect.height) + new Vector2(.5f, .5f);
-            max = new Vector2(max.x / contentRect.width, max.y / contentRect.height) + new Vector2(.5f, .5f);
 
+                lvl++;
+            }
         }
 
-        mat.SetFloat("_HardBlend", HardBlend ? 1 : 0);
+        Transform GetParentTranform(Transform t)
+        {
+            return t.parent;
+        }
 
-        // Pass the values to the shader
+        void Update()
-        mat.SetVector("_Min", min);
+        {
-        mat.SetVector("_Max", max);
+            SetMask();
+        }
 
-        mat.SetTexture("_AlphaMask", AlphaMask);
+        void SetMask()
+        {
+            // Get the two rectangle areas
+            maskRect = MaskArea.rect;
+            contentRect = myRect.rect;
 
-        if (!isText) // No mod needed for Text
+            if (isText) // Need to do our calculations in world for Text
-            mat.SetVector("_AlphaUV", AlphaUV);
+            {
+                if (canvas.renderMode == RenderMode.ScreenSpaceOverlay && Application.isPlaying)
+                {
+                    p = canvas.transform.InverseTransformPoint(MaskArea.transform.position);
+                    siz = new Vector2(maskRect.width, maskRect.height);
+                }
+                else
+                {
+                    worldCorners = new Vector3[4];
+                    MaskArea.GetWorldCorners(worldCorners);
+                    siz = (worldCorners[2] - worldCorners[0]);
+                    p = MaskArea.transform.position;
+                }
 
-        mat.SetFloat("_CutOff", CutOff);
+                min = p - (new Vector2(siz.x, siz.y) * .5f);
+                max = p + (new Vector2(siz.x, siz.y) * .5f);
+            }
+            else // Need to do our calculations in tex space for Image.
+            {
+                // Get the centre offset
+                centre = myRect.transform.InverseTransformPoint(MaskArea.transform.position);
+
+                // Set the scale for mapping texcoords mask
+                AlphaUV = new Vector2(maskRect.width / contentRect.width, maskRect.height / contentRect.height);
+
+                // set my min and max to the centre offest
+                min = centre;
+                max = min;
+
+                siz = new Vector2(maskRect.width, maskRect.height) * .5f;
+                // Move them out to the min max extreams
+                min -= siz;
+                max += siz;
+
+                // Now move these into texture space. 0 - 1
+                min = new Vector2(min.x / contentRect.width, min.y / contentRect.height) + new Vector2(.5f, .5f);
+                max = new Vector2(max.x / contentRect.width, max.y / contentRect.height) + new Vector2(.5f, .5f);
+
+            }
+
+            mat.SetFloat("_HardBlend", HardBlend ? 1 : 0);
+
+            // Pass the values to the shader
+            mat.SetVector("_Min", min);
+            mat.SetVector("_Max", max);
+
+            mat.SetTexture("_AlphaMask", AlphaMask);
+
+            if (!isText) // No mod needed for Text
+                mat.SetVector("_AlphaUV", AlphaUV);
+
+            mat.SetFloat("_CutOff", CutOff);
+        }
     }
-
 }

package.json

@@ -1,11 +1,11 @@
 {
   "name": "Unity UI Extensions",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "An extension project for the Unity3D UI system, all crafted and contributed by the awesome Unity community",
   "author": "Simon darkside Jackson <@SimonDarksideJ>",
   "contributors": [{
-  "name": "Foo Bar",
+  "name": "SimonDarksideJ",
-  "email": "foo.bar@example.com"
+  "twitter": "@SimonDarksideJ"
 }],
   "repository": {
   "type": "hg",
@@ -15,9 +15,10 @@
   "url": "https://bitbucket.org/ddreaper/unity-ui-extensions/issues"
 },
   "keywords": [
-  "nodejitsu",
+  "Unity3D",
-  "example",
+  "Unity",
-  "browsenpm"
+  "Unity UI",
+  "UI Extensions"
 ], 
   "license": "BSD"
 }