Skip to content

Added missing ObjectManipulator components to scene descriptions #717

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+1,512 −13
Open

Added missing ObjectManipulator components to scene descriptions #717

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f8f4d1
Updated ObjectManipulator host transform in AudioOcclusionExample scene
BenediktTobias Apr 6, 2024
ea621cf
Added ObjectManipulator component to description in AudioLoFiExample …
BenediktTobias Apr 6, 2024
829b763
Added MinMaxScaleConstraint to description in AudioLoFiExample scene
BenediktTobias Apr 6, 2024
8d3c0dd
Added ObjectManipulator component to description in DialogExample scene
BenediktTobias Apr 6, 2024
9791da6
Added ObjectManipulator component to description in NonCanvasDialogEx…
BenediktTobias Apr 6, 2024
1428392
Added ObjectManipulator component to description in SpatialMappingExa…
BenediktTobias Apr 6, 2024
e74414a
Added ObjectManipulator component to description in ToggleCollectionE…
BenediktTobias Apr 6, 2024
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
290 changes: 290 additions & 0 deletions UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity
View file
Original file line number Diff line number Diff line change
@@ -987,6 +987,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3}
--- !u!114 &525252188 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3}
m_PrefabInstance: {fileID: 525252187}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &562708120
GameObject:
m_ObjectHideFlags: 0
@@ -2019,6 +2030,10 @@ GameObject:
- component: {fileID: 1170623173}
- component: {fileID: 1170623176}
- component: {fileID: 1170623175}
- component: {fileID: 1170623179}
- component: {fileID: 1170623178}
- component: {fileID: 1170623177}
- component: {fileID: 1170623180}
m_Layer: 0
m_Name: EffectControls
m_TagString: Untagged
@@ -2091,6 +2106,281 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &1170623177
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170623172}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 525252188}
m_Colliders:
- {fileID: 1170623179}
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_DistanceCalculationMode: 1
m_SelectMode: 1
m_CustomReticle: {fileID: 0}
m_AllowGazeInteraction: 0
m_AllowGazeSelect: 0
m_OverrideGazeTimeToSelect: 0
m_GazeTimeToSelect: 0.5
m_OverrideTimeToAutoDeselectGaze: 0
m_TimeToAutoDeselectGaze: 3
m_AllowGazeAssistance: 0
m_FirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_LastHoverExited:
m_PersistentCalls:
m_Calls: []
m_HoverEntered:
m_PersistentCalls:
m_Calls: []
m_HoverExited:
m_PersistentCalls:
m_Calls: []
m_FirstSelectEntered:
m_PersistentCalls:
m_Calls: []
m_LastSelectExited:
m_PersistentCalls:
m_Calls: []
m_SelectEntered:
m_PersistentCalls:
m_Calls: []
m_SelectExited:
m_PersistentCalls:
m_Calls: []
m_Activated:
m_PersistentCalls:
m_Calls: []
m_Deactivated:
m_PersistentCalls:
m_Calls: []
m_StartingHoverFilters: []
m_StartingSelectFilters: []
m_StartingInteractionStrengthFilters: []
m_OnFirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectEntered:
m_PersistentCalls:
m_Calls: []
m_OnSelectExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectCanceled:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
isGazePinchSelected:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isRaySelected:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isPokeSelected:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isGrabSelected:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isGazeHovered:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isGazePinchHovered:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isRayHovered:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isGrabHovered:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isPokeHovered:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
isActiveHovered:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
disabledInteractorTypes:
- reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core
<ToggleMode>k__BackingField: 0
<SelectThreshold>k__BackingField: 0.9
<DeselectThreshold>k__BackingField: 0.1
<TriggerOnRelease>k__BackingField: 1
<UseGazeDwell>k__BackingField: 0
<GazeDwellTime>k__BackingField: 1
<UseFarDwell>k__BackingField: 0
<FarDwellTime>k__BackingField: 1
allowSelectByVoice: 1
speechRecognitionKeyword: select
<VoiceRequiresFocus>k__BackingField: 1
<SelectRequiresHover>k__BackingField: 0
<IsToggled>k__BackingField:
active: 0
onEntered:
m_PersistentCalls:
m_Calls: []
onExited:
m_PersistentCalls:
m_Calls: []
<OnClicked>k__BackingField:
m_PersistentCalls:
m_Calls: []
<OnEnabled>k__BackingField:
m_PersistentCalls:
m_Calls: []
<OnDisabled>k__BackingField:
m_PersistentCalls:
m_Calls: []
hostTransform: {fileID: 491858691}
allowedManipulations: 7
allowedInteractionTypes: -2147483641
rigidbodyMovementType: 0
applyTorque: 1
springForceSoftness: 0.1
springTorqueSoftness: 0.1
springDamping: 1
springForceLimit: 100
rotationAnchorNear: 1
rotationAnchorFar: 1
releaseBehavior: 3
transformSmoothingLogicType:
reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic,
MixedReality.Toolkit.SpatialManipulation
smoothingFar: 1
smoothingNear: 1
moveLerpTime: 0.001
rotateLerpTime: 0.001
scaleLerpTime: 0.001
enableConstraints: 1
constraintsManager: {fileID: 0}
manipulationLogicTypes:
moveLogicType:
reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation
rotateLogicType:
reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation
scaleLogicType:
reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation
--- !u!114 &1170623178
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170623172}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3}
m_Name:
m_EditorClassIdentifier:
autoConstraintSelection: 1
selectedConstraints: []
--- !u!65 &1170623179
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170623172}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 322, y: 341, z: 2}
m_Center: {x: 0, y: -12.5, z: 1}
--- !u!114 &1170623180
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170623172}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3}
m_Name:
m_EditorClassIdentifier:
handType: 3
proximityType: 3
executionOrder: 0
minimumScale: {x: 0.2, y: 0.2, z: 0.2}
maximumScale: {x: 2, y: 2, z: 2}
relativeToInitialState: 1
--- !u!1 &1231290231
GameObject:
m_ObjectHideFlags: 0
2 changes: 1 addition & 1 deletion UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity
View file
Original file line number Diff line number Diff line change
@@ -1751,7 +1751,7 @@ MonoBehaviour:
<OnDisabled>k__BackingField:
m_PersistentCalls:
m_Calls: []
hostTransform: {fileID: 1966272100}
hostTransform: {fileID: 1918790412}
allowedManipulations: 7
allowedInteractionTypes: -1
applyTorque: 1
Loading