Merge pull request #70 from OSVR/shader-cleanup

Shader cleanup

Author: DuFF14

OSVR-Unity/Assets/OSVRUnity/Prefabs/VRDisplayTracked.prefab

@@ -47,7 +47,6 @@ GameObject:
   - 114: {fileID: 11431734}
   - 114: {fileID: 11431736}
   - 114: {fileID: 11400556}
-  - 114: {fileID: 11417594}
   m_Layer: 0
   m_Name: VRDisplayTracked
   m_TagString: Untagged
@@ -207,25 +206,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  JsonDescriptorFile: {fileID: 4900000, guid: 903a53a7997a82c42b329c472b623a4e, type: 3}
---- !u!114 &11417594
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 131736}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: db80e57e78593b64384f21c9a3022b68, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  k1Red: 0
-  k1Green: 0
-  k1Blue: 0
-  fullCenter: {x: .5, y: .5}
-  leftCenter: {x: .5, y: .5}
-  rightCenter: {x: .5, y: .5}
-  distortionShader: {fileID: 4800000, guid: 1dffc394b375bda49bb119de26c0bb35, type: 3}
 --- !u!114 &11431730
 MonoBehaviour:
   m_ObjectHideFlags: 1

OSVR-Unity/Assets/OSVRUnity/Prefabs/VRDisplayUntracked.prefab

@@ -11,6 +11,7 @@ GameObject:
   - 20: {fileID: 2000000}
   - 81: {fileID: 8100000}
   - 114: {fileID: 11400000}
+  - 114: {fileID: 11452958}
   m_Layer: 0
   m_Name: VRDisplayUntracked
   m_TagString: Untagged
@@ -167,6 +168,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   eye: 1
   cachedTransform: {fileID: 0}
+--- !u!114 &11452958
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 100000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a288e4aec9950634b83d232abc73d1bb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &100100000
 Prefab:
   m_ObjectHideFlags: 1

OSVR-Unity/Assets/OSVRUnity/Shaders.meta …VR-Unity/Assets/OSVRUnity/Resources.metaOSVR-Unity/Assets/OSVRUnity/Shaders.meta renamed to OSVR-Unity/Assets/OSVRUnity/Resources.meta OSVR-Unity/Assets/OSVRUnity/Shaders.meta renamed to OSVR-Unity/Assets/OSVRUnity/Resources.meta

@@ -9,7 +9,7 @@
 /// you may not use this file except in compliance with the License.
 /// You may obtain a copy of the License at
 ///
-///     http://www.apache.org/licenses/LICENSE-2.0
+///		 http://www.apache.org/licenses/LICENSE-2.0
 ///
 /// Unless required by applicable law or agreed to in writing, software
 /// distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,66 +18,63 @@
 /// limitations under the License.
 /// </copyright>
 /// <summary>
-/// Based on Unity's (Pro Only) Image Effect: Fisheye.shader
+/// Long ago, based on Unity's (Pro Only) Image Effect: Fisheye.shader
 /// Author: Greg Aring
 /// Email: greg@sensics.com
 /// </summary>
+
+/// Syntax reference: see http://docs.unity3d.com/Manual/SL-Shader.html
+
 Shader "Osvr/OsvrDistortion" {
 Properties
 {
-    _K1_Red ("K1 Red", Range (0.00,1.00)) = 0.5 // sliders
-    _K1_Green ("Reflection distort", Range (0.00,1.00)) = 0.5
-	_K1_Blue ("Reflection distort", Range (0.00,1.00)) = 0.5
-	_Full_Center ("FullCenter", Vector) = (.5,.5,0,0)
-	_Left_Center ("LeftCenter", Vector) = (.5,.5,0,0)
-	_Right_Center ("RightCenter", Vector) = (.5,.5,0,0)
+	_K1_Red ("K1 Red", Range (0.00,1.00)) = 0.0 // sliders
+	_K1_Green ("K1 Green", Range (0.00,1.00)) = 0.0
+	_K1_Blue ("K1 Blue", Range (0.00,1.00)) = 0.0
+	_Center ("Center of Projection", Vector) = (.5,.5,0,0)
 	_MainTex ("Base (RGB)", 2D) = "" {}
 }
-	CGINCLUDE	
+	CGINCLUDE
 	#include "UnityCG.cginc"
-	
+
 	struct v2f {
 		float4 pos : SV_POSITION;
 		float2 uv : TEXCOORD0;
 	};
-	
+
 	float _K1_Red;
 	float _K1_Green;
 	float _K1_Blue;
-	float4 _Full_Center;
-	float4 _Left_Center;
-	float4 _Right_Center;
+	float4 _Center;
 	sampler2D _MainTex;
 
-	v2f vert( appdata_img v ) 
+	v2f vert( appdata_img v )
 	{
 		v2f o;
 		o.pos = mul(UNITY_MATRIX_MVP, v.vertex);
 		o.uv = v.texcoord.xy;
 		return o;
-	} 
+	}
 	float2 Distort(float2 p, float k1)
 	{
-
-
+    /// @todo would pow improve performance here? (by using SFU if available?)
 		float r2 = p.x * p.x + p.y * p.y;
-		float r = sqrt(r2);
 
-		float newRadius = (1 + k1*r*r);
+		float newRadius = (1 + k1*r2);
 		p.x = p.x * newRadius;
 		p.y = p.y * newRadius;
 
 		return p;
 	}
-	
-	half4 frag(v2f i) : SV_Target 
+
+	half4 frag(v2f i) : SV_Target
 	{
 		float2 uv_red, uv_green, uv_blue;
 		float4 color_red, color_green, color_blue;
 		float2 sectorOrigin;
 		float4 color;
 
-		sectorOrigin = _Full_Center.xy;
+		sectorOrigin = _Center.xy;
 
 		uv_red = Distort(i.uv-sectorOrigin, _K1_Red) + sectorOrigin;
 		uv_green = Distort(i.uv-sectorOrigin, _K1_Green) + sectorOrigin;
@@ -101,13 +98,13 @@ Properties
 
 	Subshader {
 	 Pass {
-		  ZTest Always Cull Off ZWrite Off
+			ZTest Always Cull Off ZWrite Off
+
+			CGPROGRAM
+			#pragma vertex vert
+			#pragma fragment frag
+			ENDCG
+		}
 
-		  CGPROGRAM
-		  #pragma vertex vert
-		  #pragma fragment frag
-		  ENDCG
-	  }
-  
 	}
-}
+}