From d85953e02f699d1b04655d096ddee30c6e82f2bb Mon Sep 17 00:00:00 2001 From: henrisel Date: Thu, 12 Mar 2026 16:10:49 +0200 Subject: [PATCH] radio button is pressable only when radio is held --- 3d-generation-pipeline/README.md | 3 +-- Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset | 4 ++-- Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset | 4 ++-- .../ModeGeneration/ShapeDetection/RadioTransmitter.cs | 6 ++++++ .../ShapeDetection/TwoHandsScaleGrabInteractable.cs | 1 - 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 36bca1e8..1ffabdba 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -12,15 +12,14 @@ * klaas on näha temast eespool * shape detection: * professor võiks suu ees hoida samasugust raadiot - * seest tühi shape config liiga raske, sest printer unreliable? * professor võiks öelda "good job, continue..." pärast esimest successi * kui kõik configurationid tehtud, siis professor ütleb "thank you" * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte * prinditud objekti scale'imisele min ja max size limiit * soft particle'id, et ei clipiks - * raadio krabamisega aktiveeritakse ka nupp * kui lased lahti raadio nupu, siis inputti enam juurde ei lasta * uks võiks käia ainult väljapoole + * seest tühi shape config liiga raske, sest printer unreliable? * 5 configit piisavalt * archery range: * particle'id aeglasemaks, laiemas kaares, võiksid kiiremini ära lõppeda ja väiksemad diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset index b0f06c87..7605eefb 100644 --- a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset +++ b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fb0c3297e298f1b179cf77780b6a3d5e936a841c0a3b72c034a8e45ce8c90ba -size 2722615 +oid sha256:6421dc9247d0a59f310e520c8d2faff42a6963868f92dd5d6a8c19e101d2341e +size 2699147 diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset index 88277585..67c42292 100644 --- a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset +++ b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad3c6c7e20181760c7a5f1046e40ce735ec9b49e60a1468eb491eba0833a206c -size 2144833 +oid sha256:e7b93b54901e7d731e6e381bae63b627626f44e22fbead4f41ce56cedaf44603 +size 2120747 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/RadioTransmitter.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/RadioTransmitter.cs index 4d6bae4c..00538023 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/RadioTransmitter.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/RadioTransmitter.cs @@ -54,6 +54,12 @@ public class RadioTransmitter : XRGrabInteractable radioButton.Unlock(); } + protected override void OnSelectExited(SelectExitEventArgs args) + { + base.OnSelectExited(args); + radioButton.Lock(); + } + private void OnRadioButtonPressed() { AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.RadioButton, gameObject); diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/TwoHandsScaleGrabInteractable.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/TwoHandsScaleGrabInteractable.cs index 1805473d..039e0f27 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/TwoHandsScaleGrabInteractable.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ShapeDetection/TwoHandsScaleGrabInteractable.cs @@ -32,7 +32,6 @@ public class TwoHandScaleGrabInteractable : XRGrabInteractable protected override void OnSelectExited(SelectExitEventArgs args) { - Debug.Log("current local scale: " + transform.localScale); base.OnSelectExited(args); UpdateTwoHandState(); }