Merge pull request #54 from DolbyIO/develop

1.2.0 PR

Author: 4thlabs

.github/workflows/package.yml

@@ -0,0 +1,12 @@
+name: Package Unity Plugin
+on: workflow_dispatch
+
+jobs:
+  package:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/upload-artifact@v3
+        with:
+          name: dolbyio-comms-unity-plugin
+          path: ${{github.workspace}}/

Projects~/Demo/Assets/Character/Models.meta renamed to Assets.meta

@@ -7,20 +7,26 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Blue_Mat
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Name: Video
+  m_Shader: {fileID: 4800000, guid: 83986edd2cc4d4a55bc7e00079fd44fb, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords: []
+  m_InvalidKeywords:
+  - _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
-  stringTagMap:
-    RenderType: Opaque
-  disabledShaderPasses: []
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BaseMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -79,41 +85,49 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
+    - PixelSnap: 0
     - _AlphaClip: 0
     - _Blend: 0
+    - _BlendOp: 0
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
-    - _DstBlend: 0
+    - _DstBlend: 10
+    - _EnableExternalAlpha: 0
     - _EnvironmentReflections: 1
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossinessSource: 0
+    - _GlossyReflections: 0
     - _Metallic: 0
-    - _Mode: 0
     - _OcclusionStrength: 1
-    - _Parallax: 0.02
+    - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
+    - _SampleGI: 0
+    - _Shininess: 0
     - _Smoothness: 0.5
+    - _SmoothnessSource: 0
     - _SmoothnessTextureChannel: 0
+    - _SpecSource: 0
     - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Surface: 0
-    - _UVSec: 0
+    - _SrcBlend: 5
+    - _Surface: 1
     - _WorkflowMode: 1
-    - _ZWrite: 1
+    - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 0.48507768, g: 0.67556465, b: 0.7830189, a: 1}
-    - _Color: {r: 0.48507768, g: 0.6755646, b: 0.7830188, a: 1}
+    - _BaseColor: {r: 1, g: 0.9764151, b: 0.9764151, a: 1}
+    - _Color: {r: 1, g: 0.9764151, b: 0.9764151, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
---- !u!114 &3492286539524700102
+--- !u!114 &9170485700502161804
 MonoBehaviour:
   m_ObjectHideFlags: 11
   m_CorrespondingSourceObject: {fileID: 0}

Projects~/Demo/Assets/Environment/Art/Materials.meta renamed to Assets/Materials.meta

@@ -0,0 +1,55 @@
+Shader "Unlit/Video"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "black" {}
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            // make fog work
+            #pragma multi_compile_fog
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                UNITY_FOG_COORDS(1)
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                return o;
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                // sample the texture
+                fixed4 col = tex2D(_MainTex, i.uv);
+                return col;
+            }
+            ENDCG
+        }
+    }
+}

Projects~/Demo/Assets/Environment/Art/Materials/Blue_Mat.mat renamed to Assets/Materials/Video.mat

@@ -65,28 +65,6 @@ void OnGUI()
 
             GUILayout.Space(40);
 
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-            if (GUILayout.Button("Getting Started", GUILayout.Height(30)))
-            {
-                Application.OpenURL("https://api-references.dolby.io/comms-sdk-dotnet/documentation/unity/getting-started/example.html");
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(5);
-
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-            if (GUILayout.Button("Visual Scripting", GUILayout.Height(30)))
-            {
-                Application.OpenURL("https://api-references.dolby.io/comms-sdk-dotnet/documentation/unity/visualscripting/nodes.html");
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(40);
-
             GUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
             GUILayout.Label("Insert your App Key to get started:");
@@ -101,10 +79,17 @@ void OnGUI()
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
 
-            GUILayout.Space(10);
+            GUILayout.Space(15);
 
             GUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
+            if (GUILayout.Button("How to get an App Key", GUILayout.Height(30)))
+            {
+                Application.OpenURL("https://docs.dolby.io/communications-apis/page/registering-your-application-in-the-unity-editor");
+            }
+
+            GUILayout.Space(60);
+
             if (GUILayout.Button("Begin", GUILayout.Width(50), GUILayout.Height(30)))
             {
                 var result = VSAttribution.SendAttributionEvent(_actionName, CustomerKey);
@@ -126,26 +111,24 @@ void OnGUI()
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
 
-            GUILayout.Space(20);
+            GUILayout.Space(40);
 
             GUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
-            GUILayout.Label("You can find your App Key in the Dolby.io dashboard at");
-            if (GUILayout.Button("https://dashboard.dolby.io", EditorStyles.linkLabel))
+            if (GUILayout.Button("Getting Started", GUILayout.Height(30)))
             {
-                Application.OpenURL("https://dashboard.dolby.io");
+                Application.OpenURL("https://api-references.dolby.io/comms-sdk-dotnet/documentation/unity/getting-started/example.html");
             }
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
 
-            GUILayout.Space(10);
+            GUILayout.Space(5);
 
             GUILayout.BeginHorizontal();
             GUILayout.FlexibleSpace();
-            GUILayout.Label("For help, see");
-            if (GUILayout.Button("here", EditorStyles.linkLabel))
+            if (GUILayout.Button("Visual Scripting", GUILayout.Height(30)))
             {
-                Application.OpenURL("https://docs.dolby.io/communications-apis/docs/guides-api-authentication#locating-your-app-key-and-app-secret");
+                Application.OpenURL("https://api-references.dolby.io/comms-sdk-dotnet/documentation/unity/visualscripting/nodes.html");
             }
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();