Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion documentation/docs/05-changelog.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
## CHANGELOG
## CHANGELOG
### v.1.4.2
*??/??/2018*

##### New Features
- Add `OnUpdated` event to `AbstractMap`. Enables subscribers to get a notification when the map location and/or zoom gets updated.

##### Improvements
- `UnityARInterface` updated to [commit 67351b6](https://github.com/Unity-Technologies/experimental-ARInterface/commit/67351b66ff9af28380e7dd5f5b2f4ba1bf802ca8) from March 1st 2018

### v.1.4.1
*04/17/2018*

Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074005, b: 0.35872722, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -128,12 +128,17 @@ Prefab:
propertyPath: BackgroundMaterial
value:
objectReference: {fileID: 2100000, guid: 44aa46aeaaf4d46a79e18f3e2da31ccc, type: 2}
- target: {fileID: 114876698896786350, guid: c10877f7cd5764de18d46d7b777d1faa,
type: 2}
propertyPath: BackgroundMaterial
value:
objectReference: {fileID: 2100000, guid: 44aa46aeaaf4d46a79e18f3e2da31ccc, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c10877f7cd5764de18d46d7b777d1faa, type: 2}
m_IsPrefabParent: 0
--- !u!114 &273323148 stripped
--- !u!114 &517579873 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114923820857209294, guid: c10877f7cd5764de18d46d7b777d1faa,
m_PrefabParentObject: {fileID: 114876698896786350, guid: c10877f7cd5764de18d46d7b777d1faa,
type: 2}
m_PrefabInternal: {fileID: 60865845}
m_Script: {fileID: 11500000, guid: eb172c260d42e4f62945afda50892c0c, type: 3}
Expand Down Expand Up @@ -179,7 +184,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
TextureReaderComponent: {fileID: 1465104024}
BackgroundRenderer: {fileID: 273323148}
BackgroundRenderer: {fileID: 517579873}
--- !u!114 &1465104024
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class ComputerVisionController : MonoBehaviour
/// Background renderer to inject our texture into.
/// </summary>
public ARCoreBackgroundRenderer BackgroundRenderer;

/// <summary>
/// True if the app is in the process of quitting due to an ARCore connection error, otherwise false.
/// </summary>
Expand Down Expand Up @@ -71,6 +71,11 @@ public void Start()
/// </summary>
public void Update()
{
if (Input.GetKey(KeyCode.Escape))
{
Application.Quit();
}

_QuitOnConnectionErrors();
_HandleTouchInput();
}
Expand Down Expand Up @@ -179,7 +184,7 @@ private float _GetTouchDelta()
return 0;
}
}

/// <summary>
/// Actually quit the application.
/// </summary>
Expand All @@ -199,13 +204,13 @@ private void _QuitOnConnectionErrors()
}

// Quit if ARCore was unable to connect and give Unity some time for the toast to appear.
if (Session.ConnectionState == SessionConnectionState.UserRejectedNeededPermission)
if (Session.Status == SessionStatus.ErrorPermissionNotGranted)
{
_ShowAndroidToastMessage("Camera permission is needed to run this application.");
m_IsQuitting = true;
Invoke("DoQuit", 0.5f);
}
else if (Session.ConnectionState == SessionConnectionState.ConnectToServiceFailed)
else if (Session.Status == SessionStatus.FatalError)
{
_ShowAndroidToastMessage("ARCore encountered a problem connecting. Please start the app again.");
m_IsQuitting = true;
Expand Down
158 changes: 0 additions & 158 deletions sdkproject/Assets/GoogleARCore/LICENSE

This file was deleted.

Loading