UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-22 15:18:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into feature/MAVRIC-2181-hands

Browse Source
This commit is contained in:
Joshua Latham 2023-11-10 16:58:29 -05:00
commit 96a98fbe03
39 changed files with 1688 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

237
Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab
View File

@ -260,6 +260,9 @@ GameObject:
- component: {fileID: 5236466170488912795}
- component: {fileID: 8136670427705346541}
- component: {fileID: 2897259354266345947}
- component: {fileID: 1280075286638713478}
- component: {fileID: 7870551422755492877}
- component: {fileID: 3540580792236698558}
m_Layer: 0
m_Name: Clip
m_TagString: Untagged
@ -333,6 +336,206 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &1280075286638713478
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1182665900626322174}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0006995102, y: 0.00040441856, z: 0.00021432019}
m_Center: {x: -0.000004023314, y: 0.0000000016229773, z: 0.00004916335}
--- !u!54 &7870551422755492877
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1182665900626322174}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &3540580792236698558
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1182665900626322174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders: []
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 17
m_DistanceCalculationMode: 1
m_SelectMode: 0
m_FocusMode: 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_FirstFocusEntered:
m_PersistentCalls:
m_Calls: []
m_LastFocusExited:
m_PersistentCalls:
m_Calls: []
m_FocusEntered:
m_PersistentCalls:
m_Calls: []
m_FocusExited:
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: []
m_AttachTransform: {fileID: 0}
m_SecondaryAttachTransform: {fileID: 0}
m_UseDynamicAttach: 0
m_MatchAttachPosition: 1
m_MatchAttachRotation: 1
m_SnapToColliderVolume: 1
m_ReinitializeDynamicAttachEverySingleGrab: 1
m_AttachEaseInTime: 0.15
m_MovementType: 2
m_VelocityDamping: 1
m_VelocityScale: 1
m_AngularVelocityDamping: 1
m_AngularVelocityScale: 1
m_TrackPosition: 1
m_SmoothPosition: 0
m_SmoothPositionAmount: 8
m_TightenPosition: 0.1
m_TrackRotation: 1
m_SmoothRotation: 0
m_SmoothRotationAmount: 8
m_TightenRotation: 0.1
m_TrackScale: 0
m_SmoothScale: 0
m_SmoothScaleAmount: 8
m_TightenScale: 0.1
m_ThrowOnDetach: 0
m_ThrowSmoothingDuration: 0.25
m_ThrowSmoothingCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 1
m_ForceGravityOnDetach: 0
m_RetainTransformParent: 1
m_AttachPointCompatibilityMode: 0
m_StartingSingleGrabTransformers: []
m_StartingMultipleGrabTransformers: []
m_AddDefaultGrabTransformers: 1
--- !u!1 &1360195127966810115
GameObject:
m_ObjectHideFlags: 0
@ -1343,8 +1546,8 @@ Rigidbody:
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!59 &3414920703166708064
@ -1357,9 +1560,9 @@ HingeJoint:
m_ConnectedBody: {fileID: 0}
m_ConnectedArticulationBody: {fileID: 0}
m_Anchor: {x: 0, y: 0, z: 0}
m_Axis: {x: 1, y: 0, z: 0}
m_Axis: {x: -1, y: 0, z: 0}
m_AutoConfigureConnectedAnchor: 1
m_ConnectedAnchor: {x: -0.1585, y: 0.228, z: -0.0204}
m_ConnectedAnchor: {x: 0.44860125, y: 1.1474999, z: 3.1980007}
serializedVersion: 2
m_UseSpring: 0
m_Spring:
@ -1371,14 +1574,14 @@ HingeJoint:
targetVelocity: 0
force: 0
freeSpin: 0
m_UseLimits: 0
m_UseLimits: 1
m_ExtendedLimits: 0
m_UseAcceleration: 0
m_Limits:
min: -86
max: 86
min: 0
max: 180
bounciness: 0
bounceMinVelocity: 0.2
bounceMinVelocity: 0
contactDistance: 0
m_BreakForce: Infinity
m_BreakTorque: Infinity
@ -1425,7 +1628,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_Bits: 3
m_DistanceCalculationMode: 1
m_SelectMode: 0
m_FocusMode: 1
@ -1526,7 +1729,7 @@ MonoBehaviour:
m_SmoothPosition: 0
m_SmoothPositionAmount: 8
m_TightenPosition: 0.1
m_TrackRotation: 1
m_TrackRotation: 0
m_SmoothRotation: 0
m_SmoothRotationAmount: 8
m_TightenRotation: 0.1
@ -2399,8 +2602,8 @@ Rigidbody:
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &9126189417414843225
@ -2513,7 +2716,7 @@ MonoBehaviour:
m_SnapToColliderVolume: 1
m_ReinitializeDynamicAttachEverySingleGrab: 1
m_AttachEaseInTime: 0.15
m_MovementType: 2
m_MovementType: 1
m_VelocityDamping: 1
m_VelocityScale: 1
m_AngularVelocityDamping: 1
@ -2861,8 +3064,8 @@ Rigidbody:
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &8710816239888859076
@ -2883,7 +3086,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_Bits: 9
m_DistanceCalculationMode: 1
m_SelectMode: 0
m_FocusMode: 1
@ -2975,7 +3178,7 @@ MonoBehaviour:
m_SnapToColliderVolume: 1
m_ReinitializeDynamicAttachEverySingleGrab: 1
m_AttachEaseInTime: 0.15
m_MovementType: 2
m_MovementType: 1
m_VelocityDamping: 1
m_VelocityScale: 1
m_AngularVelocityDamping: 1

