cgvr/DeltaVR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ready for Testing 1

Browse Source
This commit is contained in:
Toomas Tamm 2021-04-11 20:50:24 +03:00
parent 76922a8b27
commit 90563e776a
16 changed files with 429 additions and 846 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
Assets/Models/Door 1.asset Normal file
View File

File diff suppressed because one or more lines are too long

8
Assets/Models/Door 1.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0dbbd5d18868fb346ae2566f999744be
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4300000
userData:
assetBundleName:
assetBundleVariant:

16
Assets/Objects (Prefabs)/Doors/Bathroom_Door_Alt.prefab
View File

@ -17,7 +17,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 86
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &5495700473640977372
Transform:
@ -26,9 +26,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7397545820660490822}
m_LocalRotation: {x: -0, y: -0, z: -1, w: 0}
m_LocalRotation: {x: 0, y: 0, z: -1, w: 0}
m_LocalPosition: {x: -2.340004, y: 1.713, z: 0.5230007}
m_LocalScale: {x: 0.29909283, y: 0.33317587, z: 0.49264807}
m_LocalScale: {x: 0.0516871, y: 0.041678276, z: 0.03}
m_Children:
- {fileID: 5627280853509579037}
m_Father: {fileID: 0}
@ -61,7 +61,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 018552b038f019a4fa80799969502870, type: 2}
- {fileID: 2100000, guid: a7f0d297d4e99b94e90733de6b41ebb7, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -113,7 +113,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 86
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &5627280853509579037
Transform:
@ -123,8 +123,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8964920128572597599}
m_LocalRotation: {x: 0.00000008115275, y: 0.000000119209275, z: 1, w: -0.00000025602202}
m_LocalPosition: {x: 0.21665792, y: 2.348009, z: 0.008120613}
m_LocalScale: {x: 2.4464884, y: 5.69537, z: 0.081193864}
m_LocalPosition: {x: 0.177, y: 2.348, z: 0.0081}
m_LocalScale: {x: 2.3682008, y: 5.69537, z: 0.081193864}
m_Children: []
m_Father: {fileID: 5495700473640977372}
m_RootOrder: 0
@ -156,7 +156,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 827142f58d1800c4982ca91cca52d554, type: 2}
- {fileID: 2100000, guid: b30ef486ba0946b4b8641a5665cadb7b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

102
Assets/Objects (Prefabs)/Doors/Door_Alt Variant.prefab
View File

@ -12,61 +12,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b30ef486ba0946b4b8641a5665cadb7b, type: 2}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.423
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.73
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.708
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.61359674
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.78961957
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.w
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 180
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 464.3
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalScale.x
@ -80,7 +30,57 @@ PrefabInstance:
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalScale.z
value: 0.492648
value: 0.06
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 1.744
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.73
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.107
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.9925462
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.12186928
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 180
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 14
objectReference: {fileID: 0}
- target: {fileID: 5495700473640977372, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7397545820660490822, guid: 4cdcea5f4ff0e46498c874d2b01d07fa,
type: 3}

4
Assets/Objects (Prefabs)/Doors/Indoor Door Right.prefab
View File

@ -458,7 +458,7 @@ MonoBehaviour:
m_SmoothRotation: 0
m_SmoothRotationAmount: 5
m_TightenRotation: 0.5
m_ThrowOnDetach: 1
m_ThrowOnDetach: 0
m_ThrowSmoothingDuration: 0.25
m_ThrowSmoothingCurve:
serializedVersion: 2
@ -491,7 +491,7 @@ HingeJoint:
m_Anchor: {x: -0.5, y: 0, z: 0}
m_Axis: {x: 0, y: -0.4, z: 0}
m_AutoConfigureConnectedAnchor: 1
m_ConnectedAnchor: {x: -3.2937627, y: -0.012340516, z: -0.359999}
m_ConnectedAnchor: {x: -3.2937446, y: -0.01233997, z: -0.3599955}
m_UseSpring: 0
m_Spring:
spring: 0

8
Assets/Objects (Prefabs)/Doors/Indoor_Door.prefab
View File

