浏览代码

if def'd meshing demo properly to only compile on iOS

/main
DanMillerDev 4 年前
当前提交
b792a5bd
共有 7 个文件被更改,包括 57 次插入35 次删除
  1. 1
      Assets/Common/Scripts/CenterScreenHelper.cs
  2. 4
      Assets/Meshing/Scripts/ClassificationPlacementManager.cs
  3. 17
      Assets/Meshing/Scripts/MeshClassificationManager.cs
  4. 5
      ProjectSettings/EditorBuildSettings.asset
  5. 1
      ProjectSettings/GraphicsSettings.asset
  6. 64
      ProjectSettings/ProjectSettings.asset

1
Assets/Common/Scripts/CenterScreenHelper.cs


using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.iOS;
public class CenterScreenHelper : MonoBehaviour
{

4
Assets/Meshing/Scripts/ClassificationPlacementManager.cs


using DG.Tweening;
using UnityEngine;
using UnityEngine.EventSystems;
#if UNITY_IOS
#endif // UNITY_IOS
using UnityEngine.XR.ARSubsystems;
public class ClassificationPlacementManager : MonoBehaviour

void Update()
{
#if UNITY_IOS
if (m_ClassificationManager.currentClassification == ARMeshClassification.Table ||
m_ClassificationManager.currentClassification == ARMeshClassification.Floor ||
m_ClassificationManager.currentClassification == ARMeshClassification.Wall)

m_WallUI.SetActive(false);
m_TableUI.SetActive(false);
}
#endif
}
public void PlaceFloorObject(int indexToPlace)

17
Assets/Meshing/Scripts/MeshClassificationManager.cs


using UnityEngine;
using UnityEngine.XR;
using UnityEngine.XR.ARFoundation;
#if UNITY_IOS
#endif // UNITY_IOS
using UnityEngine.XR.ARSubsystems;
public class MeshClassificationManager : MonoBehaviour

RaycastHit m_Hit;
TrackableId m_CurrentTrackableID;
XRMeshSubsystem m_MeshSubsystem;
#if UNITY_IOS
#endif
#if UNITY_IOS
#endif
m_MeshManager.meshesChanged += MeshManagerOnmeshesChanged;
}

{
if (Physics.Raycast(m_MainCamera.ScreenPointToRay(CenterScreenHelper.Instance.GetCenterScreen()), out m_Hit))
{
#if UNITY_IOS
#endif
#if UNITY_IOS
foreach (MeshFilter mesh in obj.added)
{
TrackableId trackableId = ExtractTrackableId(mesh.name);

m_MeshDictionary.Remove(trackableId);
}
#endif
#if UNITY_IOS
void SetCurrentClassification(TrackableId meshID, int triangleIndex)
{
Debug.Assert(m_MeshDictionary.ContainsKey(meshID), $"Mesh ID [{meshID}] does not exist in the dictionary");

}
return retVal;
}
#endif
TrackableId ExtractTrackableId(string meshFilterName)
{
string[] nameSplit = meshFilterName.Split(' ');

5
ProjectSettings/EditorBuildSettings.asset


EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
m_Scenes:
- enabled: 1
path: Assets/UX/Scenes/UXManagerScene.unity
guid: 5d9539f4c7ee5c74c85a038c90cb6e1b
m_configObjects:
UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 0f640456e31a1497aa336938d310040e,
type: 2}

1
ProjectSettings/GraphicsSettings.asset


- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

64
ProjectSettings/ProjectSettings.asset


--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 21
serializedVersion: 20
productGUID: af0fdccff30f9a944ac511632c352f67
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0

useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: Mesh Placement
productName: AR Demos
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}

m_StereoRenderingPath: 0
m_ActiveColorSpace: 1
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1

switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
switchNVNMaxPublicTextureIDCount: 0
switchNVNMaxPublicSamplerIDCount: 0
vulkanEnablePreTransform: 0
vulkanEnableLateAcquireNextImage: 0
m_SupportedAspectRatios:
4:3: 1
5:4: 1

bundleVersion: 0.1
preloadedAssets:
- {fileID: 11400000, guid: 6f7fbab671a5848ddae17e25cb330888, type: 2}
- {fileID: 2703266020209631490, guid: 5c86decb01f9d6b46a50ce486fba0042, type: 2}
- {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1

cardboard:
depthFormat: 0
enableTransitionView: 0
daydream:
depthFormat: 0
useSustainedPerformanceMode: 0
enableVideoLayer: 0
useProtectedVideoMemory: 0
minimumSupportedHeadTracking: 0
maximumSupportedHeadTracking: 1
hololens:
depthFormat: 1
depthBufferSharingEnabled: 1
lumin:
depthFormat: 0
frameTiming: 2
enableGLCache: 0
glCacheMaxBlobSize: 524288
glCacheMaxFileSize: 8388608
oculus:
sharedDepthBuffer: 1
dashSupport: 1
lowOverheadMode: 0
protectedContext: 0
v2Signing: 1
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
enableFrameTimingStats: 0

iOSLaunchScreeniPadFillPct: 100
iOSLaunchScreeniPadSize: 100
iOSLaunchScreeniPadCustomXibPath:
iOSUseLaunchScreenStoryboard: 0
iOSLaunchScreeniPadCustomStoryboardPath:
iOSDeviceRequirements: []
iOSURLSchemes: []
iOSBackgroundModes: 0

clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@4.2.5
templateDefaultScene: Assets/Scenes/SampleScene.unity
useCustomMainManifest: 0
useCustomLauncherManifest: 0
useCustomMainGradleTemplate: 0
useCustomLauncherGradleManifest: 0
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0
useCustomProguardFile: 0
AndroidTargetArchitectures: 1
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}

height: 180
banner: {fileID: 0}
androidGamepadSupportLevel: 0
AndroidMinifyWithR8: 0
AndroidMinifyRelease: 0
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []

tvOS: 1
m_BuildTargetGroupLightmapEncodingQuality: []
m_BuildTargetGroupLightmapSettings: []
m_BuildTargetNormalMapEncoding: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1

cameraUsageDescription: AR BABY
locationUsageDescription:
microphoneUsageDescription:
switchNMETAOverride:
switchNetLibKey:
switchSocketMemoryPoolSize: 6144
switchSocketAllocatorPoolSize: 128

switchUseGOLDLinker: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchTitleNames_0:

webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0
webGLCompressionFormat: 1
webGLWasmArithmeticExceptions: 0
webGLDecompressionFallback: 0
webGLWasmStreaming: 0
scriptingDefineSymbols:
4: UNITY_XR_ARKIT_LOADER_ENABLED
platformArchitecture:

managedStrippingLevel: {}
incrementalIl2cppBuild: {}
allowUnsafeCode: 0
useDeterministicCompilation: 1
useReferenceAssemblies: 1
enableRoslynAnalyzers: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 0

XboxOneXTitleMemory: 8
XboxOneOverrideIdentityName:
XboxOneOverrideIdentityPublisher:
vrEditorSettings: {}
vrEditorSettings:
daydream:
daydreamIconForeground: {fileID: 0}
daydreamIconBackground: {fileID: 0}
cloudServicesEnabled:
UNet: 1
luminIcon:

enableNativePlatformBackendsForNewInputSystem: 0
disableOldInputManagerSupport: 0
legacyClampBlendShapeWeights: 0
virtualTexturingSupportEnabled: 0
正在加载...
取消
保存