From 304835836742533201ef6dbd2ab35df7a51f2684 Mon Sep 17 00:00:00 2001
From: s402520 <sven.gerlach@stud-mail.uni-wuerzburg.de>
Date: Fri, 26 May 2023 12:06:31 +0200
Subject: [PATCH] Changed BuildSettings for Testing via Android apk
---
Assets/Resources/PXR_PlatformSetting.asset | 18 ++
.../Resources/PXR_PlatformSetting.asset.meta | 8 +
Assets/Scenes/SampleScene.unity | 181 ++++++------------
ProjectSettings/BurstAotSettings_Android.json | 14 ++
ProjectSettings/CommonBurstAotSettings.json | 6 +
ProjectSettings/EditorBuildSettings.asset | 5 +-
ProjectSettings/ProjectSettings.asset | 7 +-
7 files changed, 115 insertions(+), 124 deletions(-)
create mode 100644 Assets/Resources/PXR_PlatformSetting.asset
create mode 100644 Assets/Resources/PXR_PlatformSetting.asset.meta
create mode 100644 ProjectSettings/BurstAotSettings_Android.json
create mode 100644 ProjectSettings/CommonBurstAotSettings.json
diff --git a/Assets/Resources/PXR_PlatformSetting.asset b/Assets/Resources/PXR_PlatformSetting.asset
new file mode 100644
index 0000000..7f54c60
--- /dev/null
+++ b/Assets/Resources/PXR_PlatformSetting.asset
@@ -0,0 +1,18 @@
+%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: 508edb944d24e574595a91425051a8e4, type: 3}
+ m_Name: PXR_PlatformSetting
+ m_EditorClassIdentifier:
+ entitlementCheckSimulation: 0
+ startTimeEntitlementCheck: 0
+ appID:
+ deviceSN: []
diff --git a/Assets/Resources/PXR_PlatformSetting.asset.meta b/Assets/Resources/PXR_PlatformSetting.asset.meta
new file mode 100644
index 0000000..bb4beee
--- /dev/null
+++ b/Assets/Resources/PXR_PlatformSetting.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 159f4d3367eee374b90ae7c24b60b55f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index ec167fe..12f1e2b 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -123,124 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &245165400
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 245165403}
- - component: {fileID: 245165402}
- - component: {fileID: 245165401}
- - component: {fileID: 245165404}
- m_Layer: 0
- m_Name: Main Camera
- m_TagString: MainCamera
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!81 &245165401
-AudioListener:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245165400}
- m_Enabled: 1
---- !u!20 &245165402
-Camera:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245165400}
- m_Enabled: 1
- serializedVersion: 2
- m_ClearFlags: 1
- m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
- m_projectionMatrixMode: 1
- m_GateFitMode: 2
- m_FOVAxisMode: 0
- m_SensorSize: {x: 36, y: 24}
- m_LensShift: {x: 0, y: 0}
- m_FocalLength: 50
- m_NormalizedViewPortRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1
- height: 1
- near clip plane: 0.3
- far clip plane: 1000
- field of view: 60
- orthographic: 0
- orthographic size: 5
- m_Depth: -1
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingPath: -1
- m_TargetTexture: {fileID: 0}
- m_TargetDisplay: 0
- m_TargetEye: 3
- m_HDR: 1
- m_AllowMSAA: 1
- m_AllowDynamicResolution: 0
- m_ForceIntoRT: 0
- m_OcclusionCulling: 1
- m_StereoConvergence: 10
- m_StereoSeparation: 0.022
---- !u!4 &245165403
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245165400}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &245165404
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245165400}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_RenderShadows: 1
- m_RequiresDepthTextureOption: 2
- m_RequiresOpaqueTextureOption: 2
- m_CameraType: 0
- m_Cameras: []
- m_RendererIndex: -1
- m_VolumeLayerMask:
- serializedVersion: 2
- m_Bits: 1
- m_VolumeTrigger: {fileID: 0}
- m_VolumeFrameworkUpdateModeOption: 2
- m_RenderPostProcessing: 0
- m_Antialiasing: 0
- m_AntialiasingQuality: 2
- m_StopNaN: 0
- m_Dithering: 0
- m_ClearDepth: 1
- m_AllowXRRendering: 1
- m_RequiresDepthTexture: 0
- m_RequiresColorTexture: 0
- m_Version: 2
--- !u!1 &1019091453
GameObject:
m_ObjectHideFlags: 0
@@ -354,8 +236,65 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &1235272401
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3092203388780154408, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_Name
+ value: XrRig
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3092203388780154409, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 1159b36af7d7c11498e7a839d21a5268, type: 3}
--- !u!1001 &2094756388
PrefabInstance:
m_ObjectHideFlags: 0
@@ -365,7 +304,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
propertyPath: m_LocalPosition.x
@@ -377,7 +316,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
propertyPath: m_LocalPosition.z
- value: 0
+ value: 1.47
objectReference: {fileID: 0}
- target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3}
propertyPath: m_LocalRotation.w
diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json
new file mode 100644
index 0000000..771d37b
--- /dev/null
+++ b/ProjectSettings/BurstAotSettings_Android.json
@@ -0,0 +1,14 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "EnableBurstCompilation": true,
+ "EnableOptimisations": true,
+ "EnableSafetyChecks": false,
+ "EnableDebugInAllBuilds": false,
+ "CpuMinTargetX32": 0,
+ "CpuMaxTargetX32": 0,
+ "CpuMinTargetX64": 0,
+ "CpuMaxTargetX64": 0,
+ "OptimizeFor": 0
+ }
+}
diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json
new file mode 100644
index 0000000..0293daf
--- /dev/null
+++ b/ProjectSettings/CommonBurstAotSettings.json
@@ -0,0 +1,6 @@
+{
+ "MonoBehaviour": {
+ "Version": 4,
+ "DisabledWarnings": ""
+ }
+}
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 5d4662d..6720058 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -4,7 +4,10 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
- m_Scenes: []
+ m_Scenes:
+ - enabled: 1
+ path: Assets/Scenes/SampleScene.unity
+ guid: 9fc0d4010bbf28b4594072e72b8655ab
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: 63a6df10c42823e4593558dd07e5406f, type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 9c92df50043c4c24988b77aaa754ec15, type: 2}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index b289621..d189f14 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,10 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.1
- preloadedAssets: []
+ preloadedAssets:
+ - {fileID: 0}
+ - {fileID: 2022272034958044215, guid: 9c92df50043c4c24988b77aaa754ec15, type: 2}
+ - {fileID: 11400000, guid: 63a6df10c42823e4593558dd07e5406f, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
@@ -162,7 +165,7 @@ PlayerSettings:
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 1
- AndroidMinSdkVersion: 22
+ AndroidMinSdkVersion: 29
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
aotOptions:
--
GitLab