Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bounding box layer mask fix #1594

Merged
merged 2 commits into from
Jan 5, 2018
Merged

Bounding box layer mask fix #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
652d72d
Fixed LayerMask
StephenHodgson Jan 5, 2018
e540461
reverted changes to scale transform field
StephenHodgson Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Assets/HoloToolkit/UX/Prefabs/BoundingBoxes/BoundingBoxBasic.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,9 @@ MonoBehaviour:
scalePadding: 0.05
flattenedScalePadding: 0
boundsCalculationMethod: 0
physicsLayer: 0
ignoreLayer: 2
ignoreLayers:
serializedVersion: 2
m_Bits: 4
--- !u!114 &114547907076679292
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -174,5 +175,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8afaaf647e592574d8a56bc26e61f82d, type: 3}
m_Name:
m_EditorClassIdentifier:
PhysicsLayer: 0
boundingBox: {fileID: 114030465538688920}
2 changes: 1 addition & 1 deletion Assets/HoloToolkit/UX/Scripts/BoundingBoxes/BoundingBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down