2
Assets/Plugins.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ba0e56aa5724942c2b9bcea33d230c4f
guid: 65c18d699fcadad459bc3e16558c2bd2
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Plugins/Sirenix.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3696afdc79e544cea864847b400c1125
guid: 7db84c72b2408b24da5a225550b562ff
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Plugins/Sirenix/Assemblies.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 81983da9b04f8436fb81c6b09d73f381
guid: 05b1eef81f23d6648992c93437892982
folderAsset: yes
DefaultImporter:
externalObjects: {}

2
Assets/Plugins/Sirenix/Assemblies/NoEditor.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 53eaaac0920274cb5ac6324e9403cc6c
guid: aa3dc305dd00dad49bbc1ff3996b055d
folderAsset: yes
DefaultImporter:
externalObjects: {}

BIN
Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll
View File

Binary file not shown.

2
Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4fd2b034e15dc427c8fd5de5c0d1e4a2
guid: a73a691127ad93941b89586292291dab
folderAsset: yes
DefaultImporter:
externalObjects: {}

BIN
Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Attributes.dll
View File

Binary file not shown.

190
Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Attributes.xml
View File

@ -1234,6 +1234,11 @@
<para>Note that this attribute does not mean "disable Odin completely for this property"; it is visual only in nature, and in fact represents an Odin drawer which calls into Unity's old property drawing system. As Odin is still ultimately responsible for arranging the drawing of the property, and since other attributes exist with a higher priority than this attribute, and it is not guaranteed that Unity will draw the property if another attribute is present to override this one.</para>
</remarks>
</member>
<member name="T:Sirenix.OdinInspector.DrawWithVisualElementsAttribute">
<summary>
Force Odin to draw this value as an IMGUI-embedded UI Toolkit Visual Element.
</summary>
</member>
<member name="T:Sirenix.OdinInspector.EnableGUIAttribute">
<summary>
<para>An attribute that enables GUI.</para>
@ -1382,55 +1387,55 @@
<seealso cref="T:System.Attribute" />
</member>
<member name="T:Sirenix.OdinInspector.FilePathAttribute">
<summary>
<para>FilePath is used on string properties, and provides an interface for file paths.</para>
</summary>
<example>
<para>The following example demonstrates how FilePath is used.</para>
<code>
public class FilePathExamples : MonoBehaviour
{
// By default, FilePath provides a path relative to the Unity project.
[FilePath]
public string UnityProjectPath;
<summary>
<para>FilePath is used on string properties, and provides an interface for file paths.</para>
</summary>
<example>
<para>The following example demonstrates how FilePath is used.</para>
<code>
public class FilePathExamples : MonoBehaviour
{
// By default, FilePath provides a path relative to the Unity project.
[FilePath]
public string UnityProjectPath;
// It is possible to provide custom parent path. Parent paths can be relative to the Unity project, or absolute.
[FilePath(ParentFolder = "Assets/Plugins/Sirenix")]
public string RelativeToParentPath;
// It is possible to provide custom parent path. Parent paths can be relative to the Unity project, or absolute.
[FilePath(ParentFolder = "Assets/Plugins/Sirenix")]
public string RelativeToParentPath;
// Using parent path, FilePath can also provide a path relative to a resources folder.
[FilePath(ParentFolder = "Assets/Resources")]
public string ResourcePath;
// Using parent path, FilePath can also provide a path relative to a resources folder.
[FilePath(ParentFolder = "Assets/Resources")]
public string ResourcePath;
// Provide a comma seperated list of allowed extensions. Dots are optional.
[FilePath(Extensions = "cs")]
public string ScriptFiles;
// Provide a comma seperated list of allowed extensions. Dots are optional.
[FilePath(Extensions = "cs")]
public string ScriptFiles;
// By setting AbsolutePath to true, the FilePath will provide an absolute path instead.
[FilePath(AbsolutePath = true)]
[BoxGroup("Conditions")]
public string AbsolutePath;
// By setting AbsolutePath to true, the FilePath will provide an absolute path instead.
[FilePath(AbsolutePath = true)]
[BoxGroup("Conditions")]
public string AbsolutePath;
// FilePath can also be configured to show an error, if the provided path is invalid.
[FilePath(RequireValidPath = true)]
public string ValidPath;
// FilePath can also be configured to show an error, if the provided path is invalid.
[FilePath(RequireValidPath = true)]
public string ValidPath;
// By default, FilePath will enforce the use of forward slashes. It can also be configured to use backslashes instead.
[FilePath(UseBackslashes = true)]
public string Backslashes;
// By default, FilePath will enforce the use of forward slashes. It can also be configured to use backslashes instead.
[FilePath(UseBackslashes = true)]
public string Backslashes;
// FilePath also supports member references with the $ symbol.
[FilePath(ParentFolder = "$DynamicParent", Extensions = "$DynamicExtensions")]
public string DynamicFilePath;
// FilePath also supports member references with the $ symbol.
[FilePath(ParentFolder = "$DynamicParent", Extensions = "$DynamicExtensions")]
public string DynamicFilePath;
public string DynamicParent = "Assets/Plugin/Sirenix";
public string DynamicParent = "Assets/Plugin/Sirenix";
public string DynamicExtensions = "cs, unity, jpg";
}
</code>
</example>
<seealso cref="T:Sirenix.OdinInspector.FolderPathAttribute"/>
<seealso cref="T:Sirenix.OdinInspector.DisplayAsStringAttribute"/>
public string DynamicExtensions = "cs, unity, jpg";
}
</code>
</example>
<seealso cref="T:Sirenix.OdinInspector.FolderPathAttribute"/>
<seealso cref="T:Sirenix.OdinInspector.DisplayAsStringAttribute"/>
</member>
<member name="F:Sirenix.OdinInspector.FilePathAttribute.AbsolutePath">
<summary>
@ -1464,6 +1469,11 @@
By default FilePath enforces forward slashes. Set UseBackslashes to <c>true</c> if you want backslashes instead.
</summary>
</member>
<member name="F:Sirenix.OdinInspector.FilePathAttribute.IncludeFileExtension">
<summary>
If <c>true</c> the file path will include the file's extension.
</summary>
</member>
<member name="P:Sirenix.OdinInspector.FilePathAttribute.ReadOnly">
<summary>
Gets or sets a value indicating whether the path should be read only.
@ -5068,6 +5078,30 @@
If true, tables are drawn with rows/columns reversed (C# initialization order).
</summary>
</member>
<member name="F:Sirenix.OdinInspector.TableMatrixAttribute.Labels">
<summary>
A resolved string that should evaluate to a tuple (string, LabelDirection) which will be used as the label for the rows and columns of the table.
</summary>
<code>
[TableMatrix(SquareCells = true, Labels = "GetLabel")]
public int[,] ChessBoard = new int[8, 8];
private (string, LabelDirection) GetLabel(int[,] array, TableAxis axis, int index)
{
var chessFileLetters = "ABCDEFGH";
switch (axis)
{
case TableAxis.Y:
return ((array.GetLength(1) - index).ToString(), LabelDirection.LeftToRight);
case TableAxis.X:
return (chessFileLetters[index].ToString(), LabelDirection.TopToBottom);
default:
return (index.ToString(), LabelDirection.LeftToRight);
}
}
</code>
</member>
<member name="T:Sirenix.OdinInspector.TitleAttribute">
<summary>
<para>Title is used to make a bold header above a property.</para>
@ -5419,6 +5453,82 @@
</summary>
<param name="message">The message to display in the info box.</param>
</member>
<!-- Badly formed XML comment ignored for member "T:Sirenix.OdinInspector.UnitAttribute" -->
<member name="F:Sirenix.OdinInspector.UnitAttribute.Base">
<summary>
The unit of underlying value.
</summary>
</member>
<member name="F:Sirenix.OdinInspector.UnitAttribute.Display">
<summary>
The unit displayed in the number field.
</summary>
</member>
<member name="F:Sirenix.OdinInspector.UnitAttribute.BaseName">
<summary>
Name of the underlying unit.
</summary>
</member>
<member name="F:Sirenix.OdinInspector.UnitAttribute.DisplayName">
<summary>
Name of the unit displayed in the number field.
</summary>
</member>
<member name="F:Sirenix.OdinInspector.UnitAttribute.DisplayAsString">
<summary>
If <c>true</c> the number field is drawn as read-only text.
</summary>
</member>
<member name="F:Sirenix.OdinInspector.UnitAttribute.ForceDisplayUnit">
<summary>
If <c>true</c> disables the option to change display unit with the right-click context menu.
</summary>
</member>
<member name="M:Sirenix.OdinInspector.UnitAttribute.#ctor(Sirenix.OdinInspector.Units)">
<summary>
Displays the number as a unit field.
</summary>
<param name="unit">The unit of underlying value.</param>
</member>
<member name="M:Sirenix.OdinInspector.UnitAttribute.#ctor(System.String)">
<summary>
Displays the number as a unit field.
</summary>
<param name="unit">The name of the underlying value.</param>
</member>
<member name="M:Sirenix.OdinInspector.UnitAttribute.#ctor(Sirenix.OdinInspector.Units,Sirenix.OdinInspector.Units)">
<summary>
Displays the number as a unit field.
</summary>
<param name="base">The unit of underlying value.</param>
<param name="display">The unit to display the value as in the inspector.</param>
</member>
<member name="M:Sirenix.OdinInspector.UnitAttribute.#ctor(Sirenix.OdinInspector.Units,System.String)">
<summary>
Displays the number as a unit field.
</summary>
<param name="base">The unit of underlying value.</param>
<param name="display">The unit to display the value as in the inspector.</param>
</member>
<member name="M:Sirenix.OdinInspector.UnitAttribute.#ctor(System.String,Sirenix.OdinInspector.Units)">
<summary>
Displays the number as a unit field.
</summary>
<param name="base">The unit of underlying value.</param>
<param name="display">The unit to display the value as in the inspector.</param>
</member>
<member name="M:Sirenix.OdinInspector.UnitAttribute.#ctor(System.String,System.String)">
<summary>
Displays the number as a unit field.
</summary>
<param name="base">The unit of underlying value.</param>
<param name="display">The unit to display the value as in the inspector.</param>
</member>
<member name="T:Sirenix.OdinInspector.Units">
<summary>
Units for use with <see cref="T:Sirenix.OdinInspector.UnitAttribute"/> and <see cref="!:Sirenix.Utilities.Editor.UnitNumberUtility"/>.
</summary>
</member>
<member name="T:Sirenix.OdinInspector.ValidateInputAttribute">
<summary>
<para>ValidateInput is used on any property, and allows to validate input from inspector.</para>

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Editor.dll
View File

Binary file not shown.

9
Assets/Plugins/Sirenix/Assemblies/Sirenix.OdinInspector.Editor.xml
View File

@ -259,6 +259,11 @@
</para>
</summary>
</member>
<member name="P:Sirenix.OdinInspector.Editor.GeneralDrawerConfig.EnableUIToolkitSupport">
<summary>
Specify whether or not the script selector above components should be drawn.
</summary>
</member>
<member name="P:Sirenix.OdinInspector.Editor.GeneralDrawerConfig.ShowMonoScriptInEditor">
<summary>
Specify whether or not the script selector above components should be drawn.
@ -8497,7 +8502,7 @@
Draws the menu tree selection.
</summary>
</member>
<member name="M:Sirenix.OdinInspector.Editor.OdinMenuEditorWindow.OnGUI">
<member name="M:Sirenix.OdinInspector.Editor.OdinMenuEditorWindow.OnImGUI">
<summary>
Draws the Odin Editor Window.
</summary>
@ -10855,7 +10860,7 @@
Opens a new static inspector window for the given type.
</summary>
</member>
<member name="M:Sirenix.OdinInspector.Editor.StaticInspectorWindow.OnGUI">
<member name="M:Sirenix.OdinInspector.Editor.StaticInspectorWindow.OnImGUI">
<summary>
Draws the Odin Editor Window.
</summary>

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.Reflection.Editor.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.Editor.dll
View File

Binary file not shown.

1082
Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.Editor.xml
View File

File diff suppressed because it is too large Load Diff

BIN
Assets/Plugins/Sirenix/Assemblies/Sirenix.Utilities.dll
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage
View File

Binary file not shown.

BIN
Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage
View File

Binary file not shown.

2
Assets/Plugins/Sirenix/Odin Inspector.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4340c7ffa08434709b99aaf311aefcd6
guid: fe4970195facd664dbd38d1cbf2100c3
folderAsset: yes
DefaultImporter:
externalObjects: {}

20
Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset
View File

@ -1,20 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1726182683, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
m_Name: AOTGenerationConfig
m_EditorClassIdentifier:
automateBeforeBuilds: 0
deleteDllAfterBuilds: 1
AutomateForAllAOTPlatforms: 1
automateForPlatforms: 0900000014000000
lastScan: 0
supportSerializedTypes: []

1
Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GeneralDrawerConfig.asset
View File

@ -12,3 +12,4 @@ MonoBehaviour:
m_Script: {fileID: -645759843, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
m_Name: GeneralDrawerConfig
m_EditorClassIdentifier:
enableUIToolkitSupport: 1

15
Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset
View File

@ -1,15 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 188390376, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
m_Name: ImportSettingsConfig
m_EditorClassIdentifier:
automateBeforeBuild: 1

6
Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ImportSettingsConfig.asset.meta → Assets/Plugins/Sirenix/Odin Inspector/Config/Resources.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 4df726f51b86f524c9f1d759a23e5e1e
NativeFormatImporter:
guid: 06633d0f71b598b41a37f0da7ed51ca7
folderAsset: yes
DefaultImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6410370621ea2d64a976f4fff9645d25
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1549551891, guid: 74721b9f0af448f5ae2e91102a1a5edd, type: 3}
m_Name: GlobalSerializationConfig
m_EditorClassIdentifier:
HideSerializationCautionaryMessage: 0
HidePrefabCautionaryMessage: 0
HideOdinSerializeAttributeWarningMessages: 0
HideNonSerializedShowInInspectorWarningMessages: 0
buildSerializationFormat: 0
editorSerializationFormat: 2
loggingPolicy: 0
errorHandlingPolicy: 0

2
Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset.meta → Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fc14715cef693484e91049b4d84d8406
guid: 621781e0c1e759848997a7462862fb30
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

2
Assets/Plugins/Sirenix/Odin Inspector/Modules.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 27b21c1af4b544c76b31964cb02f972c
guid: 356a67db9bc6244428bcd2aad1eefbda
folderAsset: yes
DefaultImporter:
externalObjects: {}

BIN
Assets/Plugins/Sirenix/Odin Inspector/Modules/Unity.Addressables.data
View File

Binary file not shown.

502
Assets/Prefabs/Cartridge-Interactable.prefab
View File

@ -52,9 +52,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 451147257670573576}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRSocketInteractorFilter,
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -67,7 +67,7 @@ MonoBehaviour:
- m_Target: {fileID: 3774238497440674398}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -114,7 +114,7 @@ MonoBehaviour:
- m_Target: {fileID: 3774238497440674398}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -263,8 +263,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &2737193980852221215
MonoBehaviour:
m_ObjectHideFlags: 0
@ -424,7 +424,7 @@ MonoBehaviour:
m_InteractableHoverMeshMaterial: {fileID: 0}
m_InteractableCantHoverMeshMaterial: {fileID: 0}
m_SocketActive: 1
m_InteractableHoverScale: 1
m_InteractableHoverScale: 1.1
m_RecycleDelayTime: 1
m_HoverSocketSnapping: 0
m_SocketSnappingRadius: 0.1
@ -443,8 +443,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &6222311094814769827
MonoBehaviour:
m_ObjectHideFlags: 0
@ -582,9 +582,9 @@ MonoBehaviour:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 5399462717350305253}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRSocketInteractorFilter,
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -597,7 +597,7 @@ MonoBehaviour:
- m_Target: {fileID: 8075794149781177989}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -642,7 +642,7 @@ MonoBehaviour:
- m_Target: {fileID: 8075794149781177989}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -687,7 +687,7 @@ MonoBehaviour:
- m_Target: {fileID: 8075794149781177989}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -775,7 +775,7 @@ MonoBehaviour:
- m_Target: {fileID: 3970644888107419690}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -827,8 +827,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8069852317492100785}
- component: {fileID: 6824668403049178182}
- component: {fileID: 3895941486496572692}
- component: {fileID: 6824668403049178182}
- component: {fileID: 2572485284290775642}
- component: {fileID: 4372263260855305159}
m_Layer: 0
@ -853,20 +853,6 @@ Transform:
m_Children: []
m_Father: {fileID: 4999396423817038611}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6824668403049178182
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2125079628016757550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
--- !u!114 &3895941486496572692
MonoBehaviour:
m_ObjectHideFlags: 0
@ -927,6 +913,20 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!114 &6824668403049178182
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2125079628016757550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &2572485284290775642
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1227,9 +1227,9 @@ MonoBehaviour:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 629311655103251361}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRSocketInteractorFilter,
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -1242,7 +1242,7 @@ MonoBehaviour:
- m_Target: {fileID: 8138633126094991808}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -1276,9 +1276,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3}
m_Name:
m_EditorClassIdentifier:
description: what to do on the next step
description: what to do on the step after next (forgot to remove the plug when
replacing the tape)
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: f06581b6a2676704cbac6d816ed881e1, type: 2}
focusStep: {fileID: 11400000, guid: 8f01251921d0b0841b8ec39df16747b7, type: 2}
focusResponse:
m_PersistentCalls:
m_Calls:
@ -1298,7 +1299,7 @@ MonoBehaviour:
- m_Target: {fileID: 8138633126094991808}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -1397,7 +1398,7 @@ MonoBehaviour:
m_InteractableHoverMeshMaterial: {fileID: 0}
m_InteractableCantHoverMeshMaterial: {fileID: 0}
m_SocketActive: 0
m_InteractableHoverScale: 1
m_InteractableHoverScale: 1.1
m_RecycleDelayTime: 1
m_HoverSocketSnapping: 0
m_SocketSnappingRadius: 0.1
@ -1416,8 +1417,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &6089482281729606390
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1596,8 +1597,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &5638705141534915174
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1759,8 +1760,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9049674868906666110}
- component: {fileID: 5399462717350305253}
- component: {fileID: 4922499876124057319}
- component: {fileID: 5399462717350305253}
- component: {fileID: 2699399988459098154}
- component: {fileID: 2628139407165235555}
m_Layer: 0
@ -1785,20 +1786,6 @@ Transform:
m_Children: []
m_Father: {fileID: 4999396423817038611}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5399462717350305253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4630323535086491078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
--- !u!114 &4922499876124057319
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1859,6 +1846,20 @@ MonoBehaviour:
m_SocketScaleMode: 0
m_FixedScale: {x: 1, y: 1, z: 1}
m_TargetBoundsSize: {x: 1, y: 1, z: 1}
--- !u!114 &5399462717350305253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4630323535086491078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &2699399988459098154
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2131,7 +2132,7 @@ MonoBehaviour:
- m_Target: {fileID: 2255873961767694670}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -2162,7 +2163,7 @@ MonoBehaviour:
- m_Target: {fileID: 2255873961767694670}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -2304,8 +2305,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &8304860850689742517
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2471,8 +2472,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00595e96a5ebe674fa2da9cf41a3c0f7, type: 3}
m_Name:
m_EditorClassIdentifier:
m_interactor: {fileID: 0}
m_locked: 1
interactor: {fileID: 0}
isLocked: 1
--- !u!114 &2491457592659407591
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2707,6 +2708,7 @@ GameObject:
- component: {fileID: 1867453558314140561}
- component: {fileID: 1843896569723968833}
- component: {fileID: 1461544611288019900}
- component: {fileID: 2925320785566923659}
m_Layer: 0
m_Name: FlipArm
m_TagString: Untagged
@ -2750,7 +2752,20 @@ MonoBehaviour:
- m_Target: {fileID: 9216550692661000586}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 8115251326410904405}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -2791,7 +2806,20 @@ MonoBehaviour:
focusStep: {fileID: 11400000, guid: 41578b197ccb3f647b4025e8dafa94df, type: 2}
focusResponse:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 8115251326410904405}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &1461544611288019900
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2824,9 +2852,9 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 8115251326410904405}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRSocketInteractorFilter,
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -2839,7 +2867,7 @@ MonoBehaviour:
- m_Target: {fileID: 9216550692661000586}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter,
Assembly-CSharp
m_MethodName: set_locked
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
@ -2862,6 +2890,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 455284171443377540}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 6089482281729606390}
m_TargetAssemblyTypeName: ManualInteractionEvents, Assembly-CSharp
m_MethodName: AddListeners
@ -2874,6 +2915,37 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &2925320785566923659
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7777264654014326042}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b475c9cc9b3efa4a8b68f22256096d6, type: 3}
m_Name:
m_EditorClassIdentifier:
description: Final Final Step
channel: {fileID: 11400000, guid: d1c3fee5a7e29bf49b295b270071caac, type: 2}
focusStep: {fileID: 11400000, guid: 81bccf987f6432e4996a24813147cbcb, type: 2}
focusResponse:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 455284171443377540}
m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractorLockingFilter,
Assembly-CSharp
m_MethodName: set_IsLocked
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!1 &8303585072692781810
GameObject:
m_ObjectHideFlags: 0
@ -3124,7 +3196,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactable: {fileID: 0}
m_locked: 1
isLocked: 1
--- !u!1 &8312664021365390521
GameObject:
m_ObjectHideFlags: 0
@ -3493,7 +3565,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactable: {fileID: 0}
m_locked: 1
isLocked: 1
--- !u!1001 &3316605137565340392
PrefabInstance:
m_ObjectHideFlags: 0
@ -3502,26 +3574,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6554210300994472440}
m_Modifications:
- target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Interpolate
value: 0
objectReference: {fileID: 0}
- target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -86
objectReference: {fileID: 0}
- target: {fileID: 1994594684026882957, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Constraints
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1994594684026882957, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Interpolate
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2477252259466568489, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -3590,38 +3646,6 @@ PrefabInstance:
propertyPath: m_Name
value: Cartridge_V3 Variant Interactable
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Axis.x
value: -1
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_UseLimits
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Limits.max
value: 180
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Limits.min
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_ConnectedAnchor.x
value: -1.8304616
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_ConnectedAnchor.y
value: 1.5814999
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_ConnectedAnchor.z
value: 2.3876
objectReference: {fileID: 0}
- target: {fileID: 3414920703166708064, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Limits.bounceMinVelocity
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Name
value: Flip_Pad_Pull_Out (Transform)
@ -3630,18 +3654,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7798793048474624085, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_Interpolate
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_MovementType
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_TrackRotation
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_VelocityScale
value: 0.1
@ -3658,18 +3674,10 @@ PrefabInstance:
propertyPath: m_DistanceCalculationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_InteractionLayers.m_Bits
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_DistanceCalculationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_InteractionLayers.m_Bits
value: 9
objectReference: {fileID: 0}
- target: {fileID: 8925856456829875478, guid: b27049639847946ddac425fa7721eb71, type: 3}
propertyPath: m_MovementType
value: 2
@ -3694,15 +3702,6 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 3299088965526146119}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
insertIndex: -1
addedObject: {fileID: 4595166388880541806}
- targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
insertIndex: -1
addedObject: {fileID: 4845629233216095973}
- targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
insertIndex: -1
addedObject: {fileID: 2244017144755370326}
- targetCorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
insertIndex: -1
addedObject: {fileID: 3774238497440674398}
@ -3729,6 +3728,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3819015551208540297, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2244017144755370326 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3540580792236698558, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498918534765473814}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &3161078843648604362 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3}
@ -3739,206 +3749,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1182665900626322174, guid: b27049639847946ddac425fa7721eb71, type: 3}
m_PrefabInstance: {fileID: 3316605137565340392}
m_PrefabAsset: {fileID: 0}
--- !u!65 &4595166388880541806
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498918534765473814}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.0006995102, y: 0.00040441856, z: 0.00021432019}
m_Center: {x: -0.000004023314, y: 0.0000000016229773, z: 0.00004916335}
--- !u!54 &4845629233216095973
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498918534765473814}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &2244017144755370326
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4498918534765473814}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders: []
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 17
m_DistanceCalculationMode: 0
m_SelectMode: 0
m_FocusMode: 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_FirstFocusEntered:
m_PersistentCalls:
m_Calls: []
m_LastFocusExited:
m_PersistentCalls:
m_Calls: []
m_FocusEntered:
m_PersistentCalls:
m_Calls: []
m_FocusExited:
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: []
m_AttachTransform: {fileID: 0}
m_SecondaryAttachTransform: {fileID: 0}
m_UseDynamicAttach: 0
m_MatchAttachPosition: 1
m_MatchAttachRotation: 1
m_SnapToColliderVolume: 1
m_ReinitializeDynamicAttachEverySingleGrab: 1
m_AttachEaseInTime: 0.15
m_MovementType: 2
m_VelocityDamping: 1
m_VelocityScale: 1
m_AngularVelocityDamping: 1
m_AngularVelocityScale: 1
m_TrackPosition: 1
m_SmoothPosition: 0
m_SmoothPositionAmount: 8
m_TightenPosition: 0.1
m_TrackRotation: 1
m_SmoothRotation: 0
m_SmoothRotationAmount: 8
m_TightenRotation: 0.1
m_TrackScale: 0
m_SmoothScale: 0
m_SmoothScaleAmount: 8
m_TightenScale: 0.1
m_ThrowOnDetach: 0
m_ThrowSmoothingDuration: 0.25
m_ThrowSmoothingCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 1
m_ForceGravityOnDetach: 0
m_RetainTransformParent: 1
m_AttachPointCompatibilityMode: 0
m_StartingSingleGrabTransformers: []
m_StartingMultipleGrabTransformers: []
m_AddDefaultGrabTransformers: 1
--- !u!114 &3774238497440674398
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3952,7 +3762,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactable: {fileID: 0}
m_locked: 1
isLocked: 1
--- !u!23 &4858649905186535133 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 7884561136558908469, guid: b27049639847946ddac425fa7721eb71, type: 3}
@ -3992,7 +3802,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactable: {fileID: 0}
m_locked: 1
isLocked: 1
--- !u!114 &6261687912628628780 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3}
@ -4022,7 +3832,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactable: {fileID: 0}
m_locked: 1
isLocked: 1
--- !u!1 &8905706300752561573 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3}
@ -4067,4 +3877,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
interactable: {fileID: 0}
m_locked: 1
isLocked: 1