@ -249,15 +249,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4659464179730409982}
m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0}
m_LocalPosition: {x: 0, y: 1.227, z: -0.044}
m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: 0.451, y: 1.227, z: 0.306}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7647836423020175578}
- {fileID: 7529502757061116443}
m_Father: {fileID: 629363734426922000}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: -180}
m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: -90}
--- !u!95 &4659464179730409980
Animator:
serializedVersion: 3
@ -305,7 +305,7 @@ Transform:
m_GameObject: {fileID: 4670066205747085632}
m_LocalRotation: {x: -0.00000017912407, y: 0.7071068, z: -0.7071068, w: -0.00000017912407}
m_LocalPosition: {x: 0.188, y: -0.019, z: 0.854}
m_LocalScale: {x: 0.45200038, y: 0.45840013, z: 0.4923364}
m_LocalScale: {x: 0.45200038, y: 0.45840013, z: 0.22}
m_Children: []
m_Father: {fileID: 4659464179730308574}
m_RootOrder: 0

17
Assets/Objects (Prefabs)/Doors/Static_Door.prefab
View File

@ -16,7 +16,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 86
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &7005127164203172055
Transform:
@ -25,15 +25,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6981855879189105860}
m_LocalRotation: {x: 0.000000119209275, y: -0.00000008115275, z: 0.00000025602202,
w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.8907, y: 0.9307, z: -2.1259995}
m_LocalScale: {x: 0.90470743, y: 1.8975599, z: 0.04}
m_LocalScale: {x: 1, y: 1.8975594, z: 0.039999988}
m_Children:
- {fileID: 5901754841814578489}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 90.00001, z: 90.00001}
m_LocalEulerAnglesHint: {x: 180, y: 180, z: 180}
--- !u!33 &4657367811635413925
MeshFilter:
m_ObjectHideFlags: 0
@ -57,6 +56,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@ -81,6 +81,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8558244374828747708
GameObject:
m_ObjectHideFlags: 0
@ -97,7 +98,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 86
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &5901754841814578489
Transform:
@ -108,7 +109,7 @@ Transform:
m_GameObject: {fileID: 8558244374828747708}
m_LocalRotation: {x: -0.00000008115275, y: -0.000000119209275, z: -1, w: -0.00000025602202}
m_LocalPosition: {x: 0.1481, y: 0.4123, z: -0.1}
m_LocalScale: {x: 0.33595094, y: 0.17558122, z: 12.316201}
m_LocalScale: {x: 0.33595094, y: 0.17558122, z: 4}
m_Children: []
m_Father: {fileID: 7005127164203172055}
m_RootOrder: 0
@ -136,6 +137,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@ -160,3 +162,4 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

127
Assets/Objects (Prefabs)/Doors/Static_Door_v2 Variant.prefab
View File

