diff --git a/Runtime/Android/GfxPluginCardboard.aar b/Runtime/Android/GfxPluginCardboard.aar index 18940f8..f2affc7 100644 Binary files a/Runtime/Android/GfxPluginCardboard.aar and b/Runtime/Android/GfxPluginCardboard.aar differ diff --git a/Runtime/UnitySubsystemsManifest.json b/Runtime/UnitySubsystemsManifest.json index c7f8505..22b65b1 100644 --- a/Runtime/UnitySubsystemsManifest.json +++ b/Runtime/UnitySubsystemsManifest.json @@ -1,6 +1,6 @@ { "name": "Cardboard", - "version": "1.21.0", + "version": "1.22.0", "libraryName": "GfxPluginCardboard", "displays": [ { diff --git a/Runtime/iOS/GfxPluginCardboard.a b/Runtime/iOS/GfxPluginCardboard.a index e39e8a3..93552ca 100644 Binary files a/Runtime/iOS/GfxPluginCardboard.a and b/Runtime/iOS/GfxPluginCardboard.a differ diff --git a/Samples~/hellocardboard-unity/Scenes/HelloCardboard.unity b/Samples~/hellocardboard-unity/Scenes/HelloCardboard.unity index 622702c..0f4fba6 100644 --- a/Samples~/hellocardboard-unity/Scenes/HelloCardboard.unity +++ b/Samples~/hellocardboard-unity/Scenes/HelloCardboard.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 3 + serializedVersion: 2 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666666 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 + accuratePlacement: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -185,17 +185,9 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 148680882} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &148680890 @@ -444,17 +436,9 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955127915} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!33 &955127918 @@ -512,7 +496,6 @@ GameObject: - component: {fileID: 959308591} - component: {fileID: 959308589} - component: {fileID: 959308590} - - component: {fileID: 959308588} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -520,18 +503,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &959308588 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959308587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aebfb4b86b2e54606894da54f755db2d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!81 &959308589 AudioListener: m_ObjectHideFlags: 0 @@ -580,17 +551,9 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -679,7 +642,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 6 + serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -719,7 +682,7 @@ LightingSettings: m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 0 + m_PVREnvironmentMIS: 1 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -734,8 +697,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 - m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &1347003812 GameObject: m_ObjectHideFlags: 0 @@ -908,17 +869,9 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490385947} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1490385955 @@ -976,7 +929,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1000013165000468, guid: c43602d5712fe4fd4bf33173bb6b8e26, type: 3} @@ -1028,12 +980,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1000013165000468, guid: c43602d5712fe4fd4bf33173bb6b8e26, type: 3} - insertIndex: -1 - addedObject: {fileID: 1799306722} m_SourcePrefab: {fileID: 100100000, guid: c43602d5712fe4fd4bf33173bb6b8e26, type: 3} --- !u!1 &1799306721 stripped GameObject: @@ -1057,7 +1003,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 959308593} m_Modifications: - target: {fileID: 171526, guid: 15fcd94adb15b48f7bb4a80622ae7046, type: 3} @@ -1117,9 +1062,6 @@ PrefabInstance: value: 256 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15fcd94adb15b48f7bb4a80622ae7046, type: 3} --- !u!4 &2109361390 stripped Transform: diff --git a/Samples~/hellocardboard-unity/Scenes/VrMode.unity b/Samples~/hellocardboard-unity/Scenes/VrMode.unity index fbe0137..215d5ae 100644 --- a/Samples~/hellocardboard-unity/Scenes/VrMode.unity +++ b/Samples~/hellocardboard-unity/Scenes/VrMode.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 3 + serializedVersion: 2 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666666 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 + accuratePlacement: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -185,17 +185,9 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 148680882} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &148680890 @@ -457,7 +449,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 959308593} m_Modifications: - target: {fileID: 171526, guid: 15fcd94adb15b48f7bb4a80622ae7046, type: 3} @@ -513,9 +504,6 @@ PrefabInstance: value: 256 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15fcd94adb15b48f7bb4a80622ae7046, type: 3} --- !u!4 &901636014 stripped Transform: @@ -624,17 +612,9 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955127915} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!33 &955127918 @@ -692,7 +672,6 @@ GameObject: - component: {fileID: 959308591} - component: {fileID: 959308589} - component: {fileID: 959308590} - - component: {fileID: 959308588} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -700,18 +679,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &959308588 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 959308587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aebfb4b86b2e54606894da54f755db2d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!81 &959308589 AudioListener: m_ObjectHideFlags: 0 @@ -760,17 +727,9 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -914,17 +873,9 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490385947} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1490385955 @@ -982,7 +933,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1000013165000468, guid: c43602d5712fe4fd4bf33173bb6b8e26, type: 3} @@ -1034,12 +984,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1000013165000468, guid: c43602d5712fe4fd4bf33173bb6b8e26, type: 3} - insertIndex: -1 - addedObject: {fileID: 1799306722} m_SourcePrefab: {fileID: 100100000, guid: c43602d5712fe4fd4bf33173bb6b8e26, type: 3} --- !u!1 &1799306721 stripped GameObject: @@ -1065,7 +1009,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 6 + serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -1105,7 +1049,7 @@ LightingSettings: m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 0 + m_PVREnvironmentMIS: 1 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -1120,5 +1064,3 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 - m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/package.json b/package.json index 0e479cd..f716e90 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.google.xr.cardboard", "displayName": "Google Cardboard XR Plugin for Unity", - "version": "1.21.0", + "version": "1.22.0", "unity": "2019.4", "description": "Provides rendering and input support for Google Cardboard.", "keywords": [