浏览代码

Merge remote-tracking branch 'origin/master' into config-manager

/3.1
Tim Mowrer 4 年前
当前提交
9f1ec284
共有 30 个文件被更改,包括 318 次插入265 次删除
  1. 4
      Assets/Scenes/ARKitCoachingOverlay/ARKitCoachingOverlay.unity
  2. 4
      Assets/Scenes/ARWorldMap.unity
  3. 4
      Assets/Scenes/Anchors.unity
  4. 4
      Assets/Scenes/CameraImage.unity
  5. 4
      Assets/Scenes/Check Support.unity
  6. 452
      Assets/Scenes/EnvironmentProbes.unity
  7. 4
      Assets/Scenes/FaceTracking/ARCoreFaceRegions.unity
  8. 4
      Assets/Scenes/FaceTracking/ARKitFaceBlendShapes.unity
  9. 4
      Assets/Scenes/FaceTracking/EyeLasers.unity
  10. 4
      Assets/Scenes/FaceTracking/EyePoses.unity
  11. 4
      Assets/Scenes/FaceTracking/FacePose.unity
  12. 4
      Assets/Scenes/FaceTracking/FixationPoint.unity
  13. 4
      Assets/Scenes/HumanSegmentation/HumanBodyTracking2D.unity
  14. 4
      Assets/Scenes/HumanSegmentation/HumanBodyTracking3D.unity
  15. 4
      Assets/Scenes/HumanSegmentation/HumanSegmentationImages.unity
  16. 4
      Assets/Scenes/ImageTracking/ImageTracking.unity
  17. 2
      Assets/Scenes/LightEstimation/ARKitHDRLightEstimation.unity
  18. 2
      Assets/Scenes/LightEstimation/LightEstimation.unity
  19. 4
      Assets/Scenes/Object Tracking/ObjectTracking.unity
  20. 4
      Assets/Scenes/Plane Detection/FeatheredPlanes.unity
  21. 4
      Assets/Scenes/Plane Detection/PlaneClassification.unity
  22. 4
      Assets/Scenes/Plane Detection/TogglePlaneDetection.unity
  23. 4
      Assets/Scenes/PlaneOcclusion/PlaneOcclusion.unity
  24. 4
      Assets/Scenes/PointCloud/AllPointCloudPoints.unity
  25. 4
      Assets/Scenes/SimpleAR/SimpleAR.unity
  26. 4
      Assets/Scenes/UX/SampleUXScene.unity
  27. 10
      Packages/manifest.json
  28. 3
      ProjectSettings/EditorBuildSettings.asset
  29. 18
      ProjectSettings/QualitySettings.asset
  30. 4
      README.md

4
Assets/Scenes/ARKitCoachingOverlay/ARKitCoachingOverlay.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1270793018}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/ARWorldMap.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1991394023}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/Anchors.unity


- component: {fileID: 358479875}
- component: {fileID: 358479874}
m_Layer: 5
m_Name: Clear Reference Points Button
m_Name: Clear Anchors Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Clear Reference Points
m_Text: Clear Anchors
--- !u!222 &551691159
CanvasRenderer:
m_ObjectHideFlags: 0

4
Assets/Scenes/CameraImage.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/Check Support.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

452
Assets/Scenes/EnvironmentProbes.unity
文件差异内容过多而无法显示
查看文件

4
Assets/Scenes/FaceTracking/ARCoreFaceRegions.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1304586401}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/FaceTracking/ARKitFaceBlendShapes.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1526980365}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/FaceTracking/EyeLasers.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1526980365}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/FaceTracking/EyePoses.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1526980365}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/FaceTracking/FacePose.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1526980365}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/FaceTracking/FixationPoint.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1526980365}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/HumanSegmentation/HumanBodyTracking2D.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/HumanSegmentation/HumanBodyTracking3D.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/HumanSegmentation/HumanSegmentationImages.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/ImageTracking/ImageTracking.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2017973560}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

2
Assets/Scenes/LightEstimation/ARKitHDRLightEstimation.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.3731316, g: 0.38074902, b: 0.3587254, a: 1}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

2
Assets/Scenes/LightEstimation/LightEstimation.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.3731316, g: 0.38074902, b: 0.3587254, a: 1}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

4
Assets/Scenes/Object Tracking/ObjectTracking.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1766043502}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/Plane Detection/FeatheredPlanes.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/Plane Detection/PlaneClassification.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/Plane Detection/TogglePlaneDetection.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/PlaneOcclusion/PlaneOcclusion.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1302237703}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/PointCloud/AllPointCloudPoints.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1221676393}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/SimpleAR/SimpleAR.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

4
Assets/Scenes/UX/SampleUXScene.unity


m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1015722065}
m_Enabled: 1
serializedVersion: 9
serializedVersion: 10
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10

10
Packages/manifest.json


"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.1.4",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.1.9",
"com.unity.test-framework": "1.1.11",
"com.unity.xr.arcore": "3.1.0-preview.2",
"com.unity.xr.arfoundation": "3.1.0-preview.3",
"com.unity.xr.arkit": "3.1.0-preview.2",
"com.unity.xr.arkit-face-tracking": "3.1.0-preview.2",
"com.unity.xr.arcore": "3.1.0-preview.4",
"com.unity.xr.arfoundation": "3.1.0-preview.4",
"com.unity.xr.arkit": "3.1.0-preview.4",
"com.unity.xr.arkit-face-tracking": "3.1.0-preview.4",
"com.unity.xr.legacyinputhelpers": "2.0.6",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

3
ProjectSettings/EditorBuildSettings.asset


path: Assets/Scenes/ImageTracking/ImageTracking.unity
guid: e0b018a3c3b5cfd4c8e316706ec0a18c
- enabled: 0
path: Assets/Scenes/LightEstimation/ARKitHDRLightEstimation.unity
guid: f7322e09f4047458fbc45af303830f01
- enabled: 0
path: Assets/Scenes/LightEstimation/LightEstimation.unity
guid: 2f0cbc82480584c258f99f0d9e4ba302
- enabled: 0

18
ProjectSettings/QualitySettings.asset


shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
blendWeights: 1
skinWeights: 1
textureQuality: 1
anisotropicTextures: 0
antiAliasing: 0

asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
- serializedVersion: 2
name: Low

shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
blendWeights: 2
skinWeights: 2
textureQuality: 0
anisotropicTextures: 0
antiAliasing: 0

asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
- serializedVersion: 2
name: Medium

shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
blendWeights: 2
skinWeights: 2
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 0

asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
- serializedVersion: 2
name: High

shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
blendWeights: 2
skinWeights: 2
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 2

asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
- serializedVersion: 2
name: Very High

shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
blendWeights: 4
skinWeights: 4
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 4

asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
- serializedVersion: 2
name: Ultra

shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
blendWeights: 4
skinWeights: 4
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 4

asyncUploadBufferSize: 4
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
m_PerPlatformDefaultQuality:
Android: 2

4
README.md


The relevant scripts are on the "Directional Light" GameObject.
## ReferencePoints
## Anchors
This sample shows how to create reference points as the result of a raycast hit. The "Clear Reference Points" button removes all created reference points. See the [`ReferencePointCreator.cs`](https://github.com/Unity-Technologies/arfoundation-samples/blob/master/Assets/Scripts/ReferencePointCreator.cs) script.
This sample shows how to create anchors as the result of a raycast hit. The "Clear Anchors" button removes all created anchors. See the [`AnchorCreator.cs`](https://github.com/Unity-Technologies/arfoundation-samples/blob/master/Assets/Scripts/AnchorCreator.cs) script.
## Scale

正在加载...
取消
保存