Unity 2018 patchfix

README.md

@@ -57,6 +57,7 @@ All funds go to support the project, no matter the amount. **Donations in code a
 -----
 
 ## [Getting Started](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/GettingStarted)
+
 To get started with the project, here's a little guide:
 
 [![View Getting Started Video](http://img.youtube.com/vi/sVLeYmsNQAI/0.jpg)](http://www.youtube.com/watch?v=sVLeYmsNQAI "Unity UI getting started video")
@@ -183,11 +184,6 @@ NicerOutline|RaycastMask|UIFlippable|UIImageCrop|SoftAlphaMask
 CylinderText|UIParticleSystem|CurlyUI|Shine Effect|Shader Effects
 ||||
 
-[VR Components](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-vr_components)|||||
-------|------|------|------|
-VRCursor|VRInputModule|||
-||||
-
 [Additional Components](https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/wiki/Controls#markdown-header-additional_components)|||||
 ------|------|------|------|
 ReturnKeyTrigger|TabNavigation|uGUITools|ScrollRectTweener|ScrollRectLinker

Runtime/Scripts/Effects/UIParticleSystem.cs

@@ -223,7 +223,11 @@ namespace UnityEngine.UI.Extensions
                             frame = Mathf.FloorToInt(frameProgress * textureSheetAnimation.numTilesX);
 
                             int row = textureSheetAnimation.rowIndex;
+#if UNITY_2019_OR_NEWER
                             if (textureSheetAnimation.rowMode == ParticleSystemAnimationRowMode.Random)
+#else
+                            if (textureSheetAnimation.useRandomRow)
+#endif
                             { // FIXME - is this handled internally by rowIndex?
                                 row = Mathf.Abs((int)particle.randomSeed % textureSheetAnimation.numTilesY);
                             }
@@ -403,4 +407,4 @@ namespace UnityEngine.UI.Extensions
         }
     }
 #endif
-}
+                    }

Runtime/Scripts/VR Extensions.meta

@@ -1,5 +0,0 @@
-fileFormatVersion: 2
-guid: c84a253080bc0ec4995041aa5a6656ae
-folderAsset: yes
-DefaultImporter:
-  userData: 

Runtime/Scripts/VR Extensions/VRCursor.cs

@@ -1,48 +0,0 @@
-/// Credit Ralph Barbagallo (www.flarb.com /www.ralphbarbagallo.com / @flarb)
-/// Sourced from - http://forum.unity3d.com/threads/vr-cursor-possible-unity-4-6-gui-bug-or-is-it-me
-
-namespace UnityEngine.UI.Extensions
-{
-    [AddComponentMenu("UI/Extensions/VR Cursor")]
-    public class VRCursor : MonoBehaviour
-    {
-        public float xSens;
-        public float ySens;
-
-        private Collider currentCollider;
-
-        // Update is called once per frame
-        void Update()
-        {
-            Vector3 thisPosition;
-
-            thisPosition.x = UIExtensionsInputManager.MousePosition.x * xSens;
-            thisPosition.y = UIExtensionsInputManager.MousePosition.y * ySens - 1;
-            thisPosition.z = transform.position.z;
-
-            transform.position = thisPosition;
-
-            VRInputModule.cursorPosition = transform.position;
-
-            if (UIExtensionsInputManager.GetMouseButtonDown(0) && currentCollider)
-            {
-                VRInputModule.PointerSubmit(currentCollider.gameObject);
-            }
-
-        }
-
-        void OnTriggerEnter(Collider other)
-        {
-            //print("OnTriggerEnter other " + other.gameObject);
-            VRInputModule.PointerEnter(other.gameObject);
-            currentCollider = other;
-        }
-
-        void OnTriggerExit(Collider other)
-        {
-            //print("OnTriggerExit other " + other.gameObject);
-            VRInputModule.PointerExit(other.gameObject);
-            currentCollider = null;
-        }
-    }
-}

Runtime/Scripts/VR Extensions/VRCursor.cs.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3d7a94ee2faf9f04696882b3a2cbf035
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 

Runtime/Scripts/VR Extensions/VRInputModule.cs

@@ -1,69 +0,0 @@
-/// Credit Ralph Barbagallo (www.flarb.com /www.ralphbarbagallo.com / @flarb)
-/// Sourced from - http://forum.unity3d.com/threads/vr-cursor-possible-unity-4-6-gui-bug-or-is-it-me
-/// Fix supplied by - http://forum.unity3d.com/threads/vr-cursor-possible-unity-4-6-gui-bug-or-is-it-me.296934/
-
-using UnityEngine.EventSystems;
-namespace UnityEngine.UI.Extensions
-{
-    [AddComponentMenu("Event/VR Input Module")]
-    public class VRInputModule : BaseInputModule
-    {
-        public static GameObject targetObject;
-
-        static VRInputModule _singleton;
-
-        private static bool mouseClicked;
-        public static Vector3 cursorPosition;
-
-        protected override void Awake()
-        {
-            _singleton = this;
-        }
-
-        public override void Process()
-        {
-            if (targetObject == null)
-            {
-                mouseClicked = false;
-                return;
-            }
-        }
-
-        public static void PointerSubmit(GameObject obj)
-        {
-            targetObject = obj;
-            mouseClicked = true;
-            if (mouseClicked)
-            {
-                //BaseEventData data = GetBaseEventData(); //Original from Process().  Can't be called here so is replaced by the next line:
-                BaseEventData data = new BaseEventData(_singleton.eventSystem)
-                {
-                    selectedObject = targetObject
-                };
-                ExecuteEvents.Execute(targetObject, data, ExecuteEvents.submitHandler);
-                print("clicked " + targetObject.name);
-                mouseClicked = false;
-            }
-        }
-
-        public static void PointerExit(GameObject obj)
-        {
-            print("PointerExit " + obj.name);
-            PointerEventData pEvent = new PointerEventData(_singleton.eventSystem);
-            ExecuteEvents.Execute(obj, pEvent, ExecuteEvents.pointerExitHandler);
-            ExecuteEvents.Execute(obj, pEvent, ExecuteEvents.deselectHandler); //This fixes the problem
-        }
-
-        public static void PointerEnter(GameObject obj)
-        {
-            print("PointerEnter " + obj.name);
-            PointerEventData pEvent = new PointerEventData(_singleton.eventSystem)
-            {
-                pointerEnter = obj
-            };
-            RaycastResult rcr = new RaycastResult() { worldPosition = cursorPosition };
-            pEvent.pointerCurrentRaycast = rcr;
-            ExecuteEvents.Execute(obj, pEvent, ExecuteEvents.pointerEnterHandler);
-        }
-    }
-}

Runtime/Scripts/VR Extensions/VRInputModule.cs.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 303ab8dad3437bf46814373cfb86cc5d
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: