Playground update to v1.1 of GVR Unity SDK

Author: miraleung

Samples/DaydreamLabsControllerPlayground/Assets/Editor.meta

@@ -0,0 +1,56 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using UnityEngine;
+using UnityEditor;
+
+[CustomEditor(typeof(DemoInputManager))]
+public class DemoInputManagerEditor : Editor {
+#if UNITY_HAS_GOOGLEVR && UNITY_ANDROID
+  SerializedProperty emulatedPlatformTypeProp;
+  SerializedProperty gvrControllerMainProp;
+  SerializedProperty gvrControllerPointerProp;
+  SerializedProperty gvrReticlePointerProp;
+
+  void OnEnable () {
+    gvrControllerMainProp =
+      serializedObject.FindProperty(DemoInputManager.CONTROLLER_MAIN_PROP_NAME);
+    gvrControllerPointerProp =
+      serializedObject.FindProperty(DemoInputManager.CONTROLLER_POINTER_PROP_NAME);
+    gvrReticlePointerProp =
+      serializedObject.FindProperty(DemoInputManager.RETICLE_POINTER_PROP_NAME);
+
+    emulatedPlatformTypeProp =
+      serializedObject.FindProperty(DemoInputManager.EMULATED_PLATFORM_PROP_NAME);
+  }
+
+  public override void OnInspectorGUI() {
+    // Platform emulation tweaking does not apply on non-native integration versions of Unity.
+    serializedObject.Update();
+
+    EditorGUILayout.PropertyField(gvrControllerMainProp);
+    EditorGUILayout.PropertyField(gvrControllerPointerProp);
+    EditorGUILayout.PropertyField(gvrReticlePointerProp);
+
+    if (DemoInputManager.playerSettingsHasCardboard() ==
+        DemoInputManager.playerSettingsHasDaydream()) {
+      // Show the platform emulation dropdown only if both or neither VR SDK selected in
+      // Player Settings > Virtual Reality supported,
+      EditorGUILayout.PropertyField(emulatedPlatformTypeProp);
+    }
+
+    serializedObject.ApplyModifiedProperties();
+  }
+#endif  // UNITY_HAS_GOOGLEVR && UNITY_ANDROID
+}

Samples/DaydreamLabsControllerPlayground/Assets/GoogleVR.meta

@@ -0,0 +1,59 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// 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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+Shader "GoogleVR/Demos/Unlit/Env Unlit Grayscale" {
+  Properties {
+    _MainTex ("Texture (A)", 2D) = "" {}
+  }
+
+  SubShader {
+    Tags { "Queue"="Geometry" "RenderType"="Geometry"}
+
+    Pass {
+      CGPROGRAM
+      #pragma vertex vert
+      #pragma fragment frag
+      #pragma target 2.0
+      #include "UnityCG.cginc"
+
+      #include "../../Shaders/GvrUnityCompatibility.cginc"
+
+      struct appdata {
+        float4 vertex : POSITION;
+        float2 uv : TEXCOORD0;
+      };
+
+      struct v2f {
+        float2 uv : TEXCOORD0;
+        float4 vertex : SV_POSITION;
+      };
+
+      sampler2D _MainTex;
+      float4 _MainTex_ST;
+
+      v2f vert (appdata v) {
+        v2f o;
+        o.vertex = GvrUnityObjectToClipPos(v.vertex);
+        o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+        return o;
+      }
+
+      fixed4 frag (v2f i) : SV_TARGET  {
+        fixed4 col = tex2D(_MainTex, i.uv).a;
+        return col;
+      }
+      ENDCG
+    }
+  }
+}