Merge pull request #27 from Unity3dAzure/iss26

deadlyfingers · web-flow · commit b428f3eb9d69 · 2016-08-27T17:21:17.000+01:00
Iss26
diff --git a/Assets/AppServices/LICENSE b/Assets/AppServices/LICENSE
diff --git a/Assets/AppServices/README.md b/Assets/AppServices/README.md
@@ -1,15 +1,17 @@
-# Azure Mobile Services for Unity3d
-For game developers looking to use Azure Mobile Services or Azure App Services in their Unity3D project.
+# Azure App Services for Unity3d
+For game developers looking to use Azure App Services (previously Mobile Services) in their Unity project.
 
-Also available as a [MobileServices Demo Project](https://github.com/Unity3dAzure/MobileServicesDemo) which will run inside UnityEditor and on iOS, Android and Windows. The demo project has got everything bundled in and does not require any additional assets to work. If you want to integrate with an existing Unity3d project then follow instructions below:
-
-## How to add MobileServices into Unity3d project
+## How to setup App Services with a new Unity project
 1. [Download UnityRestClient](https://github.com/ProjectStratus/UnityRestClient/archive/master.zip)
  	* Copy JsonFx 'plugins' and the UnityRestClient 'Source' into project `Assets` folder
-2. [Download MobileServices](https://github.com/Unity3dAzure/MobileServices/archive/master.zip)  
-	* Copy 'MobileServices' into project `Assets` folder.
-3. Create an [Azure Mobile Service](https://manage.windowsazure.com) or an [Azure App Service](https://portal.azure.com)
-	* Create a table for app data.
+2. [Download AppServices](https://github.com/Unity3dAzure/AppServices/archive/master.zip)  
+	* Copy 'AppServices' into project `Assets` folder.
+3. Create an Azure App Service [Mobile App](https://portal.azure.com)
+	* Create a Table (using Easy Tables) for app data.
+
+## Unity 5 leaderboard demo
+[App Services Demo project](https://github.com/Unity3dAzure/AppServicesDemo) will run inside UnityEditor on Mac or Windows. (The demo project has got everything bundled in and does not require any additional assets to work.)
+Read developer guide on [using Azure App Services to create Unity highscores leaderboard](http://www.deadlyfingers.net/azure/azure-app-services-for-unity3d/) for detailed instructions.
 
 ## Supported Features
 ### MobileServiceClient
@@ -49,7 +51,7 @@ using System.Net;
 using System.Collections.Generic;
 using RestSharp;
 using Pathfinding.Serialization.JsonFx;
-using Unity3dAzure.MobileServices;
+using Unity3dAzure.AppServices;
 
 ```
 
@@ -60,7 +62,7 @@ private MobileServiceTable<TodoItem> _table;
 
 ```
 void Start () {
-	_client = new MobileServiceClient(appUrl, appKey); // <- add your app connection strings here.
+	_client = new MobileServiceClient(appUrl); // <- add your app url here.
 	_table = _client.GetTable<TodoItem>("TodoItem");
 }
 ```
@@ -84,4 +86,9 @@ private void OnReadItemsCompleted(IRestResponse<List<TodoItem>> response) {
 ## Dependencies
 The REST service implements [UnityRestClient](https://github.com/ProjectStratus/UnityRestClient) which uses [JsonFx](https://bitbucket.org/TowerOfBricks/jsonfx-for-unity3d-git/) to parse JSON data.
 
+## Supports
+* iOS
+* Android
+* Windows
+
 Questions or tweet #Azure #GameDev [@deadlyfingers](https://twitter.com/deadlyfingers)
diff --git a/Assets/AppServices/authentication/MobileServiceAuthenticationProvider.cs b/Assets/AppServices/authentication/MobileServiceAuthenticationProvider.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public enum MobileServiceAuthenticationProvider
     {
diff --git a/Assets/AppServices/client/IAzureMobileServiceClient.cs b/Assets/AppServices/client/IAzureMobileServiceClient.cs
@@ -3,7 +3,7 @@
 using System;
 using RestSharp;
 
-namespace Unity3dAzure.MobileServices
+namespace Unity3dAzure.AppServices
 {
     public interface IAzureMobileServiceClient
     {
diff --git a/Assets/AppServices/client/MobileServiceClient.cs b/Assets/AppServices/client/MobileServiceClient.cs
@@ -3,13 +3,16 @@
 using RestSharp;
 using System.Collections.Generic;
 using System;
+using System.Text.RegularExpressions;
+
+
 #if !NETFX_CORE || UNITY_ANDROID
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using System.Net.Security;
 #endif
 
-namespace Unity3dAzure.MobileServices
+namespace Unity3dAzure.AppServices
 {
     public class MobileServiceClient : RestClient, IAzureMobileServiceClient
     {
@@ -22,6 +25,7 @@ public class MobileServiceClient : RestClient, IAzureMobileServiceClient
 
         /// <summary>
         /// Creates a new RestClient using Azure Mobile Service's Application Url and App Key
+        /// NB: Mobile Services should be migrated to use Azure App Service with constructor below.
         /// </summary>
         public MobileServiceClient(string appUrl, string appKey) : base(appUrl)
         {
@@ -31,7 +35,7 @@ public MobileServiceClient(string appUrl, string appKey) : base(appUrl)
             // required for running in Windows and Android
             #if !NETFX_CORE || UNITY_ANDROID
             Debug.Log("ServerCertificateValidation");
-            ServicePointManager.ServerCertificateValidationCallback = RemoteCertificateValidationCallback;    
+            ServicePointManager.ServerCertificateValidationCallback = RemoteCertificateValidationCallback;
             #endif
         }
 
@@ -40,7 +44,8 @@ public MobileServiceClient(string appUrl, string appKey) : base(appUrl)
     	/// </summary>
     	public MobileServiceClient(string appUrl) : base(appUrl)
     	{
-            AppUrl = appUrl;
+			AppUrl = appUrl;
+			Debug.Log("AppUrl: " + AppUrl);
 
             // required for running in Windows and Android
             #if !NETFX_CORE || UNITY_ANDROID
@@ -49,6 +54,14 @@ public MobileServiceClient(string appUrl) : base(appUrl)
             #endif
         }
 
+		/// <summary>
+		/// Using factory method forces app url to be changed from 'http' to 'https' url
+		/// </summary>
+		public static MobileServiceClient Create(string appUrl)
+		{
+			return new MobileServiceClient (ForceHttps (appUrl));
+		}	
+
         public override string ToString()
         {
             return this.BaseUrl;
@@ -93,6 +106,14 @@ public void Login(MobileServiceAuthenticationProvider provider)
             this.ExecuteAsync(request, callback);
         }
 
+		/// <summary>
+		/// When you copy the URL is is 'http' by default, but its preferable to use 'https'
+		/// </summary>
+		private static string ForceHttps(string appUrl) 
+		{
+			return Regex.Replace(appUrl, "(?m)http://", "https://");
+		}
+
         /// <summary>
         /// Mobile Service uses an AppKey, but App Service does not.
         /// </summary>
@@ -117,4 +138,4 @@ private bool RemoteCertificateValidationCallback(System.Object sender, X509Certi
         #endif
 
     }
-}
+}
diff --git a/Assets/AppServices/http/ZumoRequest.cs b/Assets/AppServices/http/ZumoRequest.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using RestSharp;
 
-namespace Unity3dAzure.MobileServices
+namespace Unity3dAzure.AppServices
 {
     public class ZumoRequest : RestRequest
     {
diff --git a/Assets/AppServices/model/AccessToken.cs b/Assets/AppServices/model/AccessToken.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public class AccessToken
     {
diff --git a/Assets/AppServices/model/MobileServiceUser.cs b/Assets/AppServices/model/MobileServiceUser.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public class MobileServiceUser
     {
diff --git a/Assets/AppServices/model/ResponseError.cs b/Assets/AppServices/model/ResponseError.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public class ResponseError
     {
diff --git a/Assets/AppServices/model/User.cs b/Assets/AppServices/model/User.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public class User
     {
diff --git a/Assets/AppServices/model/optional/AzureDataModel.cs b/Assets/AppServices/model/optional/AzureDataModel.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public class AzureDataModel : IAzureDataModel
     {
diff --git a/Assets/AppServices/model/optional/IAzureDataModel.cs b/Assets/AppServices/model/optional/IAzureDataModel.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public interface IAzureDataModel
     {
diff --git a/Assets/AppServices/table/IAzureMobileServiceTable.cs b/Assets/AppServices/table/IAzureMobileServiceTable.cs
@@ -3,7 +3,7 @@
 using System;
 using RestSharp;
 
-namespace Unity3dAzure.MobileServices
+namespace Unity3dAzure.AppServices
 {
     /// <remarks>
     /// NB: Interface uses callbacks as Unity does not support async methods right now. 
diff --git a/Assets/AppServices/table/MobileServiceTable.cs b/Assets/AppServices/table/MobileServiceTable.cs
@@ -7,7 +7,7 @@
 using RestSharp.Deserializers;
 using System.Reflection;
 
-namespace Unity3dAzure.MobileServices
+namespace Unity3dAzure.AppServices
 {
     public class MobileServiceTable<E> : IAzureMobileServiceTable
     {
diff --git a/Assets/AppServices/table/query/CustomQuery.cs b/Assets/AppServices/table/query/CustomQuery.cs
@@ -1,4 +1,4 @@
-﻿namespace Unity3dAzure.MobileServices
+﻿namespace Unity3dAzure.AppServices
 {
     public class CustomQuery
     {
diff --git a/Assets/Scenes/AppServicesDemo.unity b/Assets/Scenes/AppServicesDemo.unity
@@ -13,7 +13,7 @@ SceneSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 7
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -37,12 +37,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
 --- !u!157 &4
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 7
   m_GIWorkflowMode: 0
-  m_LightmapsMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -53,17 +53,22 @@ LightmapSettings:
     m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 3
+    serializedVersion: 4
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
     m_TextureHeight: 1024
+    m_AO: 0
     m_AOMaxDistance: 1
-    m_Padding: 2
     m_CompAOExponent: 0
+    m_CompAOExponentDirect: 0
+    m_Padding: 2
     m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
     m_TextureCompression: 1
+    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
+    m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 1024
     m_ReflectionCompression: 2
   m_LightingDataAsset: {fileID: 0}
@@ -168,6 +173,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -196,6 +202,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
diff --git a/Assets/Scripts/AppServicesDemo.cs b/Assets/Scripts/AppServicesDemo.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using RestSharp;
 using Pathfinding.Serialization.JsonFx;
-using Unity3dAzure.MobileServices;
+using Unity3dAzure.AppServices;
 
 [CLSCompliant(false)]
 public class AppServicesDemo : MonoBehaviour
@@ -38,8 +38,8 @@ void Start ()
 	{
 		Debug.Log ("Azure App Service");
 
-		/// Create App Service client
-		_client = new MobileServiceClient (_appUrl);
+		/// Create App Service client (Using factory Create method to force 'https' url)
+		_client = MobileServiceClient.Create(_appUrl); //new MobileServiceClient(_appUrl);
 
 		Debug.Log(_client);
 
diff --git a/Assets/Scripts/MobileServicesDemo.cs b/Assets/Scripts/MobileServicesDemo.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using RestSharp;
 using Pathfinding.Serialization.JsonFx;
-using Unity3dAzure.MobileServices;
+using Unity3dAzure.AppServices;
 
 [CLSCompliant(false)]
 public class MobileServicesDemo : MonoBehaviour 
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -3,16 +3,31 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 5
+  serializedVersion: 7
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
   m_DeferredReflections:
     m_Mode: 1
     m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
+  m_ScreenSpaceShadows:
+    m_Mode: 1
+    m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
   m_LegacyDeferred:
     m_Mode: 1
     m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
+  m_DepthNormals:
+    m_Mode: 1
+    m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
+  m_MotionVectors:
+    m_Mode: 1
+    m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightHalo:
+    m_Mode: 1
+    m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
+  m_LensFlare:
+    m_Mode: 1
+    m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -21,8 +36,23 @@ GraphicsSettings:
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
-  m_ShaderSettings:
-    useScreenSpaceShadows: 0
+  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
+    type: 0}
+  m_ShaderSettings_Tier1:
+    useCascadedShadowMaps: 1
+    standardShaderQuality: 2
+    useReflectionProbeBoxProjection: 1
+    useReflectionProbeBlending: 1
+  m_ShaderSettings_Tier2:
+    useCascadedShadowMaps: 1
+    standardShaderQuality: 2
+    useReflectionProbeBoxProjection: 1
+    useReflectionProbeBlending: 1
+  m_ShaderSettings_Tier3:
+    useCascadedShadowMaps: 1
+    standardShaderQuality: 2
+    useReflectionProbeBoxProjection: 1
+    useReflectionProbeBlending: 1
   m_BuildTargetShaderSettings: []
   m_LightmapStripping: 0
   m_FogStripping: 0
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Unity3dAzure.MobileServices`
	`1`	`+namespace Unity3dAzure.AppServices`
`2`	`2`	`{`
`3`	`3`	`public enum MobileServiceAuthenticationProvider`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`	`using RestSharp;`
`5`	`5`
`6`		`-namespace Unity3dAzure.MobileServices`
	`6`	`+namespace Unity3dAzure.AppServices`
`7`	`7`	`{`
`8`	`8`	`public interface IAzureMobileServiceClient`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using RestSharp;`
`4`	`4`
`5`		`-namespace Unity3dAzure.MobileServices`
	`5`	`+namespace Unity3dAzure.AppServices`
`6`	`6`	`{`
`7`	`7`	`public class ZumoRequest : RestRequest`
`8`	`8`	`{`