Feature/visualizing snapzone content in editor trng 1047 #47

SimonTheSourcerer · 2020-08-31T07:35:26Z

Description

Added Preview where and how the object will be snapped
Normal created snapzones only allow to snap a specific TrainingSceneObject
Fixed snapzone snapping position by adjusting the center of mass (always put it to 0,0,0 which).

Fixes: # (issue)

TRNG-1047
TRNG-1044

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
This change requires a documentation update

How Has This Been Tested?

by hand

Test Configuration:
To get this working you also have to checkout Basic interaction: Feature/validation for snapzones

Gusinuhe

I know it is already messed up, but maybe some new public elements from the SnapZone (like the PreviewMesh) can be internals.

Gusinuhe · 2020-08-31T08:14:42Z

Runtime/Interaction/SnapZonePreviewDrawer.cs

+
+        private void Update()
+        {
+            bool isPreviewing = gameObject.GetComponent<MeshFilter>() != null;


Perhaps the MeshFilter can be cached and just check if it is null or not.

Gusinuhe · 2020-08-31T08:15:46Z

Runtime/Interaction/SnapZonePreviewDrawer.cs

+            if (Parent.ShowHighlightInEditor && Parent.PreviewMesh && isPreviewing == false)
+            {
+                MeshFilter meshFilter =  gameObject.AddComponent<MeshFilter>();
+                meshFilter.sharedMesh = Parent.PreviewMesh;


Does this work if the parent has a SkinnedMeshRenderer?

dont know :x

I think it should, I'll test it

It does work

Runtime/Interaction/SnapZonePreviewDrawer.cs

Editor/Properties/SnappablePropertyEditor.cs

Editor/SnapZone/SnapZoneSettings.cs

Runtime/Interaction/SnapZone.cs

Runtime/Interaction/SnapZonePreviewDrawer.cs

Gusinuhe

The snap zone generator does not consider submeshes for the highlight object.

Editor/SnapZone/SnapZoneSettings.cs

Runtime/Interaction/SnapZone.cs

SimonTheSourcerer · 2020-08-31T13:16:29Z

Also fixed the highlight during runtime.

Gusinuhe · 2020-08-31T13:58:31Z

Runtime/Interaction/SnapZone.cs


-        private Material highlightMeshMaterial;
+        [SerializeField]


publics are already serialized 😇

aleksei-korolev · 2020-08-31T14:40:23Z

Runtime/Interaction/SnapZone.cs

@@ -318,6 +384,14 @@ public override bool CanSelect(XRBaseInteractable interactable)
                return true;
            }

+            foreach (Validator validator in validators)


if (validators.All(validator => validator.Validate(interactable.gameObject)) == false) { return false; }

aleksei-korolev · 2020-08-31T14:42:07Z

I didn't test it yet, but the code looks OK

Gusinuhe · 2020-08-31T15:22:22Z

When ShowHighlightInEditor is disabled, the highlight object is disabled as expected, but if it is enabled again the highlight object never gets enabled (and actually SnapZonePreviewDrawer is gone forever).

Gusinuhe · 2020-08-31T15:26:52Z

SnapZonePreviewDrawer does not render sub meshes.

Object in the left: Snap Zone
Object in the right: Highlight object from the same Snap Zone

Editor/Interaction/SnapZoneEditor.cs

tomwim · 2020-09-01T07:39:39Z

Editor/Properties/SnappablePropertyEditor.cs

@@ -54,8 +55,25 @@ private void CreateSnapZone(SnappableProperty snappable)
            // Adds a Snap Zone component to our new object.
            SnapZone snapZone = snapObject.AddComponent<SnapZoneProperty>().SnapZone;
            snapZone.ShownHighlightObject = snapZonePrefab;
+            IsTrainingSceneObjectValidation validation =
+                snapZone.gameObject.AddComponent<IsTrainingSceneObjectValidation>();


linebreak. maybe you dont want that

tomwim · 2020-09-01T07:40:28Z

Editor/SnapZone/SnapZoneSettings.cs

@@ -31,24 +31,39 @@ public class SnapZoneSettings : ScriptableObject
        private Material highlightMaterial;

        /// <summary>
-        /// This color is used when an <see cref="InteractableObject"/> is hovering a <see cref="SnapZone"/>.
+        /// This color is used when a valid <see cref="InteractableObject"/> is hovering a <see cref="SnapZone"/>.


ValidationColor probably should be ValidColor since it is also InvalidColor.
Validation is the process and therefore could also be invalid in the end

should probably be that, but this is an api break :|

tomwim · 2020-09-01T07:41:22Z

Editor/SnapZone/SnapZoneSettings.cs

        /// <summary>
        /// The material used for drawing when an <see cref="InteractableObject"/> is hovering a <see cref="SnapZone"/>. Should be transparent.
        /// </summary>
        public Material HighlightMaterial => SetupHighlightMaterial();

        /// <summary>
-        /// The material used for the highlight object. Should be transparent.
+        /// The material used for the highlight object, when a valid object is hovering. Should be transparent.


Same as with the color -> ValidMaterial or IsValidMaterial

Runtime/Interaction/SnapZone.cs

feat(snapzones): added gizmo to snapzones feat(snapzones): automatically created snapzones only snap the correct object fix(snapzones): snapping not working correctly with offset items fix(snapzones): improved rendering of highlights for snapzones fix(snapzones): fast forward snappables now snap immediately (#44)

Gusinuhe

By the power vested in me, I now pronounce this PR, approved!

You may now merge the branch.

ci-innoactive · 2020-09-07T16:10:23Z

🎉 This PR is included in version 1.3.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

SimonTheSourcerer requested a review from Gusinuhe August 31, 2020 07:35

Gusinuhe suggested changes Aug 31, 2020

View reviewed changes

SimonTheSourcerer changed the title ~~Feature/visualizing snapzone conten in editor trng 1047~~ Feature/visualizing snapzone content in editor trng 1047 Aug 31, 2020

Gusinuhe suggested changes Aug 31, 2020

View reviewed changes

Editor/SnapZone/SnapZoneSettings.cs Outdated Show resolved Hide resolved

Runtime/Interaction/SnapZone.cs Outdated Show resolved Hide resolved

Gusinuhe reviewed Aug 31, 2020

View reviewed changes

aleksei-korolev previously approved these changes Aug 31, 2020

View reviewed changes

Gusinuhe mentioned this pull request Aug 31, 2020

fix: highlight object is now created rendering all sub meshes #48

Merged

1 task

tomwim suggested changes Sep 1, 2020

View reviewed changes

SimonTheSourcerer dismissed stale reviews from aleksei-korolev via e4c6613 September 1, 2020 08:29

SimonTheSourcerer force-pushed the feature/visualizing-snapzone-conten-in-editor-trng-1047 branch from e4c6613 to ca164d2 Compare September 1, 2020 08:36

SimonTheSourcerer force-pushed the feature/visualizing-snapzone-conten-in-editor-trng-1047 branch from ca164d2 to 1e5d783 Compare September 1, 2020 08:57

Gustavo Quiroz and others added 2 commits September 1, 2020 11:09

fix: highlight object is now created rendering all sub meshes

f03dad0

ci: fixed warning

4e2f55d

SimonTheSourcerer requested review from tomwim and Gusinuhe September 1, 2020 09:13

fix(snapzone): fixed in editor highlighter

732c93f

tomwim approved these changes Sep 1, 2020

View reviewed changes

Gusinuhe approved these changes Sep 1, 2020

View reviewed changes

Gusinuhe merged commit 054f2d6 into develop Sep 1, 2020

Gusinuhe deleted the feature/visualizing-snapzone-conten-in-editor-trng-1047 branch September 1, 2020 16:17

ci-innoactive added the released label Sep 7, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/visualizing snapzone content in editor trng 1047 #47

Feature/visualizing snapzone content in editor trng 1047 #47

SimonTheSourcerer commented Aug 31, 2020 •

edited

Loading

Gusinuhe left a comment

Gusinuhe Aug 31, 2020

Gusinuhe Aug 31, 2020

SimonTheSourcerer Aug 31, 2020

Gusinuhe Aug 31, 2020

Gusinuhe Aug 31, 2020

Gusinuhe left a comment

SimonTheSourcerer commented Aug 31, 2020

Gusinuhe Aug 31, 2020

aleksei-korolev Aug 31, 2020

aleksei-korolev commented Aug 31, 2020

Gusinuhe commented Aug 31, 2020 •

edited

Loading

Gusinuhe commented Aug 31, 2020

tomwim Sep 1, 2020

tomwim Sep 1, 2020

SimonTheSourcerer Sep 1, 2020

tomwim Sep 1, 2020

Gusinuhe left a comment

ci-innoactive commented Sep 7, 2020

Feature/visualizing snapzone content in editor trng 1047 #47

Feature/visualizing snapzone content in editor trng 1047 #47

Conversation

SimonTheSourcerer commented Aug 31, 2020 • edited Loading

Description

Type of change

How Has This Been Tested?

Gusinuhe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gusinuhe left a comment

Choose a reason for hiding this comment

SimonTheSourcerer commented Aug 31, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aleksei-korolev commented Aug 31, 2020

Gusinuhe commented Aug 31, 2020 • edited Loading

Gusinuhe commented Aug 31, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gusinuhe left a comment

Choose a reason for hiding this comment

ci-innoactive commented Sep 7, 2020

SimonTheSourcerer commented Aug 31, 2020 •

edited

Loading

Gusinuhe commented Aug 31, 2020 •

edited

Loading