(#167) Remove Unity 2019 errors for Leap V2 Core Assets

Assets/LeapMotion/DemoResources/Scripts/RecordingControls.cs

@@ -1,11 +1,11 @@
 using UnityEngine;
-using System.Collections;
+using UnityEngine.UI;
 
 public class RecordingControls : MonoBehaviour {
   [Multiline]
   public string header;
-  public GUIText controlsGui;
-  public GUIText recordingGui;
+  public Text controlsGui;
+  public Text recordingGui;
 
   public KeyCode beginRecordingKey = KeyCode.R;
   public KeyCode endRecordingKey = KeyCode.R;

Assets/LeapMotion/Materials/Sources/Shaders/Toony-Basic.shader

@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Toon/Basic" {
 	Properties {
 		_Color ("Main Color", Color) = (.5,.5,.5,1)
@@ -39,7 +41,7 @@ Shader "Toon/Basic" {
 			v2f vert (appdata v)
 			{
 				v2f o;
-				o.pos = mul (UNITY_MATRIX_MVP, v.vertex);
+				o.pos = UnityObjectToClipPos (v.vertex);
 				o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
 				o.cubenormal = mul (UNITY_MATRIX_MV, float4(v.normal,0));
 				return o;

Assets/LeapMotion/Materials/Sources/Shaders/Toony-BasicOutline.shader

@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "Toon/Basic Outline" {
 	Properties {
 		_Color ("Main Color", Color) = (.5,.5,.5,1)
@@ -25,7 +27,7 @@ Shader "Toon/Basic Outline" {
 
 	v2f vert(appdata v) {
 		v2f o;
-		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
+		o.pos = UnityObjectToClipPos(v.vertex);
 
 		float3 norm   = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal);
 		float2 offset = TransformViewToProjection(norm.xy);

Assets/LeapMotion/Resources/ImageHandHighlight.shader

@@ -1,3 +1,5 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
 Shader "LeapMotion/Passthrough/ImageHandHighlight" {
   Properties {
     _Color           ("Color", Color)                  = (0.165,0.337,0.578,1.0)
@@ -50,7 +52,7 @@ Shader "LeapMotion/Passthrough/ImageHandHighlight" {
 
   frag_in vert(appdata v) {
     frag_in o;
-    o.vertex = mul(UNITY_MATRIX_MVP, v.vertex);
+    o.vertex = UnityObjectToClipPos(v.vertex);
 
     float3 norm   = mul ((float3x3)UNITY_MATRIX_IT_MV, v.normal);
     o.vertex.xy += TransformViewToProjection(norm.xy) * _Extrude;

Assets/LeapMotion/Resources/PassthroughBackground.shader

@@ -1,4 +1,6 @@
-Shader "LeapMotion/Passthrough/Background" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "LeapMotion/Passthrough/Background" {
   SubShader {
     Tags {"Queue"="Background" "IgnoreProjector"="True"}
 
@@ -26,7 +28,7 @@
 
     frag_in vert(appdata_img v){
       frag_in o;
-      o.position = mul(UNITY_MATRIX_MVP, v.vertex);
+      o.position = UnityObjectToClipPos(v.vertex);
       o.screenPos = LeapGetWarpedScreenPos(o.position);
       return o;
     }

Assets/LeapMotion/Resources/PassthroughForeground.shader

@@ -1,4 +1,6 @@
-Shader "LeapMotion/Passthrough/Foreground" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "LeapMotion/Passthrough/Foreground" {
   Properties {
   }
 
@@ -29,7 +31,7 @@
 
     frag_in vert(appdata_img v){
       frag_in o;
-      o.position = mul(UNITY_MATRIX_MVP, v.vertex);
+      o.position = UnityObjectToClipPos(v.vertex);
       o.screenPos = LeapGetWarpedScreenPos(o.position);
       return o;
     }

Assets/LeapMotion/Resources/ThresholdOverlay.shader

@@ -1,4 +1,6 @@
-Shader "LeapMotion/Passthrough/ThresholdOverlay" {
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "LeapMotion/Passthrough/ThresholdOverlay" {
   Properties {
     _Min ("Min Brightness", Range(0, 1)) = 0.1
     _Max ("Max Brightness", Range(0, 1)) = 0.3
@@ -34,7 +36,7 @@
 
     frag_in vert(appdata_img v){
       frag_in o;
-      o.position = mul(UNITY_MATRIX_MVP, v.vertex);
+      o.position = UnityObjectToClipPos(v.vertex);
       o.screenPos = LeapGetWarpedScreenPos(o.position);
       return o;
     }

Assets/LeapMotion/Scripts/Utils/DisconnectionNotice.cs

@@ -5,12 +5,11 @@
 \******************************************************************************/
 
 using UnityEngine;
-using System.Collections;
 using Leap;
 
 /**
  * Tracks the connection state of the Leap Motion hardware. If the device is unplugged
- * or otherwise not detected, the script fades in a GUITexture object which should communicate
+ * or otherwise not detected, the script fades in an Image which should communicate
  * the problem to the user.
  */
 public class DisconnectionNotice : MonoBehaviour {
@@ -23,8 +22,13 @@ public class DisconnectionNotice : MonoBehaviour {
   public AnimationCurve fade;
   /** A delay before beginning the fade-in effect. */
   public int waitFrames = 10;
+
+  /** An alternative image to use when the hardware is embedded in a keyboard or laptop. */
+  public UnityEngine.UI.Image mainImage;
+
   /** An alternative image to use when the hardware is embedded in a keyboard or laptop. */
-  public Texture2D embeddedReplacementImage;
+  public Sprite embeddedReplacementImage;
+
   /** The fully on texture tint color. */
   public Color onColor = Color.white;
 
@@ -38,7 +42,7 @@ void Start() {
   }
 
   void SetAlpha(float alpha) {
-    GetComponent<GUITexture>().color = Color.Lerp(Color.clear, onColor, alpha);
+    mainImage.color = Color.Lerp(Color.clear, onColor, alpha);
   }
 
   /** The connection state of the controller. */
@@ -56,7 +60,7 @@ bool IsEmbedded() {
 
   void Update() {
     if (embeddedReplacementImage != null && IsEmbedded()) {
-      GetComponent<GUITexture>().texture = embeddedReplacementImage;
+      mainImage.sprite = embeddedReplacementImage;
     }
 
     if (IsConnected())

Assets/LeapMotion/Scripts/Utils/FitHeightToScreen.cs

@@ -5,15 +5,14 @@
 \******************************************************************************/
 
 using UnityEngine;
-using System.Collections;
 
 public class FitHeightToScreen : MonoBehaviour {
 
   void Awake() {
-    float width_height_ratio = GetComponent<GUITexture>().texture.width / GetComponent<GUITexture>().texture.height;
+    float width_height_ratio = GetComponent<Sprite>().rect.width / GetComponent<Sprite>().rect.width;
     float width = width_height_ratio * Screen.height;
     float x_offset = (Screen.width - width) / 2.0f;
-    GetComponent<GUITexture>().pixelInset = new Rect(x_offset, 0.0f, width, Screen.height);
+    GetComponent<UnityEngine.UI.Image>().SetClipRect(new Rect(x_offset, 0.0f, width, Screen.height), true);
   }
 }
 

Assets/LeapMotion/Scripts/Utils/StretchToScreen.cs

@@ -5,12 +5,10 @@
 \******************************************************************************/
 
 using UnityEngine;
-using System.Collections;
 
 public class StretchToScreen : MonoBehaviour {
 
   void Awake() {
-    GetComponent<GUITexture>().pixelInset = new Rect(0.0f, 0.0f, Screen.width, Screen.height);
+    GetComponent<UnityEngine.UI.Image>().SetClipRect(new Rect(0.0f, 0.0f, Screen.width, Screen.height), true);
   }
-}
-
+}