Skip to content

Commit

Permalink
Finished documentation v1.2 and subjective feedback screen
Browse files Browse the repository at this point in the history
  • Loading branch information
luisqtr committed Feb 28, 2022
1 parent 7454555 commit 9308ab8
Show file tree
Hide file tree
Showing 39 changed files with 9,347 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class LogSettings
public float screenshotsPeriodSecs = 20.0f;

public bool recordMovementData = true;
public int recordMovementFrequency = 12;
public int recordMovementFrequency = 10;
}

[System.Serializable]
Expand Down
1 change: 1 addition & 0 deletions Prefabs/ExciteOMeter_UI_OnlineAnalysis.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1410,6 +1410,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_MoveRepeatDelay: 0.5
m_MoveRepeatRate: 0.1
m_XRTrackingOrigin: {fileID: 0}
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
type: 3}
m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018,
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ The `EoM` may be used without external wearable sensors. However, the tool's mai

**Note:** *The description below is a summary of the complete step-by-step [user manual available in this link](./docs/1_UserManual.md).*

The `EoM` includes two parts: 1) The (`Excite-O-Meter|Devices`), a compiled software (versions for Android and Win10) that interfaces the physical sensor with Unity. 2) The `EoM` Unity package that integrates the functionalities in your custom standalone Unity project.
The `EoM` includes two parts:
1) The (`Excite-O-Meter|Devices`), a compiled software (versions for Android and Win10) that interfaces the physical sensor with Unity.
2) The `EoM` Unity package that integrates the functionalities in your custom standalone Unity project.

## Unity prerequisites

Expand All @@ -70,7 +72,7 @@ The package includes an example scene `Scenes/Example_withURP_NewInputSystem.uni
The latest version of the example scene used the following Unity configuration:
- Unity version 2020.3.19f1
- Universal Rendering Pipeline - [URP v10.6.0](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@10.6/manual/)
- Build as standalone (not mobile)
- Build as standalone VR (not for mobile VR like Meta Quest v1/v2)
- OpenXR as the XR plug-in provider.
- Utilizing the new Unity Input System [Input System v1.0.2](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.0/manual/index.html).

Expand Down
65 changes: 49 additions & 16 deletions Scenes/ExampleURP_NewInputSystem/InputActions/CustomInputActions.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
// GENERATED AUTOMATICALLY FROM 'Assets/exciteometer/Scenes/ExampleURP_NewInputSystem/InputActions/CustomInputActions.inputactions'
//------------------------------------------------------------------------------
// <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.2.0
// from Assets/exciteometer/Scenes/ExampleURP_NewInputSystem/InputActions/CustomInputActions.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;

public class @CustomInputActions : IInputActionCollection, IDisposable
public partial class @CustomInputActions : IInputActionCollection2, IDisposable
{
public InputActionAsset asset { get; }
public @CustomInputActions()
Expand All @@ -24,31 +33,35 @@ public @CustomInputActions()
""id"": ""351f2ccd-1f9f-44bf-9bec-d62ac5c5f408"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": true
},
{
""name"": ""Look"",
""type"": ""Value"",
""id"": ""6b444451-8a00-4d00-a97e-f47457f736a8"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": true
},
{
""name"": ""Fire"",
""type"": ""Button"",
""id"": ""6c2ab1b8-8984-453a-af3d-a3c78ae1679a"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""EnableOrbit"",
""type"": ""Button"",
""id"": ""80789074-e1d5-40f0-bee7-50c29047468e"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
Expand Down Expand Up @@ -295,79 +308,89 @@ public @CustomInputActions()
""id"": ""c95b2375-e6d9-4b88-9c4c-c5e76515df4b"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": true
},
{
""name"": ""Submit"",
""type"": ""Button"",
""id"": ""7607c7b6-cd76-4816-beef-bd0341cfe950"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Cancel"",
""type"": ""Button"",
""id"": ""15cef263-9014-4fd5-94d9-4e4a6234a6ef"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Point"",
""type"": ""PassThrough"",
""id"": ""32b35790-4ed0-4e9a-aa41-69ac6d629449"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Click"",
""type"": ""PassThrough"",
""id"": ""3c7022bf-7922-4f7c-a998-c437916075ad"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""ScrollWheel"",
""type"": ""PassThrough"",
""id"": ""0489e84a-4833-4c40-bfae-cea84b696689"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""MiddleClick"",
""type"": ""PassThrough"",
""id"": ""dad70c86-b58c-4b17-88ad-f5e53adf419e"",
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""RightClick"",
""type"": ""PassThrough"",
""id"": ""44b200b1-1557-4083-816c-b22cbdf77ddf"",
""expectedControlType"": """",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""TrackedDevicePosition"",
""type"": ""PassThrough"",
""id"": ""24908448-c609-4bc3-a128-ea258674378a"",
""expectedControlType"": ""Vector3"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""TrackedDeviceOrientation"",
""type"": ""PassThrough"",
""id"": ""9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be"",
""expectedControlType"": ""Quaternion"",
""processors"": """",
""interactions"": """"
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
Expand Down Expand Up @@ -918,6 +941,16 @@ public void Disable()
{
asset.Disable();
}
public IEnumerable<InputBinding> bindings => asset.bindings;

public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false)
{
return asset.FindAction(actionNameOrId, throwIfNotFound);
}
public int FindBinding(InputBinding bindingMask, out InputAction action)
{
return asset.FindBinding(bindingMask, out action);
}

// Player
private readonly InputActionMap m_Player;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"displayName": "Default Input Actions",
"description": "Default set of input actions and presets for use with XR Interaction Toolkit behaviors that utilize the Input System."
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!181963792 &2655988077585873504
Preset:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: XRI Default Continuous Move
m_TargetType:
m_NativeTypeID: 114
m_ManagedTypePPtr: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f,
type: 3}
m_ManagedTypeFallback:
m_Properties:
- target: {fileID: 0}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_EditorHideFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_EditorClassIdentifier
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_System
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_MoveSpeed
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_EnableStrafe
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_UseGravity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_GravityApplicationMode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_ForwardSource
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_UseReference
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_Name
value: Left Hand Move
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_Type
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_ExpectedControlType
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_Id
value: 75f1b245-c357-48c8-9acb-8967bec9dda2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_Processors
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_Interactions
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Action.m_SingletonActionBindings.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_LeftHandMoveAction.m_Reference
value:
objectReference: {fileID: 6972639530819350904, guid: c348712bda248c246b8c49b3db54643f,
type: 3}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_UseReference
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_Name
value: Right Hand Move
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_Type
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_ExpectedControlType
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_Id
value: 6bf6c732-e011-46b1-acc5-b649a4ec5f10
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_Processors
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_Interactions
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Action.m_SingletonActionBindings.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_RightHandMoveAction.m_Reference
value:
objectReference: {fileID: -8198699208435500284, guid: c348712bda248c246b8c49b3db54643f,
type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9308ab8

Please sign in to comment.