浏览代码

fixed invalid object checking code, cleaned up references and fixed android settings to properly build 64 bit archetecture for the new ARCore requirements

/main
DanMillerDev 4 年前
当前提交
87d7dada
共有 5 个文件被更改,包括 33 次插入48 次删除
  1. 4
      Assets/UX/Scenes/UXManagerScene.unity
  2. 62
      Assets/UX/Scripts/UIManager.cs
  3. 1
      Packages/manifest.json
  4. 7
      Packages/packages-lock.json
  5. 7
      ProjectSettings/ProjectSettings.asset

4
Assets/UX/Scenes/UXManagerScene.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.17280708, g: 0.21594499, b: 0.29788813, a: 1}
m_IndirectSpecularColor: {r: 0.17280719, g: 0.21594538, b: 0.29788864, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

m_Type: 2
m_Resolution: 3
m_CustomResolution: -1
m_Strength: 1
m_Strength: 0.4
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2

62
Assets/UX/Scripts/UIManager.cs


{
if (m_ARSessionOrigin)
{
if (m_ARSessionOrigin.GetComponent<ARPlaneManager>())
m_PlaneManager = m_ARSessionOrigin.GetComponent<ARPlaneManager>();
if (m_ARSessionOrigin.TryGetComponent(out ARPlaneManager arPlaneManager))
{
m_PlaneManager = arPlaneManager;
}
if (m_ARSessionOrigin.GetComponent<ARFaceManager>())
m_FaceManager = m_ARSessionOrigin.GetComponent<ARFaceManager>();
if (m_ARSessionOrigin.TryGetComponent(out ARFaceManager arFaceManager))
{
m_FaceManager = arFaceManager;
}
if (m_ARSessionOrigin.GetComponent<ARHumanBodyManager>())
m_BodyManager = m_ARSessionOrigin.GetComponent<ARHumanBodyManager>();
if (m_ARSessionOrigin.TryGetComponent(out ARHumanBodyManager arHumanBodyManager))
{
m_BodyManager = arHumanBodyManager;
}
if (m_ARSessionOrigin.GetComponent<ARTrackedImageManager>())
m_ImageManager = m_ARSessionOrigin.GetComponent<ARTrackedImageManager>();
if (m_ARSessionOrigin.TryGetComponent(out ARTrackedImageManager arTrackedImageManager))
{
m_ImageManager = arTrackedImageManager;
}
if (m_ARSessionOrigin.GetComponent<ARTrackedObjectManager>())
m_ObjectManager = m_ARSessionOrigin.GetComponent<ARTrackedObjectManager>();
if (m_ARSessionOrigin.TryGetComponent(out ARTrackedObjectManager arTrackedObjectManager))
{
m_ObjectManager = arTrackedObjectManager;
}
}
}

}
}
bool PlanesFound()
{
return m_PlaneManager?.trackables.count > 0;
}
bool MultiplePlanesFound()
{
return m_PlaneManager?.trackables.count > 1;
}
bool PlanesFound() => m_PlaneManager && m_PlaneManager.trackables.count > 0;
bool FaceFound()
{
return m_FaceManager?.trackables.count > 0;
}
bool MultiplePlanesFound() => m_PlaneManager && m_PlaneManager.trackables.count > 1;
bool BodyFound()
{
return m_BodyManager?.trackables.count > 0;
}
bool FaceFound() => m_FaceManager && m_FaceManager.trackables.count > 0;
bool ImageFound()
{
return m_ImageManager?.trackables.count > 0;
}
bool BodyFound() => m_BodyManager && m_BodyManager.trackables.count > 0;
bool ObjectFound()
{
return m_ObjectManager?.trackables.count > 0;
}
bool ImageFound() => m_ImageManager && m_ImageManager.trackables.count > 0;
bool ObjectFound() => m_ObjectManager && m_ObjectManager.trackables.count > 0;
void FadeComplete()
{
m_ProcessingInstructions = false;

1
Packages/manifest.json


"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.1",
"com.unity.localization": "0.7.1-preview",
"com.unity.mobile.android-logcat": "1.1.1",
"com.unity.render-pipelines.universal": "7.3.1",
"com.unity.test-framework": "1.1.14",
"com.unity.textmeshpro": "2.0.1",

7
Packages/packages-lock.json


},
"url": "https://packages.unity.com"
},
"com.unity.mobile.android-logcat": {
"version": "1.1.1",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "1.1.2",
"depth": 1,

7
ProjectSettings/ProjectSettings.asset


applicationIdentifier: {}
buildNumber: {}
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 26
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
aotOptions:

clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@4.2.5
templateDefaultScene: Assets/Scenes/SampleScene.unity
AndroidTargetArchitectures: 1
AndroidTargetArchitectures: 2
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:

4: UNITY_XR_ARKIT_LOADER_ENABLED
platformArchitecture:
iPhone: 1
scriptingBackend: {}
scriptingBackend:
Android: 1
il2cppCompilerConfiguration: {}
managedStrippingLevel: {}
incrementalIl2cppBuild: {}

正在加载...
取消
保存