Integrate mapbox-ar-unity

.gitignore

@@ -13,9 +13,10 @@ sdkproject/Assets/WSATestCertificate.pfx.meta
 # Documentation
 docfx.zip
 /docfx
-api
+#api
 _site
 src/Documentation/log.txt
+obj.meta
 
 # build
 .vs/

README.md

@@ -1,6 +1,16 @@
 # Mapbox-unity-sdk
 ### For Unity 2017.1+  
 
+**AR support requires Unity 2017.3+, Android 7+ (Nougat), iOS 11.3**
+
+Find the [AR specific README here](README-AR.md).
+
+If AR support is not needed these subfolders of `sdkproject/Assets/` maybe deleted:
+* MapboxAR
+* UnityARInterface
+* GoogleARCore
+* UnityARKitPlugin
+
 (for 5.4x compatible versions, please use [this commit](https://github.com/mapbox/mapbox-unity-sdk/releases/tag/Last-official-Unity5x-support))
 
 Tools for using Mapbox APIs with C# / Unity. If you'd like to contribute to the project, [read CONTRIBUTING.md](CONTRIBUTING.md).

documentation/docs/05-changelog.md

@@ -5,6 +5,7 @@
 
 #####
 - Included EditorConfig file to enforce coding style
+- Integration of previously seperate AR support https://github.com/mapbox/mapbox-unity-sdk/pull/544
 
 ### v.1.3.0
 *12/18/2017*

sdkproject/Assets/GoogleARCore/Configurations/DefaultSessionConfig.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 53ac32fab2599402fb6d154adf4c1e40, type: 3}
+  m_Name: DefaultSessionConfig
+  m_EditorClassIdentifier: 
+  m_matchCameraFramerate: 1
+  m_enablePlaneFinding: 1
+  m_enableLightEstimation: 1

sdkproject/Assets/GoogleARCore/Examples/ComputerVision/Materials/AREdgeDetectionBackground.shader

@@ -0,0 +1,74 @@
+Shader "AREdgeDetectionBackground"
+{
+	Properties
+	{
+        _OverlayPercentage ("Overlay Percentage", Range (0.0, 1.0)) = 0.5
+	}
+
+	// For GLES3
+	SubShader
+	{
+		Pass
+		{
+			ZWrite Off
+
+			GLSLPROGRAM
+
+			#pragma only_renderers gles3
+
+			#ifdef SHADER_API_GLES3
+			#extension GL_OES_EGL_image_external_essl3 : require
+			#endif
+
+			uniform vec4 _UvTopLeftRight;
+			uniform vec4 _UvBottomLeftRight;
+
+			#ifdef VERTEX
+
+			#define kPortrait 1.0
+			#define kPortraitUpsideDown 2.0
+			#define kLandscapeLeft 3.0
+			#define kLandscapeRight 4.0
+
+			varying vec2 textureCoord;
+
+			void main()
+			{
+				#ifdef SHADER_API_GLES3
+				vec2 uvTop = mix(_UvTopLeftRight.xy, _UvTopLeftRight.zw, gl_MultiTexCoord0.x);
+				vec2 uvBottom = mix(_UvBottomLeftRight.xy, _UvBottomLeftRight.zw, gl_MultiTexCoord0.x);
+				textureCoord = mix(uvTop, uvBottom, gl_MultiTexCoord0.y);
+
+				gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+				#endif
+			}
+
+			#endif
+
+			#ifdef FRAGMENT
+			varying vec2 textureCoord;
+			uniform samplerExternalOES _MainTex;
+			uniform sampler2D _ImageTex;
+            uniform float _OverlayPercentage;
+
+			void main()
+			{
+				#ifdef SHADER_API_GLES3
+				if (textureCoord.x < _OverlayPercentage)
+					gl_FragColor = texture(_MainTex, textureCoord);
+				else
+				{
+					vec4 color = texture2D(_ImageTex, textureCoord);
+					gl_FragColor.xyz = color.xxx;
+				}
+				#endif
+			}
+
+			#endif
+
+			ENDGLSL
+		}
+	}
+
+	FallBack Off
+}

sdkproject/Assets/GoogleARCore/Examples/ComputerVision/Materials/AREdgeDetectionBackgroundMaterial.mat

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: AREdgeDetectionBackgroundMaterial
+  m_Shader: {fileID: 4800000, guid: b7004efaaedb14dfcba62eea5c70c9d2, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}