[2017.2.1.4] Fix building on Unity 5.6 and 2017.1 #1963
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Add fix for #1964. |
| Matrix4x4 m = Matrix4x4.Rotate(objectToBound.transform.rotation); | ||
| for (int i = 0; i < bounds.Count; ++i) | ||
| { | ||
| bounds[i] = m.MultiplyPoint(bounds[i]); | ||
| bounds[i] += boxInstance.TargetBoundsCenter; | ||
| } | ||
|
|
||
| #else | ||
| #warning "GetBounds() using rotation is not supported on this version of Unity. Recommend updating to 2017.1 or newer." |
There was a problem hiding this comment.
Not sure if we should warn people about this, in this way.
There was a problem hiding this comment.
Fair enough. I can remove those.
| @@ -260,6 +261,9 @@ private void ApplyRotation(Quaternion currentHandOrientation) | |||
| transformToAffect.localRotation = initialRotation; | |||
| transformToAffect.Rotate(axis, angle * 5.0f); | |||
| } | |||
| #else | |||
| #warning "ApplyRotation(Quaternion currentHandOrientation) is not supported on this version of Unity. Recommend updating to 2017.1 or newer." | |||
There was a problem hiding this comment.
Not sure if we should warn people about this, in this way.
StephenHodgson
previously requested changes
Apr 17, 2018
david-c-kline
dismissed
StephenHodgson’s stale review
Updated based on feedback
keveleigh
reviewed
Apr 17, 2018
| @@ -9,6 +9,8 @@ namespace HoloToolkit.Unity | |||
| { | |||
| public static class SpriteAtlasExtensions | |||
| { | |||
| // SpriteAtlast requires Unity 2017.1 or later | |||
|
Removed the comment that contained the spelling error... wasn't really helpful anyhow :) |
keveleigh
approved these changes
Apr 17, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There have been a number of instances of APIs used in recent master and Patch4_Dev branch checkins that are not supported on Unity 5.6 and 2017.1. Add #if version checks around them, and where appropriate use a preprocessor warning directive to alert users to the functionality limitations.