- Notifications
You must be signed in to change notification settings - Fork 121
AIRO-1941 Justing/add visualization layer support #290
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits Select commit Hold shift + click to select a range
92e2069 add support for specifying which layer to render visualizations into,…
0815e12 remove check for -1 now that we have a custom drawer to select index …
d22cf10 update package version, and changelog
6870c30 improved the changelog message
82bb47d reverting package version change
13e37e7 Merge branch 'dev' into justing/add-visualization-layer-support
hyounesy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
30 changes: 30 additions & 0 deletions 30 com.unity.robotics.visualizations/Runtime/Drawing3d/Scripts/DrawingLayer.cs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| using System; | ||
| using UnityEngine; | ||
| #if UNITY_EDITOR | ||
| using UnityEditor; | ||
| #endif | ||
| | ||
| namespace Unity.Robotics.Visualizations | ||
| { | ||
| [Serializable] | ||
| public class DrawingLayer | ||
| { | ||
| public int LayerNumber = 5; // Default to builtin UI layer | ||
| } | ||
| | ||
| #if UNITY_EDITOR | ||
| [CustomPropertyDrawer(typeof(DrawingLayer))] | ||
| public class DrawingLayerPropertyDrawer : PropertyDrawer | ||
| { | ||
| public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) | ||
| { | ||
| EditorGUI.BeginProperty(position, GUIContent.none, property); | ||
| SerializedProperty layer = property.FindPropertyRelative("LayerNumber"); | ||
| position = EditorGUI.PrefixLabel(position, GUIUtility.GetControlID(FocusType.Passive), label); | ||
| if (layer != null) | ||
| layer.intValue = EditorGUI.LayerField(position, layer.intValue); | ||
| EditorGUI.EndProperty(); | ||
| } | ||
| } | ||
| #endif | ||
| } | ||
11 changes: 11 additions & 0 deletions 11 com.unity.robotics.visualizations/Runtime/Drawing3d/Scripts/DrawingLayer.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. Though you really shouldn't have to go to this much trouble, there should be a SelectableLayer struct predefined in the engine...