浏览代码

Update to Unity 2019.4.4f1.

Update to AR Foundation packages version 4.0.5.
/4.0
Todd Stinson 4 年前
当前提交
524b3049
共有 16 个文件被更改,包括 95 次插入35 次删除
  1. 1
      .gitignore
  2. 6
      Assets/Scenes/ARFoundationMenu/Menu.unity
  3. 6
      Assets/Scenes/CameraGrain/CameraGrain.unity
  4. 2
      Assets/Scenes/CpuImages.unity
  5. 15
      Assets/Scenes/LightEstimation/ARKitHDRLightEstimation.unity
  6. 2
      Assets/Scenes/PlaneOcclusion/PlaneOcclusion.unity
  7. 10
      Packages/manifest.json
  8. 4
      ProjectSettings/EditorBuildSettings.asset
  9. 18
      ProjectSettings/ProjectSettings.asset
  10. 5
      ProjectSettings/ProjectVersion.txt
  11. 10
      README.md
  12. 15
      Assets/XR/Settings/AR Core Settings.asset
  13. 8
      Assets/XR/Settings/AR Core Settings.asset.meta
  14. 15
      Assets/XR/Settings/AR Kit Settings.asset
  15. 8
      Assets/XR/Settings/AR Kit Settings.asset.meta
  16. 5
      CONTRIBUTING.md

1
.gitignore


[Bb]uilds/
[Uu]serSettings/
Assets/AssetStoreTools*
Packages/packages-lock.json
# Visual Studio 2015 cache directory
/.vs/

6
Assets/Scenes/ARFoundationMenu/Menu.unity


m_HumanSegmentationMenu: {fileID: 1468820548}
m_PlaneDetectionMenu: {fileID: 881169046}
m_MeshingMenu: {fileID: 2008080040}
m_SampleUX: {fileID: 0}
m_CheckSupport: {fileID: 0}
--- !u!4 &774532499
Transform:
m_ObjectHideFlags: 0

m_TargetGraphic: {fileID: 1130901186}
m_HandleRect: {fileID: 1130901185}
m_Direction: 2
m_Value: 1
m_Size: 0.80272734
m_Value: 0.9999998
m_Size: 0.37014005
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:

6
Assets/Scenes/CameraGrain/CameraGrain.unity


--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
serializedVersion: 11
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2

m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2

manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}

2
Assets/Scenes/CpuImages.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.49641287, b: 0.5748173, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

15
Assets/Scenes/LightEstimation/ARKitHDRLightEstimation.unity


m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RaycastPrefab: {fileID: 0}
--- !u!114 &1335839537
MonoBehaviour:
m_ObjectHideFlags: 0

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []

2
Assets/Scenes/PlaneOcclusion/PlaneOcclusion.unity