37
Assets/Scripts/Interactions/Filters/XRInteractableFilter.cs → Assets/Scripts/Interactions/Filters/XRInteractableLockingFilter.cs
View File

@ -1,11 +1,12 @@
/// Traken from https://forum.unity.com/threads/how-to-prevent-interactable-from-being-selected-while-in-socket.1317246/#post-9101254
using UnityEngine.Assertions;
using UnityEngine.Serialization;
namespace UnityEngine.XR.Interaction.Toolkit.Filtering
{
[DisallowMultipleComponent]
public class XRInteractableFilter : MonoBehaviour, IXRHoverFilter, IXRSelectFilter
public class XRInteractableLockingFilter : MonoBehaviour, IXRHoverFilter, IXRSelectFilter
{
#region Fields
@ -13,14 +14,14 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
[SerializeField]
private XRBaseInteractable interactable;
[SerializeField]
private bool m_locked = false;
[FormerlySerializedAs("m_locked")] [SerializeField]
private bool isLocked = false;
#endregion
#region Properties
public bool locked { get => m_locked; set => m_locked = value; }
public bool IsLocked { get => isLocked; set => isLocked = value; }
public bool canProcess => true;
@ -36,32 +37,34 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
private void OnEnable()
{
interactable.selectEntered.AddListener(Socket_SelectEntered);
interactable.selectExited.AddListener(Socket_SelectExited);
AddFilters();
}
private void OnDisable()
{
interactable.selectEntered.RemoveListener(Socket_SelectEntered);
interactable.selectExited.RemoveListener(Socket_SelectExited);
RemoveFilters();
}
private void Socket_SelectEntered(SelectEnterEventArgs e)
private void AddFilters()
{
if (interactable == null)
return;
if (interactable == null) return;
// Add filter to interactable
interactable.startingHoverFilters.Add(this);
interactable.startingSelectFilters.Add(this);
// Make extra sure that the filter is added to the interactable
interactable.hoverFilters.Add(this);
interactable.selectFilters.Add(this);
}
private void Socket_SelectExited(SelectExitEventArgs e)
private void RemoveFilters()
{
if (interactable == null)
return;
if (interactable == null) return;
// Remove filter from interactable
interactable.startingHoverFilters.Remove(this);
interactable.startingSelectFilters.Remove(this);
interactable.hoverFilters.Remove(this);
interactable.selectFilters.Remove(this);
}
@ -81,7 +84,7 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
if (interactable == null)
return false;
return !m_locked;
return !isLocked;
}
#endregion

0
Assets/Scripts/Interactions/Filters/XRInteractableFilter.cs.meta → Assets/Scripts/Interactions/Filters/XRInteractableLockingFilter.cs.meta
View File

30
Assets/Scripts/Interactions/Filters/XRSocketFilter.cs → Assets/Scripts/Interactions/Filters/XRInteractorLockingFilter.cs
View File

@ -1,26 +1,28 @@
/// Traken from https://forum.unity.com/threads/how-to-prevent-interactable-from-being-selected-while-in-socket.1317246/#post-9101254
using UnityEngine.Assertions;
using UnityEngine.Serialization;
namespace UnityEngine.XR.Interaction.Toolkit.Filtering
{
[DisallowMultipleComponent]
public class XRSocketInteractorFilter : MonoBehaviour, IXRHoverFilter, IXRSelectFilter
public class XRInteractorLockingFilter : MonoBehaviour, IXRHoverFilter, IXRSelectFilter
{
#region Fields
[FormerlySerializedAs("m_interactor")]
[Tooltip("The interactor that this filter is associated with. If none, will attempt to find on self.")]
[SerializeField]
private XRSocketInteractor m_interactor;
private XRBaseInteractor interactor;
[SerializeField]
private bool m_locked = false;
[FormerlySerializedAs("locked")] [SerializeField]
private bool isLocked = false;
#endregion
#region Properties
public bool locked { get => m_locked; set => m_locked = value; }
public bool IsLocked { get => isLocked; set => isLocked = value; }
public bool canProcess => true;
@ -30,20 +32,20 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
private void Awake()
{
m_interactor = m_interactor ? m_interactor : GetComponent<XRSocketInteractor>();
Assert.IsNotNull(m_interactor);
interactor = interactor ? interactor : GetComponent<XRBaseInteractor>();
Assert.IsNotNull(interactor);
}
private void OnEnable()
{
m_interactor.selectEntered.AddListener(Socket_SelectEntered);
m_interactor.selectExited.AddListener(Socket_SelectExited);
interactor.selectEntered.AddListener(Socket_SelectEntered);
interactor.selectExited.AddListener(Socket_SelectExited);
}
private void OnDisable()
{
m_interactor.selectEntered.RemoveListener(Socket_SelectEntered);
m_interactor.selectExited.RemoveListener(Socket_SelectExited);
interactor.selectEntered.RemoveListener(Socket_SelectEntered);
interactor.selectExited.RemoveListener(Socket_SelectExited);
}
private void Socket_SelectEntered(SelectEnterEventArgs e)
@ -80,10 +82,10 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering
private bool Process()
{
if (m_interactor == null)
if (interactor == null)
return false;
return !m_locked;
return !isLocked;
}
#endregion

0
Assets/Scripts/Interactions/Filters/XRSocketFilter.cs.meta → Assets/Scripts/Interactions/Filters/XRInteractorLockingFilter.cs.meta
View File