Merged
Conversation
Added fields for vendor, model, version, note, and a ToString() override to DeviceDescriptor.cs Replaced SimpleJSON with Newtonsoft Json.NET, parsing changes in DisplayInterface.cs Refactored VREye.cs and VRHead.cs for easy Unity5 upgrade.
Member
|
So does this work with Unity 4.6.x still? Does the same package work with both versions? (The CI nodes currently have 4.6 licenses) |
Member
Author
|
Works with both. |
Member
|
Can you add a changes file (like the one in OSVR core) that explains any changes that may affect how people use the package, and in particular upgrade? |
Member
Author
|
Done. Will keep the changes file updated in future commits. |
…y5Refactor Conflicts: OSVR-Unity/Assets/OSVRUnity/src/DisplayInterface.cs Moved the debug text from DisplayInterface's json parsing method to DeviceDescriptor's ToString().
rpavlik
added a commit
that referenced
this pull request
Mar 20, 2015
Unity5 compatibility refactor, update to JSON display parsing (using Newtonsoft.JSON)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Should be a clean upgrade to Unity5 now.
Fixed VRHead and VReye to compensate for overlap and roll, but need a dSight to test on. Looks correct.
Added the Newtonsoft DLL to plugins folder and removed SimpleJSON, modified parsing code in DeviceDescriptor to match.
VRDisplayTracked prefab will use HDK descriptor by default.