Upgrade to Oculus Integration Library v16
This commit is contained in:
tverona1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7fa47351daf7f431a99d1bfc2294193d
|
||||
guid: 3701e8c189047bd4e846e85a926beca3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 485ac48a563e2bf44bb4de7ead5a1f68
|
||||
timeCreated: 1461716881
|
||||
licenseType: Store
|
||||
AudioImporter:
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d3994560fb567c34a821fd9355c10eef
|
||||
timeCreated: 1461716882
|
||||
licenseType: Store
|
||||
AudioImporter:
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7000b4d67a1320940b363f3cf891dfff
|
||||
timeCreated: 1461716881
|
||||
licenseType: Store
|
||||
AudioImporter:
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8198ccc08475a764daaf226b841a55f1
|
||||
timeCreated: 1461716882
|
||||
licenseType: Store
|
||||
AudioImporter:
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,36 +0,0 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
|
||||
namespace OVR
|
||||
{
|
||||
|
||||
public class TestScript : MonoBehaviour {
|
||||
|
||||
[InspectorNote( "Sound Setup", "Press '1' to play testSound1 and '2' to play testSound2")]
|
||||
|
||||
public SoundFXRef testSound1;
|
||||
public SoundFXRef testSound2;
|
||||
|
||||
// Use this for initialization
|
||||
void Start () {
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Update is called once per frame
|
||||
void Update ()
|
||||
{
|
||||
// use attached game object location
|
||||
if ( Input.GetKeyDown( KeyCode.Alpha1 ) )
|
||||
{
|
||||
testSound1.PlaySoundAt( transform.position );
|
||||
}
|
||||
|
||||
// hard code information
|
||||
if ( Input.GetKeyDown( KeyCode.Alpha2 ) ) {
|
||||
testSound2.PlaySoundAt( new Vector3( 5.0f, 0.0f, 0.0f ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace OVR
|
||||
@@ -1,437 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!29 &1
|
||||
OcclusionCullingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_OcclusionBakeSettings:
|
||||
smallestOccluder: 5
|
||||
smallestHole: 0.25
|
||||
backfaceThreshold: 100
|
||||
m_SceneGUID: 00000000000000000000000000000000
|
||||
m_OcclusionCullingData: {fileID: 0}
|
||||
--- !u!104 &2
|
||||
RenderSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 8
|
||||
m_Fog: 0
|
||||
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||
m_FogMode: 3
|
||||
m_FogDensity: 0.01
|
||||
m_LinearFogStart: 0
|
||||
m_LinearFogEnd: 300
|
||||
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
|
||||
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
|
||||
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
|
||||
m_AmbientIntensity: 1
|
||||
m_AmbientMode: 3
|
||||
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
|
||||
m_SkyboxMaterial: {fileID: 0}
|
||||
m_HaloStrength: 0.5
|
||||
m_FlareStrength: 1
|
||||
m_FlareFadeSpeed: 3
|
||||
m_HaloTexture: {fileID: 0}
|
||||
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_DefaultReflectionMode: 0
|
||||
m_DefaultReflectionResolution: 128
|
||||
m_ReflectionBounces: 1
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 1
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
m_BounceScale: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_TemporalCoherenceThreshold: 1
|
||||
m_EnvironmentLightingMode: 0
|
||||
m_EnableBakedLightmaps: 0
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 9
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_TextureWidth: 1024
|
||||
m_TextureHeight: 1024
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 0
|
||||
m_CompAOExponentDirect: 0
|
||||
m_Padding: 2
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_LightmapsBakeMode: 1
|
||||
m_TextureCompression: 1
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherFiltering: 1
|
||||
m_FinalGatherRayCount: 1024
|
||||
m_ReflectionCompression: 2
|
||||
m_MixedBakeMode: 1
|
||||
m_BakeBackend: 0
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 0
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 0
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_BuildSettings:
|
||||
serializedVersion: 2
|
||||
agentTypeID: 0
|
||||
agentRadius: 0.5
|
||||
agentHeight: 2
|
||||
agentSlope: 45
|
||||
agentClimb: 0.4
|
||||
ledgeDropHeight: 0
|
||||
maxJumpAcrossDistance: 0
|
||||
minRegionArea: 2
|
||||
manualCellSize: 0
|
||||
cellSize: 0.16666667
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &767466533
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 767466535}
|
||||
- component: {fileID: 767466534}
|
||||
m_Layer: 0
|
||||
m_Name: AudioManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &767466534
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 767466533}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6d1d30b41806244fca035fdae2896fb7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
makePersistent: 1
|
||||
enableSpatializedAudio: 1
|
||||
enableSpatializedFastOverride: 0
|
||||
audioMixer: {fileID: 0}
|
||||
defaultMixerGroup: {fileID: 24300001, guid: 323417d454569d94fa01d511f6eb44d9, type: 2}
|
||||
reservedMixerGroup: {fileID: 0}
|
||||
voiceChatMixerGroup: {fileID: 0}
|
||||
verboseLogging: 0
|
||||
maxSoundEmitters: 32
|
||||
volumeSoundFX: 1
|
||||
soundFxFadeSecs: 1
|
||||
audioMinFallOffDistance: 1
|
||||
audioMaxFallOffDistance: 25
|
||||
soundGroupings:
|
||||
- name: Test Group
|
||||
soundList:
|
||||
- name: TestSound1
|
||||
playback: 0
|
||||
volume: 1
|
||||
pitchVariance: {x: 0.95, y: 1.05}
|
||||
falloffDistance: {x: 1, y: 25}
|
||||
falloffCurve: 2
|
||||
volumeFalloffCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 2
|
||||
time: 0
|
||||
value: 1.0044228
|
||||
inSlope: -1.9459304
|
||||
outSlope: -1.9459304
|
||||
tangentMode: 0
|
||||
- serializedVersion: 2
|
||||
time: 0.27001944
|
||||
value: 0.24837627
|
||||
inSlope: -1.3226271
|
||||
outSlope: -1.3226271
|
||||
tangentMode: 0
|
||||
- serializedVersion: 2
|
||||
time: 0.99744946
|
||||
value: -0.0020017216
|
||||
inSlope: -0.42040923
|
||||
outSlope: -0.42040923
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 0
|
||||
reverbZoneMix:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 2
|
||||
time: 0
|
||||
value: 1.0044228
|
||||
inSlope: -1.9459304
|
||||
outSlope: -1.9459304
|
||||
tangentMode: 0
|
||||
- serializedVersion: 2
|
||||
time: 0.36357749
|
||||
value: 0.4567863
|
||||
inSlope: -1.3226271
|
||||
outSlope: -1.3226271
|
||||
tangentMode: 0
|
||||
- serializedVersion: 2
|
||||
time: 0.99594045
|
||||
value: 0.19572063
|
||||
inSlope: -0.107312
|
||||
outSlope: -0.107312
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 0
|
||||
spread: 0
|
||||
pctChanceToPlay: 1
|
||||
priority: 0
|
||||
delay: {x: 0, y: 0}
|
||||
looping: 0
|
||||
ospProps:
|
||||
enableSpatialization: 1
|
||||
useFastOverride: 1
|
||||
gain: 0
|
||||
enableInvSquare: 1
|
||||
volumetric: 0
|
||||
invSquareFalloff: {x: 1, y: 250}
|
||||
soundClips:
|
||||
- {fileID: 8300000, guid: 7000b4d67a1320940b363f3cf891dfff, type: 3}
|
||||
- {fileID: 8300000, guid: 8198ccc08475a764daaf226b841a55f1, type: 3}
|
||||
visibilityToggle: 0
|
||||
- name: TestSound2
|
||||
playback: 0
|
||||
volume: 1
|
||||
pitchVariance: {x: 0.79999995, y: 1.25}
|
||||
falloffDistance: {x: 1, y: 25}
|
||||
falloffCurve: 1
|
||||
volumeFalloffCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 2
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
- serializedVersion: 2
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMix:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 2
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
- serializedVersion: 2
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spread: 0
|
||||
pctChanceToPlay: 1
|
||||
priority: 0
|
||||
delay: {x: 0, y: 0}
|
||||
looping: 0
|
||||
ospProps:
|
||||
enableSpatialization: 1
|
||||
useFastOverride: 0
|
||||
gain: 0
|
||||
enableInvSquare: 0
|
||||
volumetric: 0
|
||||
invSquareFalloff: {x: 1, y: 25}
|
||||
soundClips:
|
||||
- {fileID: 8300000, guid: 485ac48a563e2bf44bb4de7ead5a1f68, type: 3}
|
||||
- {fileID: 8300000, guid: d3994560fb567c34a821fd9355c10eef, type: 3}
|
||||
visibilityToggle: 0
|
||||
mixerGroup: {fileID: 24300001, guid: 1dd706bb85d8aef4e83a6229dbd62c36, type: 2}
|
||||
maxPlayingSounds: 0
|
||||
preloadAudio: 0
|
||||
volumeOverride: 1
|
||||
playingSoundCount: 0
|
||||
--- !u!4 &767466535
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 767466533}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1050355579
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 1050355581}
|
||||
- component: {fileID: 1050355580}
|
||||
m_Layer: 0
|
||||
m_Name: TestScript
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1050355580
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1050355579}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cfae243ecd01edd49bd439c56a8b18cf, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
testSound1:
|
||||
soundFXName: TestSound1
|
||||
testSound2:
|
||||
soundFXName: TestSound2
|
||||
--- !u!4 &1050355581
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1050355579}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2106254871
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 5
|
||||
m_Component:
|
||||
- component: {fileID: 2106254876}
|
||||
- component: {fileID: 2106254875}
|
||||
- component: {fileID: 2106254874}
|
||||
- component: {fileID: 2106254873}
|
||||
- component: {fileID: 2106254872}
|
||||
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 &2106254872
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 2106254871}
|
||||
m_Enabled: 1
|
||||
--- !u!124 &2106254873
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 2106254871}
|
||||
m_Enabled: 1
|
||||
--- !u!92 &2106254874
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 2106254871}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &2106254875
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 2106254871}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 1
|
||||
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
|
||||
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: 1
|
||||
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: 0
|
||||
m_AllowMSAA: 1
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!4 &2106254876
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 2106254871}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 600e5d49b0a68254286400e32c53addc
|
||||
timeCreated: 1468506358
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -13,3 +13,8 @@ MonoBehaviour:
|
||||
m_Name: OculusProjectConfig
|
||||
m_EditorClassIdentifier:
|
||||
targetDeviceTypes: 01000000
|
||||
handTrackingSupport: 1
|
||||
colorGamut: 0
|
||||
disableBackups: 1
|
||||
enableNSCConfig: 1
|
||||
focusAware: 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fcf81388fa09c62499146010792af088
|
||||
guid: 10ace22946bbe714a9fce09f84fd47b3
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3d24accc358524cd6aaf38cf6f4d077b
|
||||
guid: 5d96358144d2ac9469bb51ecc2285f27
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: abd4679034662fa4382b6c0e2933ed6f
|
||||
guid: 4e678f02c24ca7d45add6932bfe529b9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"name": "Oculus.Platform.Editor",
|
||||
"references": [
|
||||
"Oculus.Platform"
|
||||
],
|
||||
"optionalUnityReferences": [],
|
||||
"includePlatforms": [
|
||||
"Editor"
|
||||
],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"versionDefines": [
|
||||
{
|
||||
"name": "com.unity.xr.management",
|
||||
"expression": "",
|
||||
"define": "USING_XR_MANAGEMENT"
|
||||
},
|
||||
{
|
||||
"name": "com.unity.xr.oculus",
|
||||
"expression": "",
|
||||
"define": "USING_XR_SDK_OCULUS"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 39cfe7aa0a2d46c47994d8d0308ec663
|
||||
DefaultImporter:
|
||||
guid: ae177491a94151a4899094505be41938
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
@@ -1,3 +1,7 @@
|
||||
#if USING_XR_MANAGEMENT && USING_XR_SDK_OCULUS
|
||||
#define USING_XR_SDK
|
||||
#endif
|
||||
|
||||
namespace Oculus.Platform
|
||||
{
|
||||
using System;
|
||||
@@ -161,16 +165,19 @@ namespace Oculus.Platform
|
||||
if (isBuildSettingsExpanded)
|
||||
{
|
||||
GUIHelper.HInset(6, () => {
|
||||
#if !USING_XR_SDK
|
||||
#if UNITY_2020_1_OR_NEWER
|
||||
EditorGUILayout.HelpBox("The Oculus XR Plugin isn't enabled from XR Plugin Management in Project Settings", MessageType.Warning);
|
||||
#else
|
||||
if (!PlayerSettings.virtualRealitySupported)
|
||||
{
|
||||
EditorGUILayout.HelpBox("VR Support isn't enabled in the Player Settings", MessageType.Warning);
|
||||
}
|
||||
else
|
||||
{
|
||||
EditorGUILayout.HelpBox("VR Support is enabled", MessageType.Info);
|
||||
}
|
||||
|
||||
PlayerSettings.virtualRealitySupported = MakeToggle(new GUIContent("Virtual Reality Support"), PlayerSettings.virtualRealitySupported);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
PlayerSettings.bundleVersion = MakeTextBox(new GUIContent("Bundle Version"), PlayerSettings.bundleVersion);
|
||||
#if UNITY_5_3 || UNITY_5_4 || UNITY_5_5
|
||||
PlayerSettings.bundleIdentifier = MakeTextBox(new GUIContent("Bundle Identifier"), PlayerSettings.bundleIdentifier);
|
||||
@@ -276,8 +283,8 @@ namespace Oculus.Platform
|
||||
|
||||
public enum PluginPlatform
|
||||
{
|
||||
Android32,
|
||||
Android64
|
||||
Android32,
|
||||
Android64
|
||||
}
|
||||
|
||||
private static string GetCurrentProjectPath()
|
||||
@@ -318,8 +325,8 @@ namespace Oculus.Platform
|
||||
//[UnityEditor.MenuItem("Oculus/Platform/EnforcePluginPlatformSettings")]
|
||||
public static void EnforcePluginPlatformSettings()
|
||||
{
|
||||
EnforcePluginPlatformSettings(PluginPlatform.Android32);
|
||||
EnforcePluginPlatformSettings(PluginPlatform.Android64);
|
||||
EnforcePluginPlatformSettings(PluginPlatform.Android32);
|
||||
EnforcePluginPlatformSettings(PluginPlatform.Android64);
|
||||
}
|
||||
|
||||
public static void EnforcePluginPlatformSettings(PluginPlatform platform)
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"name": "Oculus.Platform",
|
||||
"references": [],
|
||||
"optionalUnityReferences": [],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"versionDefines": [
|
||||
{
|
||||
"name": "com.unity.xr.management",
|
||||
"expression": "",
|
||||
"define": "USING_XR_MANAGEMENT"
|
||||
},
|
||||
{
|
||||
"name": "com.unity.xr.oculus",
|
||||
"expression": "",
|
||||
"define": "USING_XR_SDK_OCULUS"
|
||||
}
|
||||
]
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c884d076d6398b54492bcc64bbe30bf5
|
||||
DefaultImporter:
|
||||
guid: 8c01d52dc9e9c7c41b509ed43aa1d098
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 965e22ff2df788844b460ddb38b52c63
|
||||
guid: 4ceb3cc2da1c38048ba9123f908c33f9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a5ade4ea912d1024b98a2aae1edd8d4b
|
||||
guid: d16a4c02095db1245a50b1de0d5bcdf6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 71f62bfe84bf80d48b4aecade2b18710
|
||||
guid: 18fb0e7057360374fa820eece0d5d112
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 421b5471317fd4e4e8dad62ea665d4c5
|
||||
guid: 724a505b68ecac443bc477eeb986e34f
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,34 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fe7ed02a4d2df5143a972d37d7af94b4
|
||||
timeCreated: 1555100492
|
||||
licenseType: Store
|
||||
PluginImporter:
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
platformData:
|
||||
data:
|
||||
first:
|
||||
'': data
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
data:
|
||||
first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: ARM64
|
||||
data:
|
||||
first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5e5d140cbf7f1b64188a4a891384c5c9
|
||||
guid: 456b08f21cd27084d92a877dbf2b9ee5
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bd19ab760a88d4147bb139e1772b30bf
|
||||
guid: eddc37f131931d64a862552274d9cf4f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
Binary file not shown.
+1
-1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3dce8f6f8cd6f3b4a99ef7e0708fbe76
|
||||
guid: 6547d763bf83228429a4d12428194804
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3c62fefb060a105469849eefc4530f73
|
||||
guid: 14f341254c04db042bf0039bf9a08821
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f615547c377c15c4ea2a0e37bca038c5
|
||||
guid: d0c0677176bd3cb4c92d3da1c0c50508
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e95fb942c82302a43978166bf0efaf71
|
||||
guid: 0431403efe8137c4d88bcef2b0c6e0d8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 309928a3f1f643b48be6839db352c2ac
|
||||
guid: 410f24c4266efe34985820a13cac86ce
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -943,6 +943,16 @@ namespace Oculus.Platform
|
||||
[DllImport(DLL_NAME, CallingConvention=CallingConvention.Cdecl, EntryPoint="ovr_Leaderboard_GetEntriesAfterRank")]
|
||||
private static extern ulong ovr_Leaderboard_GetEntriesAfterRank_Native(IntPtr leaderboardName, int limit, ulong afterRank);
|
||||
|
||||
public static ulong ovr_Leaderboard_GetEntriesByIds(string leaderboardName, int limit, LeaderboardStartAt startAt, UInt64[] userIDs, uint userIDLength) {
|
||||
IntPtr leaderboardName_native = StringToNative(leaderboardName);
|
||||
var result = (ovr_Leaderboard_GetEntriesByIds_Native(leaderboardName_native, limit, startAt, userIDs, userIDLength));
|
||||
Marshal.FreeCoTaskMem(leaderboardName_native);
|
||||
return result;
|
||||
}
|
||||
|
||||
[DllImport(DLL_NAME, CallingConvention=CallingConvention.Cdecl, EntryPoint="ovr_Leaderboard_GetEntriesByIds")]
|
||||
private static extern ulong ovr_Leaderboard_GetEntriesByIds_Native(IntPtr leaderboardName, int limit, LeaderboardStartAt startAt, UInt64[] userIDs, uint userIDLength);
|
||||
|
||||
[DllImport(DLL_NAME, CallingConvention=CallingConvention.Cdecl)]
|
||||
public static extern ulong ovr_Leaderboard_GetNextEntries(IntPtr handle);
|
||||
|
||||
|
||||
@@ -16,6 +16,9 @@ namespace Oculus.Platform
|
||||
[Description("UNKNOWN")]
|
||||
Unknown,
|
||||
|
||||
[Description("USER_IDS")]
|
||||
UserIds,
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -113,6 +113,7 @@ namespace Oculus.Platform
|
||||
LanguagePack_SetCurrent = 0x5B4FBBE0,
|
||||
Leaderboard_GetEntries = 0x5DB3474C,
|
||||
Leaderboard_GetEntriesAfterRank = 0x18378BEF,
|
||||
Leaderboard_GetEntriesByIds = 0x39607BFC,
|
||||
Leaderboard_GetNextEntries = 0x4E207CD9,
|
||||
Leaderboard_GetPreviousEntries = 0x4901DAC0,
|
||||
Leaderboard_WriteEntry = 0x117FC8FE,
|
||||
@@ -483,6 +484,7 @@ namespace Oculus.Platform
|
||||
|
||||
case Message.MessageType.Leaderboard_GetEntries:
|
||||
case Message.MessageType.Leaderboard_GetEntriesAfterRank:
|
||||
case Message.MessageType.Leaderboard_GetEntriesByIds:
|
||||
case Message.MessageType.Leaderboard_GetNextEntries:
|
||||
case Message.MessageType.Leaderboard_GetPreviousEntries:
|
||||
message = new MessageWithLeaderboardEntryList(messageHandle);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 37f4ad0cb40aa574ebd6f2b0ce8a090c
|
||||
guid: 5c34ec78fb8218d4086a6dec4acc4a2c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6584aafbe36b05f479abff629d533b56
|
||||
guid: ebbae1565298c9f428c5d96f362d06ab
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 999d2ec5f273d594d8e9c093998863a4
|
||||
guid: 021def392a7307c4a950a32b1f73f00e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bf2d6ecb34cf35843877cc075b9f17d1
|
||||
guid: 0ee57f638fd886546bfe5aa2316a8d5d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b74702841edb5cc48aa485d83b36ef53
|
||||
guid: b141b04a9242dae4da12d2683e4811e7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7cc45eb009ae2c446869ed02f106f0d4
|
||||
guid: 0b9cc57b6344c564bb11f4ca56f08386
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c601026d7ea002640b7e4b84b835abd3
|
||||
guid: 0718d02a322b48142b1e78ecce538848
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ad5a1937689b9ff4896a9dcf9c558190
|
||||
guid: 06673c5a5c4d6bc4484abdb4adfebc26
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 174b536e224d5b84282c6d103da9c81a
|
||||
guid: ac77b89c30c104d41976fa9364ab87f0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ea0e9a160bcaee043ac1440054b38a92
|
||||
guid: 65f225aade97b5b43a58c1a30f40c229
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 104977abd9cf64c4c963c4e67b8dbe55
|
||||
guid: 28d59554b5e6ce94793295ce54af14ff
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 45db1970b90587042b5482b011269eb9
|
||||
guid: 21315400743b3414aa3d9e7517a93d6d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cd5f6a5bf683b3e4a90b349e68f71116
|
||||
guid: 325d0224e7aea0740be07d6c6c73101b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 50daa3e06daf33d418c6fa31920e590c
|
||||
guid: 71eb8470c05652e4a94ba8fbc7ca17e6
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 81b3c8cffe3331140a62df154d710f2d
|
||||
guid: ef0fea52eb00cec459f6961c574f0335
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1147,7 +1147,7 @@ namespace Oculus.Platform
|
||||
|
||||
public static partial class Leaderboards
|
||||
{
|
||||
/// Requests a block of Leaderboard Entries.
|
||||
/// Requests a block of leaderboard entries.
|
||||
/// \param leaderboardName The name of the leaderboard whose entries to return.
|
||||
/// \param limit Defines the maximum number of entries to return.
|
||||
/// \param filter Allows you to restrict the returned values by friends.
|
||||
@@ -1166,7 +1166,7 @@ namespace Oculus.Platform
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Requests a block of leaderboard Entries.
|
||||
/// Requests a block of leaderboard entries.
|
||||
/// \param leaderboardName The name of the leaderboard.
|
||||
/// \param limit The maximum number of entries to return.
|
||||
/// \param afterRank The position after which to start. For example, 10 returns leaderboard results starting with the 11th user.
|
||||
@@ -1181,6 +1181,23 @@ namespace Oculus.Platform
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Requests a block of leaderboard entries. Will return only entries matching
|
||||
/// the user IDs passed in.
|
||||
/// \param leaderboardName The name of the leaderboard whose entries to return.
|
||||
/// \param limit Defines the maximum number of entries to return.
|
||||
/// \param startAt Defines whether to center the query on the user or start at the top of the leaderboard. If this is LeaderboardStartAt.CenteredOnViewer or LeaderboardStartAt.CenteredOnViewerOrTop, then the current user's ID will be automatically added to the query.
|
||||
/// \param userIDs Defines a list of user ids to get entries for.
|
||||
///
|
||||
public static Request<Models.LeaderboardEntryList> GetEntriesByIds(string leaderboardName, int limit, LeaderboardStartAt startAt, UInt64[] userIDs)
|
||||
{
|
||||
if (Core.IsInitialized())
|
||||
{
|
||||
return new Request<Models.LeaderboardEntryList>(CAPI.ovr_Leaderboard_GetEntriesByIds(leaderboardName, limit, startAt, userIDs, (uint)(userIDs != null ? userIDs.Length : 0)));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/// Writes a single entry to a leaderboard.
|
||||
/// \param leaderboardName The leaderboard for which to write the entry.
|
||||
/// \param score The score to write.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 507bd7426f1b9ef4c8971a42896e48ad
|
||||
guid: ddde54b747ea4fa42a8a9f66bad7d790
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ddb3d806d2db34d448029105984a5cb0
|
||||
guid: 386aad0a25d6ca240922fb0cec4ee80a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8b3df845616a14c4680b472abaaf9a88
|
||||
guid: a306302dc08b052499ca37975fd2f27b
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -1,7 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c208be5612326e84d9ab05e3db1e7577
|
||||
guid: 482a4441200812a45b95c10203da3945
|
||||
folderAsset: yes
|
||||
timeCreated: 1560372287
|
||||
timeCreated: 1587079908
|
||||
licenseType: Store
|
||||
PluginImporter:
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 456a020a4fcb4be41a4e69895514765e
|
||||
guid: 6f842a6dd1a0d17459eee1c804aa7e1b
|
||||
folderAsset: yes
|
||||
timeCreated: 1560372287
|
||||
timeCreated: 1587079908
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
|
||||
+3
-3
@@ -15,17 +15,17 @@
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string>1.47.0</string>
|
||||
<string>1.48.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string></string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.47.0</string>
|
||||
<string>1.48.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.47.0</string>
|
||||
<string>1.48.0</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>LSRequiresCarbon</key>
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c68b32ff0b6f9594da6b369e3029c626
|
||||
timeCreated: 1584968029
|
||||
guid: c76f915af578f004cbba304c0968b3c9
|
||||
timeCreated: 1587079909
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8963e0bd5b2352048ba7c380b3ec48e5
|
||||
guid: f565deebb829abf419adbc9e40fd896a
|
||||
folderAsset: yes
|
||||
timeCreated: 1560372287
|
||||
timeCreated: 1587079909
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
|
||||
BIN
Binary file not shown.
+2
-2
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1856ac0a07518f14cb7f7a5effb2edba
|
||||
timeCreated: 1584968029
|
||||
guid: 77716eac5f114614ab5cd7dbe9d1f29e
|
||||
timeCreated: 1587079909
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
userData:
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d0639115b7dbafc459a7265b5523077d
|
||||
guid: d02373d93b4b79e41af291b26708f322
|
||||
folderAsset: yes
|
||||
timeCreated: 1425156097
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4e72a6c3e73efa646898d748ab8d230d
|
||||
guid: 2110d36298c920d41bb38b2c4a49e2b4
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
Binary file not shown.
@@ -1,98 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c44ae4e55ac2fc84d9a159d9da9187e7
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
isPreloaded: 1
|
||||
isOverridable: 0
|
||||
platformData:
|
||||
- first:
|
||||
'': Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Editor: 0
|
||||
Exclude Linux: 0
|
||||
Exclude Linux64: 0
|
||||
Exclude LinuxUniversal: 0
|
||||
Exclude OSXUniversal: 0
|
||||
Exclude Win: 0
|
||||
Exclude Win64: 1
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86
|
||||
DefaultValueInitialized: true
|
||||
OS: Windows
|
||||
- first:
|
||||
Facebook: Win
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Facebook: Win64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Linux
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: LinuxUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: OSXIntel
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: OSXIntel64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,8 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7c7dc205605b42042975b528f57d109d
|
||||
guid: 08cfceeb8a0af76409eaeb6bbd906e6d
|
||||
folderAsset: yes
|
||||
timeCreated: 1425156097
|
||||
licenseType: Store
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f879d616488d58642b9e6551294edb95
|
||||
guid: 3c5db0898f7e5514d8c970e5ad173f34
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
|
||||
Binary file not shown.
@@ -1,98 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 455beaad753df474989066032533be77
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
isPreloaded: 1
|
||||
isOverridable: 0
|
||||
platformData:
|
||||
- first:
|
||||
'': Any
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
Exclude Editor: 0
|
||||
Exclude Linux: 0
|
||||
Exclude Linux64: 0
|
||||
Exclude LinuxUniversal: 0
|
||||
Exclude OSXUniversal: 0
|
||||
Exclude Win: 1
|
||||
Exclude Win64: 0
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86_64
|
||||
DefaultValueInitialized: true
|
||||
OS: Windows
|
||||
- first:
|
||||
Facebook: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Facebook: Win64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: Linux
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Linux64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86_64
|
||||
- first:
|
||||
Standalone: LinuxUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: OSXIntel
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: OSXIntel64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
- first:
|
||||
Standalone: OSXUniversal
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: x86_64
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: None
|
||||
- first:
|
||||
Standalone: Win64
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7f7f4173a5d8ed444b8fba9e8e086826
|
||||
timeCreated: 1584968032
|
||||
guid: 04af4d701ed82b842aa38a8234356364
|
||||
timeCreated: 1587079911
|
||||
licenseType: Store
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 583c546491355d8449225b66c5e5e5f5
|
||||
timeCreated: 1584968032
|
||||
guid: d53b5f22c937b8544909d42dd8c18b84
|
||||
timeCreated: 1587079912
|
||||
licenseType: Store
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d90e72edf016940118ffe806231b1d87
|
||||
guid: 16c5809e1b015fc45b9024316c9f0b8a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 095d7a3dae7d8ea4cb761651027164ce
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d716392289ac6764994885f5821f7d7b
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -215,6 +215,7 @@ partial class OculusBuildApp : EditorWindow
|
||||
|
||||
if (!CheckADBDevices())
|
||||
{
|
||||
buildFailed = true;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -230,18 +231,27 @@ partial class OculusBuildApp : EditorWindow
|
||||
SetupDirectories();
|
||||
|
||||
// 1. Get scenes to build in Unity, and export gradle project
|
||||
List<string> sceneList = GetScenesToBuild();
|
||||
DateTime unityExportStart = DateTime.Now;
|
||||
var buildResult = BuildPipeline.BuildPlayer(sceneList.ToArray(), gradleTempExport, BuildTarget.Android,
|
||||
BuildOptions.AcceptExternalModificationsToPlayer |
|
||||
BuildOptions.Development |
|
||||
BuildOptions.AllowDebugging);
|
||||
var buildResult = UnityBuildPlayer();
|
||||
|
||||
if (buildResult.summary.result == UnityEditor.Build.Reporting.BuildResult.Succeeded)
|
||||
{
|
||||
double unityExportTime = (DateTime.Now - unityExportStart).TotalSeconds;
|
||||
OVRPlugin.SendEvent("build_step_unity_export", unityExportTime.ToString(), "ovrbuild");
|
||||
totalBuildTime += unityExportTime;
|
||||
foreach (var step in buildResult.steps)
|
||||
{
|
||||
// Only log top level build steps & specific nested steps to reduce the number of events sent
|
||||
if (step.depth == 1 ||
|
||||
(step.name.StartsWith("Packaging assets") && step.name.EndsWith(".assets")) ||
|
||||
step.name.Equals("Managed Stripping: (Mono)") ||
|
||||
step.name.Equals("Splitting assets") ||
|
||||
step.name.Equals("IL2CPP") ||
|
||||
step.name.Equals("Exporting project")
|
||||
)
|
||||
{
|
||||
OVRPlugin.SendEvent($"build_step_unity_build_player {step.name}", step.duration.TotalSeconds.ToString(), "ovrbuild");
|
||||
}
|
||||
}
|
||||
|
||||
OVRPlugin.SendEvent("build_step_unity_export", buildResult.summary.totalTime.TotalSeconds.ToString(), "ovrbuild");
|
||||
totalBuildTime += buildResult.summary.totalTime.TotalSeconds;
|
||||
|
||||
// Set static variables so build thread has updated data
|
||||
showCancel = true;
|
||||
@@ -274,7 +284,47 @@ partial class OculusBuildApp : EditorWindow
|
||||
buildFailed = true;
|
||||
}
|
||||
|
||||
static void OVRBuildRun()
|
||||
private static UnityEditor.Build.Reporting.BuildReport UnityBuildPlayer()
|
||||
{
|
||||
var sceneList = GetScenesToBuild();
|
||||
var buildPlayerOptions = new BuildPlayerOptions
|
||||
{
|
||||
scenes = sceneList.ToArray(),
|
||||
locationPathName = gradleTempExport,
|
||||
target = BuildTarget.Android,
|
||||
options = BuildOptions.AcceptExternalModificationsToPlayer |
|
||||
BuildOptions.Development |
|
||||
BuildOptions.AllowDebugging
|
||||
};
|
||||
|
||||
var buildResult = BuildPipeline.BuildPlayer(buildPlayerOptions);
|
||||
|
||||
UnityEngine.Debug.Log(UnityBuildPlayerSummary(buildResult));
|
||||
|
||||
return buildResult;
|
||||
}
|
||||
|
||||
private static string UnityBuildPlayerSummary(UnityEditor.Build.Reporting.BuildReport report)
|
||||
{
|
||||
var sb = new System.Text.StringBuilder();
|
||||
|
||||
sb.Append($"Unity Build Player: Build {report.summary.result} ({report.summary.totalSize} bytes) in {report.summary.totalTime.TotalSeconds:0.00}s");
|
||||
|
||||
foreach (var step in report.steps)
|
||||
{
|
||||
sb.AppendLine();
|
||||
if (step.depth > 0)
|
||||
{
|
||||
sb.Append(new String('-', step.depth));
|
||||
sb.Append(' ');
|
||||
}
|
||||
sb.Append($"{step.name}: {step.duration:g}");
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
private static void OVRBuildRun()
|
||||
{
|
||||
// 2. Process gradle project
|
||||
IncrementProgressBar("Processing gradle project . . .");
|
||||
@@ -299,7 +349,7 @@ partial class OculusBuildApp : EditorWindow
|
||||
{
|
||||
gradleBuildProcess = new Process();
|
||||
string arguments = "-Xmx4096m -classpath \"" + gradlePath +
|
||||
"\" org.gradle.launcher.GradleMain assembleDebug -x validateSigningDebug";
|
||||
"\" org.gradle.launcher.GradleMain assembleDebug -x validateSigningDebug --profile";
|
||||
#if UNITY_2019_3_OR_NEWER
|
||||
var gradleProjectPath = gradleExport;
|
||||
#else
|
||||
@@ -336,7 +386,8 @@ partial class OculusBuildApp : EditorWindow
|
||||
(s, e) =>
|
||||
{
|
||||
if (e != null && e.Data != null &&
|
||||
e.Data.Length != 0 && e.Data.Contains("BUILD"))
|
||||
e.Data.Length != 0 &&
|
||||
(e.Data.Contains("BUILD") || e.Data.StartsWith("See the profiling report at:")))
|
||||
{
|
||||
UnityEngine.Debug.LogFormat("Gradle: {0}", e.Data);
|
||||
if (e.Data.Contains("SUCCESSFUL"))
|
||||
|
||||
@@ -68,8 +68,16 @@ public class OVRBundleManager
|
||||
DateTime apkBuildStart = DateTime.Now;
|
||||
|
||||
#if UNITY_2018_1_OR_NEWER
|
||||
BuildReport report = BuildPipeline.BuildPlayer(buildScenes, apkOutputPath, BuildTarget.Android,
|
||||
BuildOptions.Development | BuildOptions.AutoRunPlayer);
|
||||
var buildPlayerOptions = new BuildPlayerOptions
|
||||
{
|
||||
scenes = buildScenes,
|
||||
locationPathName = apkOutputPath,
|
||||
target = BuildTarget.Android,
|
||||
options = BuildOptions.Development |
|
||||
BuildOptions.AutoRunPlayer
|
||||
};
|
||||
|
||||
BuildReport report = BuildPipeline.BuildPlayer(buildPlayerOptions);
|
||||
|
||||
if (report.summary.result == BuildResult.Succeeded)
|
||||
{
|
||||
|
||||
@@ -54,7 +54,7 @@ public class OVRConfig : ScriptableObject
|
||||
{
|
||||
#if UNITY_2019_1_OR_NEWER
|
||||
// Check for use of embedded path or user defined
|
||||
bool useEmbedded = EditorPrefs.GetBool("SdkUseEmbedded");
|
||||
bool useEmbedded = EditorPrefs.GetBool("SdkUseEmbedded") || string.IsNullOrEmpty(EditorPrefs.GetString("AndroidSdkRoot"));
|
||||
if (useEmbedded)
|
||||
{
|
||||
androidSDKPath = Path.Combine(BuildPipeline.GetPlaybackEngineDirectory(BuildTarget.Android, BuildOptions.None), "SDK");
|
||||
@@ -94,7 +94,7 @@ public class OVRConfig : ScriptableObject
|
||||
string libPath = "";
|
||||
#if UNITY_2019_1_OR_NEWER
|
||||
// Check for use of embedded path or user defined
|
||||
bool useEmbedded = EditorPrefs.GetBool("GradleUseEmbedded");
|
||||
bool useEmbedded = EditorPrefs.GetBool("GradleUseEmbedded") || string.IsNullOrEmpty(EditorPrefs.GetString("GradlePath"));
|
||||
|
||||
if (useEmbedded)
|
||||
{
|
||||
@@ -139,7 +139,7 @@ public class OVRConfig : ScriptableObject
|
||||
{
|
||||
#if UNITY_EDITOR_WIN
|
||||
// Check for use of embedded path or user defined
|
||||
bool useEmbedded = EditorPrefs.GetBool("JdkUseEmbedded");
|
||||
bool useEmbedded = EditorPrefs.GetBool("JdkUseEmbedded") || string.IsNullOrEmpty(EditorPrefs.GetString("JdkPath"));
|
||||
|
||||
string exePath = "";
|
||||
if (useEmbedded)
|
||||
|
||||
@@ -20,6 +20,8 @@ using UnityEngine;
|
||||
using UnityEditor;
|
||||
using System.Collections.Generic;
|
||||
using Assets.OVR.Scripts;
|
||||
using Assets.Oculus.VR;
|
||||
using Assets.Oculus.VR.Editor;
|
||||
|
||||
/// <summary>
|
||||
///Scans the project and warns about the following conditions:
|
||||
@@ -680,6 +682,23 @@ public class OVRLint : EditorWindow
|
||||
}, null, false, "Fix");
|
||||
}
|
||||
|
||||
// Check that Android TV Compatibility is disabled
|
||||
if (PlayerSettings.Android.androidTVCompatibility)
|
||||
{
|
||||
AddFix("Disable Android TV Compatibility", "Apps with Android TV Compatibility enabled are not accepted by the Oculus Store.",
|
||||
delegate (UnityEngine.Object obj, bool last, int selected)
|
||||
{
|
||||
PlayerSettings.Android.androidTVCompatibility = false;
|
||||
}, null, false, "Fix");
|
||||
}
|
||||
|
||||
if (OVRPlatformToolSettings.TargetPlatform == OVRPlatformTool.TargetPlatform.OculusGoGearVR &&
|
||||
!OVRPlugin.supportsGearVR)
|
||||
{
|
||||
AddFix("Gear VR Not Supported", "Target Oculus Platform Gear VR is no longer supported after Oculus Utilities v1.41.0. " +
|
||||
"This app will only target Oculus Go.", null, null, false);
|
||||
}
|
||||
|
||||
if (!PlayerSettings.gpuSkinning)
|
||||
{
|
||||
AddFix("Optimize GPU Skinning", "If you are CPU-bound, consider using GPU skinning.",
|
||||
|
||||
@@ -313,6 +313,14 @@ namespace Assets.Oculus.VR.Editor
|
||||
|
||||
GUILayout.FlexibleSpace();
|
||||
|
||||
if (OVRPlatformToolSettings.TargetPlatform != TargetPlatform.Rift)
|
||||
{
|
||||
// Skip Unneeded Shaders Option
|
||||
GUIContent SkipUnneededShadersLabel = new GUIContent("Skip Unneeded Shaders (Recommended) [?]: ",
|
||||
"Prevent building shaders that are not used by default for the current Target Oculus Platform.");
|
||||
OVRPlatformToolSettings.SkipUnneededShaders = MakeToggleBox(SkipUnneededShadersLabel, OVRPlatformToolSettings.SkipUnneededShaders);
|
||||
}
|
||||
|
||||
// Run OVR Lint Option
|
||||
EditorGUIUtility.labelWidth = DEFAULT_LABEL_WIDTH;
|
||||
GUIContent RunOvrLintLabel = new GUIContent("Run OVR Lint (Recommended) [?]: ",
|
||||
|
||||
@@ -15,6 +15,21 @@ namespace Assets.Oculus.VR.Editor
|
||||
{
|
||||
private const string DEFAULT_RELEASE_CHANNEL = "Alpha";
|
||||
|
||||
static OVRPlatformToolSettings()
|
||||
{
|
||||
// BuildPipeline.isBuildingPlayer cannot be called in a static constructor
|
||||
// Run Update once to call TryInitialize then remove delegate
|
||||
EditorApplication.update += Update;
|
||||
}
|
||||
|
||||
static void Update()
|
||||
{
|
||||
// Initialize the instance only if a build is not currently running.
|
||||
TryInitialize();
|
||||
// Stop running Update
|
||||
EditorApplication.update -= Update;
|
||||
}
|
||||
|
||||
public enum GamepadType
|
||||
{
|
||||
OFF,
|
||||
@@ -352,6 +367,12 @@ namespace Assets.Oculus.VR.Editor
|
||||
set { Instance.runOvrLint = value; }
|
||||
}
|
||||
|
||||
public static bool SkipUnneededShaders
|
||||
{
|
||||
get { return Instance.skipUnneededShaders; }
|
||||
set { Instance.skipUnneededShaders = value; }
|
||||
}
|
||||
|
||||
[SerializeField]
|
||||
private List<RedistPackage> riftRedistPackages;
|
||||
|
||||
@@ -367,6 +388,22 @@ namespace Assets.Oculus.VR.Editor
|
||||
[SerializeField]
|
||||
private bool runOvrLint = true;
|
||||
|
||||
[SerializeField]
|
||||
private bool skipUnneededShaders = false;
|
||||
|
||||
public static bool TryInitialize()
|
||||
{
|
||||
// If not initialized and Build Player is current running, UnityEditor.AssetDatabase.CreateAsset
|
||||
// is unsafe to call and will cause a crash. Only load the resource if it already exists.
|
||||
if (instance == null && BuildPipeline.isBuildingPlayer)
|
||||
{
|
||||
instance = Resources.Load<OVRPlatformToolSettings>("OVRPlatformToolSettings");
|
||||
return instance != null;
|
||||
}
|
||||
// Otherwise create/load the resource instance normally.
|
||||
return Instance != null;
|
||||
}
|
||||
|
||||
private static OVRPlatformToolSettings instance;
|
||||
public static OVRPlatformToolSettings Instance
|
||||
{
|
||||
@@ -378,6 +415,15 @@ namespace Assets.Oculus.VR.Editor
|
||||
|
||||
if (instance == null)
|
||||
{
|
||||
if (BuildPipeline.isBuildingPlayer)
|
||||
{
|
||||
// UnityEditor.AssetDatabase.CreateAsset is unsafe to call during a build and
|
||||
// may cause a crash.
|
||||
// This should be rare as the asset is created in the static constructor and should
|
||||
// usually exist.
|
||||
throw new UnityEditor.Build.BuildFailedException(
|
||||
"Cannot create OVRPlatformToolSettings asset while building.");
|
||||
}
|
||||
instance = ScriptableObject.CreateInstance<OVRPlatformToolSettings>();
|
||||
|
||||
string properPath = System.IO.Path.Combine(UnityEngine.Application.dataPath, "Resources");
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
#if UNITY_2018_2_OR_NEWER
|
||||
using Assets.Oculus.VR.Editor;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor;
|
||||
using UnityEditor.Build;
|
||||
using UnityEditor.Rendering;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
|
||||
public class OVRShaderBuildProcessor : IPreprocessShaders
|
||||
{
|
||||
public int callbackOrder { get { return 0; } }
|
||||
|
||||
public void OnProcessShader(
|
||||
Shader shader, ShaderSnippetData snippet, IList<ShaderCompilerData> shaderCompilerData)
|
||||
{
|
||||
if (!OVRPlatformToolSettings.TryInitialize())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!OVRPlatformToolSettings.SkipUnneededShaders)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.Android)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Unity only uses shader Tier2 on Quest and Go (regardless of graphics API)
|
||||
|
||||
var strippedGraphicsTiers = new HashSet<GraphicsTier>();
|
||||
switch (OVRPlatformToolSettings.TargetPlatform)
|
||||
{
|
||||
case OVRPlatformTool.TargetPlatform.OculusGoGearVR:
|
||||
case OVRPlatformTool.TargetPlatform.Quest:
|
||||
strippedGraphicsTiers.Add(GraphicsTier.Tier1);
|
||||
strippedGraphicsTiers.Add(GraphicsTier.Tier3);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (strippedGraphicsTiers.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
for (int i = shaderCompilerData.Count - 1; i >= 0; --i)
|
||||
{
|
||||
if (strippedGraphicsTiers.Contains(shaderCompilerData[i].graphicsTier))
|
||||
{
|
||||
shaderCompilerData.RemoveAt(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
+2
-3
@@ -1,8 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cfae243ecd01edd49bd439c56a8b18cf
|
||||
timeCreated: 1468506975
|
||||
licenseType: Store
|
||||
guid: cb08fbbe69f983b4dbac5e1b413fea34
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3c8d74643f5b06e4daa4a5e7705169ab
|
||||
guid: 2351ce5621709f649877ae8b768dff34
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 38e5b3c5adc91f14aa9ef3696f48d6dd
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,32 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d5d5d29e30b7c874ca06e5aba1028067
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,32 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5aa91f0bfea705343b2a2078c4bacec0
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Android: Android
|
||||
second:
|
||||
enabled: 1
|
||||
settings: {}
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,41 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0d6636688ce565240a53d60f91304cdd
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 0
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: X86
|
||||
OS: Windows
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 0
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 1
|
||||
settings:
|
||||
CPU: X86
|
||||
DefaultValueInitialized: true
|
||||
OS: Windows
|
||||
- first:
|
||||
Standalone: Win
|
||||
second:
|
||||
enabled: 1
|
||||
settings: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user