Merge pull request #33 from JeroMiya/Unity5Compatibility

rpavlik · rpavlik · commit 7989d0ed6e45 · 2015-03-24T15:05:33.000-07:00
Updates for improved Unity 5 compatibility.
diff --git a/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scripts/Objects/ColorChanger.cs b/OSVR-Unity/Assets/OSVRUnity/Sample/Demo/Scripts/Objects/ColorChanger.cs
@@ -42,7 +42,7 @@ public class ColorChanger : MonoBehaviour, IColorChanger
 	#region Init
 	void Awake()
 	{
-		_material = renderer.materials[materialID];
+		_material = GetComponent<Renderer>().materials[materialID];
 	}
 	#endregion
 
diff --git a/OSVR-Unity/Assets/OSVRUnity/src/OsvrPostEffectsBase.cs b/OSVR-Unity/Assets/OSVRUnity/src/OsvrPostEffectsBase.cs
@@ -112,9 +112,10 @@ protected bool CheckSupport (bool needDepth) {
 			return false;
 		}
 		
-		if(needDepth)
-			camera.depthTextureMode |= DepthTextureMode.Depth;	
-		
+		if (needDepth) {
+			GetComponent<Camera>().depthTextureMode |= DepthTextureMode.Depth;	
+		}
+
 		return true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class ColorChanger : MonoBehaviour, IColorChanger`
`42`	`42`	`#region Init`
`43`	`43`	`void Awake()`
`44`	`44`	`{`
`45`		`- _material = renderer.materials[materialID];`
	`45`	`+ _material = GetComponent<Renderer>().materials[materialID];`
`46`	`46`	`}`
`47`	`47`	`#endregion`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,10 @@ protected bool CheckSupport (bool needDepth) {`
`112`	`112`	`return false;`
`113`	`113`	`}`
`114`	`114`
`115`		`- if(needDepth)`
`116`		`- camera.depthTextureMode \|= DepthTextureMode.Depth;`
`117`		`-`
	`115`	`+ if (needDepth) {`
	`116`	`+ GetComponent<Camera>().depthTextureMode \|= DepthTextureMode.Depth;`
	`117`	`+ }`
	`118`	`+`
`118`	`119`	`return true;`
`119`	`120`	`}`
`120`	`121`