@ -12,6 +12,21 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2c0408a45a4e37a4d952d8c134a2e9bc, type: 2}
- target: {fileID: 5901754841814578489, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalScale.x
value: 0.42696005
objectReference: {fileID: 0}
- target: {fileID: 5901754841814578489, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalScale.z
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5901754841814578489, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.0737
objectReference: {fileID: 0}
- target: {fileID: 6258596307722179249, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -22,75 +37,85 @@ PrefabInstance:
propertyPath: m_Name
value: Static_Door_v2 Variant
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
- target: {fileID: 6981855879189105860, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.x
value: -48.585
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.y
value: 17.16
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.z
value: 5.45
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.50000006
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.49999997
propertyPath: m_StaticEditorFlags
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90.00001
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90.00001
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalScale.x
value: 0.92
value: 0.79793674
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalScale.y
value: 1.8975594
value: 1.8975596
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalScale.z
value: 0.031
value: 0.040673863
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.x
value: -63.335
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.y
value: 23.583
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalPosition.z
value: 5.454
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.70710677
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.70710677
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 270
objectReference: {fileID: 0}
- target: {fileID: 7005127164203172055, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 8558244374828747708, guid: 3d240d7de67b03d439dc588908ab9e26,
type: 3}
propertyPath: m_StaticEditorFlags
value: 4294967295
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d240d7de67b03d439dc588908ab9e26, type: 3}

2
Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Boxes.prefab
View File

@ -240,7 +240,7 @@ GameObject:
- component: {fileID: 5387078823007685487}
- component: {fileID: 5489778872027128264}
- component: {fileID: 6408273259403567560}
m_Layer: 31
m_Layer: 0
m_Name: Knob
m_TagString: Untagged
m_Icon: {fileID: 0}

754
Assets/Scenes/Main_scene.unity
View File

File diff suppressed because it is too large Load Diff

11
Assets/Scripts/Bow/Arrow.cs
View File

@ -13,15 +13,20 @@ namespace Bow
public float speed = 2000.0f;
public Transform tip = null;
public float maxLifetimeAfterShot = 60f;
private bool _inAir = false;
private Vector3 _lastPosition = Vector3.zero;
private Rigidbody _rigidbody = null;
private float _timeToDestroyOn;
protected override void Awake()
{
base.Awake();
_rigidbody = GetComponent<Rigidbody>();
_timeToDestroyOn = float.MaxValue;
}
private void FixedUpdate()
@ -29,6 +34,11 @@ namespace Bow
if (!_inAir) return;
CheckForCollision();
_lastPosition = tip.position;
if (_timeToDestroyOn <= Time.time)
{
Destroy(gameObject);
}
}
private void CheckForCollision()
@ -75,6 +85,7 @@ namespace Bow
Vector3 force = transform.forward * (power * speed);
_rigidbody.AddForce(force);
_timeToDestroyOn = Time.time + maxLifetimeAfterShot;
}
private IEnumerator RotateWithVelocity()

4
Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
View File

@ -12,13 +12,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
m_Name: ScreenSpaceAmbientOcclusion
m_EditorClassIdentifier:
m_Active: 0
m_Active: 1
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
m_Settings:
Downsample: 0
Source: 1
NormalSamples: 1
Intensity: 3
Intensity: 1
DirectLightingStrength: 0.25
Radius: 0.035
SampleCount: 6

37
Assets/XR Interaction Toolkit/1.0.0-pre.1/Default Input Actions/AxisWithModifiersComposite.cs Normal file
View File

@ -0,0 +1,37 @@
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Layouts;
using UnityEngine.InputSystem.Utilities;
#if UNITY_EDITOR
using UnityEditor;
[InitializeOnLoad] // Automatically register in editor.
#endif
[DisplayStringFormat("{modifier}+{twoDVector}")]
public class AxisWithModifiersComposite : InputBindingComposite<Vector2>
{
[InputControl(layout = "2DVector")] public int twoDVector;
[InputControl(layout = "Button")] public int modifier;
public override Vector2 ReadValue(ref InputBindingCompositeContext context)
{
//Debug.Log("Modifier: " + context.ReadValue<float>(modifier));
//Debug.Log("Vector2: " + context.ReadValue<Vector2, Vector2MagnitudeComparer>(twoDVector));
Vector2 toReturn = context.ReadValue<float>(modifier) == 0f ? Vector2.zero : context.ReadValue<Vector2, Vector2MagnitudeComparer>(twoDVector);
Debug.Log("Composite raw return: " + toReturn);
return toReturn;
}
static AxisWithModifiersComposite()
{
InputSystem.RegisterBindingComposite<AxisWithModifiersComposite>();
}
[RuntimeInitializeOnLoadMethod]
static void Init()
{
} // Trigger static constructor.
}

11
Assets/XR Interaction Toolkit/1.0.0-pre.1/Default Input Actions/AxisWithModifiersComposite.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 199c5a024cf5bd542a0fce674fb9fdfa
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/XR/Settings/Open XR Package Settings.asset
View File

@ -59,11 +59,11 @@ MonoBehaviour:
- {fileID: -56004002815963975}
- {fileID: 5631358094445770064}
- {fileID: -3485549425058001080}
- {fileID: 8372070344407202778}
- {fileID: -2073485709369494527}
- {fileID: -3986725776056858659}
- {fileID: 7506780264455515241}
- {fileID: -9051815517748824824}
- {fileID: -2073485709369494527}
- {fileID: 8372070344407202778}
- {fileID: 7506780264455515241}
m_renderMode: 1
m_depthSubmissionMode: 0
--- !u!114 &-7629316217295429534

2
ProjectSettings/ProjectSettings.asset
View File

@ -130,8 +130,6 @@ PlayerSettings:
bundleVersion: 1
preloadedAssets:
- {fileID: 11400000, guid: b40a5c3e37c60d84b9d76e740e9817b1, type: 2}
- {fileID: -7799501270668957653, guid: 69fe7bdb426f5d54f964f41edab8336b, type: 2}
- {fileID: -4566111125232350401, guid: d9074d96c7fe25647ade97e2758ce11d, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1