m_Script: {fileID: 11500000, guid: fa17d122634046b4a8e23048891fafc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RaycastPrefab: {fileID: 0}
--- !u!1 &1794248858
GameObject:
m_ObjectHideFlags: 0

m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_RaycastPrefab: {fileID: 0}

10
Packages/manifest.json


"com.unity.collab-proxy": "1.2.16",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.0",
"com.unity.ide.vscode": "1.2.1",
"com.unity.xr.arcore": "4.0.4",
"com.unity.xr.arfoundation": "4.0.2",
"com.unity.xr.arkit": "4.0.2",
"com.unity.xr.arkit-face-tracking": "4.0.1",
"com.unity.xr.arcore": "4.0.5",
"com.unity.xr.arfoundation": "4.0.5",
"com.unity.xr.arkit": "4.0.5",
"com.unity.xr.arkit-face-tracking": "4.0.5",
"com.unity.xr.interaction.toolkit": "0.9.4-preview",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

4
ProjectSettings/EditorBuildSettings.asset


path: Assets/Scenes/Interaction/Interaction.unity
guid: ff9b6e62e970e432a9e8d51604b3bad8
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: ce4ee285c2a73465ab86d5c382241f35,
type: 2}
UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: d4d2a286f7659496c99ee595da49e6e2,
type: 2}
com.unity.xr.arkit.PlayerSettings: {fileID: 11400000, guid: 2d5fb8e61571b4e3897f221189089fd6,
type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: e2f869774b12e400996eb546603602e3,

18
ProjectSettings/ProjectSettings.asset


switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
stadiaPresentMode: 0
stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
m_SupportedAspectRatios:

uIStatusBarHidden: 1
uIExitOnSuspend: 0
uIStatusBarStyle: 0
iPhoneSplashScreen: {fileID: 0}
iPhoneHighResSplashScreen: {fileID: 0}
iPhoneTallHighResSplashScreen: {fileID: 0}
iPhone47inSplashScreen: {fileID: 0}
iPhone55inPortraitSplashScreen: {fileID: 0}
iPhone55inLandscapeSplashScreen: {fileID: 0}
iPhone58inPortraitSplashScreen: {fileID: 0}
iPhone58inLandscapeSplashScreen: {fileID: 0}
iPadPortraitSplashScreen: {fileID: 0}
iPadHighResPortraitSplashScreen: {fileID: 0}
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
iPhone65inPortraitSplashScreen: {fileID: 0}
iPhone65inLandscapeSplashScreen: {fileID: 0}
iPhone61inPortraitSplashScreen: {fileID: 0}
iPhone61inLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
appleTVSplashScreen2x: {fileID: 0}
tvOSSmallIconLayers: []

5
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.3.12f1
m_EditorVersionWithRevision: 2019.3.12f1 (84b23722532d)
m_EditorVersion: 2019.4.4f1
m_EditorVersionWithRevision: 2019.4.4f1 (1f1dac67805b)

10
README.md


| Unity Version | ARFoundation Version |
| ------------- | -------------------- |
| 2018.4 | [1.5 (preview)](https://github.com/Unity-Technologies/arfoundation-samples/tree/1.5-preview) |
| 2019.3 | [2.1 (verified)](https://github.com/Unity-Technologies/arfoundation-samples/tree/2.1) |
| 2019.4 | [2.1 (verified)](https://github.com/Unity-Technologies/arfoundation-samples/tree/2.1) |
| 2020.1 | [3.1 (verified)](https://github.com/Unity-Technologies/arfoundation-samples/tree/3.1) |
| 2020.2 | [4.0 (verified)](https://github.com/Unity-Technologies/arfoundation-samples/tree/4.0) |

## Interaction
This sample scene demonstrates the functionality of the `XR Interaction Toolkit` package. In the scene, you are able to place a cube on a plane which you can translate, rotate and scale with gestures. See the [`XR Interaction Toolkit Documentation`](https://docs.unity3d.com/Packages/com.unity.xr.interaction.toolkit@0.9/manual/index.html) for more details.
# Community and Feedback
The intention of this reposititory is to provide a means for getting started with the features in ARFoundation. The samples are intentionally simplistic with a focus on teaching basic scene setup and APIs. If you you have a question, find a bug, or would like to request a new feature concerning any of the ARFoundation packages or these samples please [submit a GitHub issue](https://github.com/Unity-Technologies/arfoundation-samples/issues). New issues are reviewed regularly.
## Contributions and Pull Requests
We are not accepting pull requests at this time. If you find an issue with the samples, our would like to request a new sample, please [submit a GitHub issue](https://github.com/Unity-Technologies/arfoundation-samples/issues).

15
Assets/XR/Settings/AR Core Settings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9858e958182f2e4f8dea1aa0a92e5ad, type: 3}
m_Name: AR Core Settings
m_EditorClassIdentifier:
m_Requirement: 0

8
Assets/XR/Settings/AR Core Settings.asset.meta


fileFormatVersion: 2
guid: ce4ee285c2a73465ab86d5c382241f35
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

15
Assets/XR/Settings/AR Kit Settings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7a3c2811d41034e52a6d6c33ac73a207, type: 3}
m_Name: AR Kit Settings
m_EditorClassIdentifier:
m_Requirement: 0

8
Assets/XR/Settings/AR Kit Settings.asset.meta


fileFormatVersion: 2
guid: d4d2a286f7659496c99ee595da49e6e2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

5
CONTRIBUTING.md


# Contributing
At this time, the repo is not accepting external contributions in the form of PRs.
We encourage you to submit bugs, suggestions, and feedback as [GitHub issues](https://github.com/Unity-Technologies/arfoundation-samples/issues).
正在加载...
取消
保存