From 652d72d6723bb32083e13372c72374ee86e7190b Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 5 Jan 2018 12:29:07 -0800 Subject: [PATCH 1/2] Fixed LayerMask --- .../UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab | 8 ++++---- .../HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab b/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab index f826f11c635..6cbbb84b48b 100644 --- a/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab +++ b/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab @@ -154,15 +154,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} - scaleTransform: {fileID: 4696603081318228} + scaleTransform: {fileID: 0} flattenPreference: 4 flattenAxisThreshold: 0.025 flattenedAxisThickness: 0.01 scalePadding: 0.05 flattenedScalePadding: 0 boundsCalculationMethod: 0 - physicsLayer: 0 - ignoreLayer: 2 + ignoreLayers: + serializedVersion: 2 + m_Bits: 4 --- !u!114 &114547907076679292 MonoBehaviour: m_ObjectHideFlags: 1 @@ -174,5 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8afaaf647e592574d8a56bc26e61f82d, type: 3} m_Name: m_EditorClassIdentifier: - PhysicsLayer: 0 boundingBox: {fileID: 114030465538688920} diff --git a/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs b/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs index 36bd8f7c2e0..df512ee9d50 100644 --- a/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs +++ b/Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs @@ -172,7 +172,7 @@ protected set [Tooltip("Any renderers on this layer will be ignored when calculating object bounds")] [SerializeField] - protected LayerMask ignoreLayers = LayerMask.NameToLayer("Ignore Raycast"); + protected LayerMask ignoreLayers = (1 << 2); // Ignore Raycast Layer protected Vector3 targetBoundsWorldCenter = Vector3.zero; protected Vector3 targetBoundsLocalScale = Vector3.zero; From e5404619fba49e7c4e9987ad5be549d65a5c0013 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 5 Jan 2018 12:34:12 -0800 Subject: [PATCH 2/2] reverted changes to scale transform field --- .../UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab b/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab index 6cbbb84b48b..eb447071c5a 100644 --- a/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab +++ b/Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab @@ -154,7 +154,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} - scaleTransform: {fileID: 0} + scaleTransform: {fileID: 4696603081318228} flattenPreference: 4 flattenAxisThreshold: 0.025 flattenedAxisThickness: 0.01