Skip to content

fix pivot edit mode 2D slider gizmo not supporting multi-edition (decal) #3908

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

Merged
merged 2 commits into from
Mar 25, 2021
Merged

fix pivot edit mode 2D slider gizmo not supporting multi-edition (decal) #3908

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
e826db2
fix pivot edit mode 2D slider gizmo not supporting multi-edition (decal)
RSlysz Mar 17, 2021
c7df112
Merge branch 'hd/bugfix' into hd/fix/decal-2dslider-in-pivot-edit-mod…
sebastienlagarde Mar 25, 2021
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed Exposure Frame Settings control issues on Planar reflection probes (case 1312153). Dynamic reflections now keep their own exposure relative to their parent camera.
- Fixed Render Graph Debug UI not refreshing correctly in the Render Pipeline Debugger.
- Fixed SSS materials in planar reflections (case 1319027).
- Fixed Decal's pivot edit mode 2D slider gizmo not supporting multi-edition

### Changed
- Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard
Expand Down
7 changes: 4 additions & 3 deletions com.unity.render-pipelines.high-definition/Editor/Material/Decal/ProjectedTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,18 @@ public static Vector3 DrawHandles(Vector3 position, float zProjectionDistance, Q
verts[1] = sliderFaceProjected + (-Vector3.right + Vector3.up) * size2D;
verts[2] = sliderFaceProjected + (-Vector3.right - Vector3.up) * size2D;
verts[3] = sliderFaceProjected + (Vector3.right - Vector3.up) * size2D;
int id = GUIUtility.GetControlID(ids.xy, FocusType.Passive);
float faceOpacity = 0.8f;
if (GUIUtility.hotControl == ids.xy)
if (GUIUtility.hotControl == id)
Handles.color = Handles.selectedColor;
else if (IsHovering(ids.xy, Event.current))
else if (IsHovering(id, Event.current))
faceOpacity = 0.4f;
else
faceOpacity = 0.1f;
Color faceColor = new Color(Handles.zAxisColor.r, Handles.zAxisColor.g, Handles.zAxisColor.b, Handles.zAxisColor.a * faceOpacity);
Handles.DrawSolidRectangleWithOutline(verts, faceColor, Color.clear);
EditorGUI.BeginChangeCheck();
sliderFaceProjected = Handles.Slider2D(ids.xy, sliderFaceProjected, Vector3.forward, Vector3.right, Vector3.up, size2D, Handles.RectangleHandleCap, s_IsGridSnappingActive() ? Vector2.zero : new Vector2(EditorSnapSettings.move[0], EditorSnapSettings.move[1]), false);
sliderFaceProjected = Handles.Slider2D(id, sliderFaceProjected, Vector3.forward, Vector3.right, Vector3.up, size2D, Handles.RectangleHandleCap, s_IsGridSnappingActive() ? Vector2.zero : new Vector2(EditorSnapSettings.move[0], EditorSnapSettings.move[1]), false);
if (EditorGUI.EndChangeCheck())
{
sliderRotatedWorldPos.x = sliderFaceProjected.x;
Expand Down