Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fbb1019b57 | |||
| 9ec2b5421b | |||
| 6c42da280a | |||
|
|
25a5fd2124 | ||
|
|
2554daa86e | ||
|
|
85669a475f | ||
|
|
2372c9429a | ||
|
|
ddc3c4c6d8 |
150
.gitattributes
vendored
@@ -1,132 +1,24 @@
|
|||||||
#https://gist.githubusercontent.com/nemotoo/b8a1c3a0f1225bb9231979f389fd4f3f/raw/dc3e8cab80fc62d1c60db70c761b1ffa636aa796/.gitattributes
|
# Set the default behavior, in case people don't have core.autocrlf set.
|
||||||
#grafted from https://hextantstudios.com/unity-gitattributes/
|
|
||||||
# Macro for Unity YAML-based asset files.
|
|
||||||
[attr]unityyaml -text merge=unityyamlmerge diff
|
|
||||||
# Macro for all binary files that should use Git LFS.
|
|
||||||
[attr]lfs -text filter=lfs diff=lfs merge=lfs
|
|
||||||
# Default to auto-normalized line endings.
|
|
||||||
* text=auto
|
* text=auto
|
||||||
# Code
|
## Unity ##
|
||||||
*.cs text diff=csharp
|
*.txt text
|
||||||
# Unity Text Assets
|
*.cs diff=csharp text
|
||||||
*.meta unityyaml
|
*.cginc text
|
||||||
*.unity unityyaml
|
*.shader text
|
||||||
*.asset unityyaml
|
*.mat merge=unityyamlmerge eol=lf
|
||||||
*.prefab unityyaml
|
*.anim merge=unityyamlmerge eol=lf
|
||||||
*.mat unityyaml
|
*.unity merge=unityyamlmerge eol=lf
|
||||||
#asink: anim files can get large
|
*.prefab merge=unityyamlmerge eol=lf
|
||||||
*.anim unityyaml lfs
|
*.physicsMaterial2D merge=unityyamlmerge eol=lf
|
||||||
*.controller unityyaml
|
*.physicsMaterial merge=unityyamlmerge eol=lf
|
||||||
*.overrideController unityyaml
|
*.physicMaterial merge=unityyamlmerge eol=lf
|
||||||
*.physicMaterial unityyaml
|
*.asset merge=unityyamlmerge eol=lf
|
||||||
*.physicsMaterial2D unityyaml
|
*.meta merge=unityyamlmerge eol=lf
|
||||||
*.playable unityyaml
|
*.controller merge=unityyamlmerge eol=lf
|
||||||
*.mask unityyaml
|
*.flare merge=unityyamlmerge eol=lf
|
||||||
*.brush unityyaml
|
|
||||||
*.flare unityyaml
|
|
||||||
*.fontsettings unityyaml
|
|
||||||
*.guiskin unityyaml
|
|
||||||
*.giparams unityyaml
|
|
||||||
*.renderTexture unityyaml
|
|
||||||
*.spriteatlas unityyaml
|
|
||||||
*.terrainlayer unityyaml
|
|
||||||
*.mixer unityyaml
|
|
||||||
*.shadervariants unityyaml
|
|
||||||
*.preset unityyaml
|
|
||||||
*.asmdef -text diff
|
|
||||||
# Unity Binary Assets
|
|
||||||
*.cubemap lfs
|
|
||||||
*.unitypackage lfs
|
|
||||||
# Note: Unity terrain assets must have "-Terrain" suffix.
|
|
||||||
*-[Tt]errain.asset -unityyaml lfs
|
|
||||||
# Note: Unity navmesh assets must have "-NavMesh" suffix.
|
|
||||||
*-[Nn]av[Mm]esh.asset -unityyaml lfs
|
|
||||||
## git-lfs ##
|
|
||||||
#Image
|
|
||||||
*.jpg filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.jpeg filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.png filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.gif filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.psd filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ai filter=lfs diff=lfs merge=lfs -text
|
|
||||||
#Audio
|
|
||||||
*.mp3 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.wav filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ogg filter=lfs diff=lfs merge=lfs -text
|
|
||||||
#Video
|
|
||||||
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.mov filter=lfs diff=lfs merge=lfs -text
|
|
||||||
#3D Object
|
#3D Object
|
||||||
*.FBX filter=lfs diff=lfs merge=lfs -text
|
*.FBX -text
|
||||||
*.fbx filter=lfs diff=lfs merge=lfs -text
|
*.fbx -text
|
||||||
*.blend filter=lfs diff=lfs merge=lfs -text
|
*.blend -text
|
||||||
*.obj filter=lfs diff=lfs merge=lfs -text
|
*.obj -text
|
||||||
#ETC
|
|
||||||
*.a filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.exr filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.tga filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.dll filter=lfs diff=lfs merge=lfs -text
|
*.dll filter=lfs diff=lfs merge=lfs -text
|
||||||
*.unitypackage filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.aif filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.rns filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.reason filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.lxo filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
|
||||||
*.aar filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.lighting filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
|
||||||
#/LocalPackages (tests_withnewpackage)
|
|
||||||
#$ find . -type f | sed -e 's/.*\.//' | sed -e 's/.*\///' | sort -u
|
|
||||||
|
|
||||||
#$ find ./* -type f | sed -e 's/.*\.//' | sed -e 's/.*\///' | sort -u
|
|
||||||
#LICENSE
|
|
||||||
#LICENSE_WaveSDKNativeBinary
|
|
||||||
#aar
|
|
||||||
#anim
|
|
||||||
#apk
|
|
||||||
#asmdef
|
|
||||||
#asset
|
|
||||||
#bat
|
|
||||||
#controller
|
|
||||||
#cs
|
|
||||||
#default
|
|
||||||
#dll
|
|
||||||
#docx
|
|
||||||
#dummy
|
|
||||||
#exe
|
|
||||||
#exr
|
|
||||||
#fbx
|
|
||||||
#gitignored
|
|
||||||
#ini
|
|
||||||
#inputactions
|
|
||||||
#json
|
|
||||||
#lighting
|
|
||||||
#mat
|
|
||||||
#md
|
|
||||||
#meta
|
|
||||||
#mtl
|
|
||||||
#obj
|
|
||||||
#physicMaterial
|
|
||||||
#png
|
|
||||||
#prefab
|
|
||||||
#preset
|
|
||||||
#renderTexture
|
|
||||||
#setting
|
|
||||||
#shader
|
|
||||||
#so
|
|
||||||
#tm1
|
|
||||||
#tmp
|
|
||||||
#txt
|
|
||||||
#unity
|
|
||||||
#unitypackage
|
|
||||||
#wav
|
|
||||||
#xml
|
|
||||||
|
|
||||||
|
|
||||||
*.hdr filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.lighting filter=lfs diff=lfs merge=lfs -text
|
|
||||||
*.so filter=lfs diff=lfs merge=lfs -text
|
|
||||||
@@ -416,6 +416,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_DestroyPassthrough(passthroughID);
|
return passthroughFeature.HTCPassthrough_DestroyPassthrough(passthroughID);
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -474,6 +475,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -545,6 +547,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetMesh(passthroughID, (uint)vertexBuffer.Length, vertexBufferXrVector, (uint)indexBuffer.Length, indexBufferUint); ;
|
return passthroughFeature.HTCPassthrough_SetMesh(passthroughID, (uint)vertexBuffer.Length, vertexBufferXrVector, (uint)indexBuffer.Length, indexBufferUint); ;
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -623,6 +626,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetMeshTransform(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType), meshXrPose, meshXrScale);
|
return passthroughFeature.HTCPassthrough_SetMeshTransform(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType), meshXrPose, meshXrScale);
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -661,7 +665,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetLayerType(passthroughID, layerType, compositionDepth);
|
return passthroughFeature.HTCPassthrough_SetLayerType(passthroughID, layerType, compositionDepth);
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -702,6 +706,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetMeshTransformSpace(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType));
|
return passthroughFeature.HTCPassthrough_SetMeshTransformSpace(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType));
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -764,6 +769,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetMeshTransformPosition(passthroughID, OpenXRHelper.ToOpenXRVector(trackingSpaceMeshPosition, convertFromUnityToOpenXR));
|
return passthroughFeature.HTCPassthrough_SetMeshTransformPosition(passthroughID, OpenXRHelper.ToOpenXRVector(trackingSpaceMeshPosition, convertFromUnityToOpenXR));
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -826,6 +832,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetMeshTransformOrientation(passthroughID, OpenXRHelper.ToOpenXRQuaternion(trackingSpaceMeshRotation, convertFromUnityToOpenXR));
|
return passthroughFeature.HTCPassthrough_SetMeshTransformOrientation(passthroughID, OpenXRHelper.ToOpenXRQuaternion(trackingSpaceMeshRotation, convertFromUnityToOpenXR));
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -867,6 +874,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
|
|||||||
#if UNITY_ANDROID
|
#if UNITY_ANDROID
|
||||||
return passthroughFeature.HTCPassthrough_SetMeshTransformScale(passthroughID, OpenXRHelper.ToOpenXRVector(meshScale, false));
|
return passthroughFeature.HTCPassthrough_SetMeshTransformScale(passthroughID, OpenXRHelper.ToOpenXRVector(meshScale, false));
|
||||||
#endif
|
#endif
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ namespace VIVE.OpenXR.Hand
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void RegisterDeviceLayout()
|
protected override void RegisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
// sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
||||||
InputSystem.RegisterLayout(typeof(HandInteractionDevice),
|
InputSystem.RegisterLayout(typeof(HandInteractionDevice),
|
||||||
kLayoutName,
|
kLayoutName,
|
||||||
matches: new InputDeviceMatcher()
|
matches: new InputDeviceMatcher()
|
||||||
@@ -222,7 +222,7 @@ namespace VIVE.OpenXR.Hand
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void UnregisterDeviceLayout()
|
protected override void UnregisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
// sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
||||||
InputSystem.RemoveLayout(kLayoutName);
|
InputSystem.RemoveLayout(kLayoutName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ namespace VIVE.OpenXR.Hand
|
|||||||
#region Supported component paths
|
#region Supported component paths
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constant for a pose interaction binding '.../input/aim/pose' OpenXR Input Binding.<br></br>
|
/// Constant for a pose interaction binding '.../input/aim/pose' OpenXR Input Binding.<br></br>
|
||||||
/// Typically used for aiming at objects out of arm¡¦s reach. When using a hand interaction profile, it is typically paired with <see cref="pointerActivateValue"/> to optimize aiming ray stability while performing the gesture.<br></br>
|
/// Typically used for aiming at objects out of arm<EFBFBD><EFBFBD>s reach. When using a hand interaction profile, it is typically paired with <see cref="pointerActivateValue"/> to optimize aiming ray stability while performing the gesture.<br></br>
|
||||||
/// When using a controller interaction profile, the "aim" pose is typically paired with a trigger or a button for aim and fire operations.
|
/// When using a controller interaction profile, the "aim" pose is typically paired with a trigger or a button for aim and fire operations.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const string aim = "/input/aim/pose";
|
public const string aim = "/input/aim/pose";
|
||||||
@@ -245,7 +245,7 @@ namespace VIVE.OpenXR.Hand
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Constant for a pose interaction binding '.../input/grip/pose' OpenXR Input Binding.<br></br>
|
/// Constant for a pose interaction binding '.../input/grip/pose' OpenXR Input Binding.<br></br>
|
||||||
/// Typically used for holding a large object in the user¡¦s hand. When using a hand interaction profile, it is typically paired with <see cref="graspValue"/> for the user to directly manipulate an object held in a hand.<br></br>
|
/// Typically used for holding a large object in the user<EFBFBD><EFBFBD>s hand. When using a hand interaction profile, it is typically paired with <see cref="graspValue"/> for the user to directly manipulate an object held in a hand.<br></br>
|
||||||
/// When using a controller interaction profile, the "grip" pose is typically paired with a "squeeze" button or trigger that gives the user the sense of tightly holding an object.
|
/// When using a controller interaction profile, the "grip" pose is typically paired with a "squeeze" button or trigger that gives the user the sense of tightly holding an object.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public const string grip = "/input/grip/pose";
|
public const string grip = "/input/grip/pose";
|
||||||
@@ -319,7 +319,7 @@ namespace VIVE.OpenXR.Hand
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void RegisterDeviceLayout()
|
protected override void RegisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
// sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
||||||
InputSystem.RegisterLayout(typeof(HandInteractionExtDevice),
|
InputSystem.RegisterLayout(typeof(HandInteractionExtDevice),
|
||||||
kLayoutName,
|
kLayoutName,
|
||||||
matches: new InputDeviceMatcher()
|
matches: new InputDeviceMatcher()
|
||||||
@@ -332,7 +332,7 @@ namespace VIVE.OpenXR.Hand
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void UnregisterDeviceLayout()
|
protected override void UnregisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
// sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
||||||
InputSystem.RemoveLayout(kLayoutName);
|
InputSystem.RemoveLayout(kLayoutName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ namespace VIVE.OpenXR.Tracker
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void RegisterDeviceLayout()
|
protected override void RegisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
// sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
||||||
InputSystem.RegisterLayout(typeof(WristTrackerDevice),
|
InputSystem.RegisterLayout(typeof(WristTrackerDevice),
|
||||||
kLayoutName,
|
kLayoutName,
|
||||||
matches: new InputDeviceMatcher()
|
matches: new InputDeviceMatcher()
|
||||||
@@ -221,7 +221,7 @@ namespace VIVE.OpenXR.Tracker
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void UnregisterDeviceLayout()
|
protected override void UnregisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
// sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
||||||
InputSystem.RemoveLayout(kLayoutName);
|
InputSystem.RemoveLayout(kLayoutName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -581,7 +581,7 @@ namespace VIVE.OpenXR.Tracker
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void RegisterDeviceLayout()
|
protected override void RegisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(@kProducts); DEBUG(sb);
|
// sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(@kProducts); DEBUG(sb);
|
||||||
InputSystem.RegisterLayout(typeof(XrTrackerDevice),
|
InputSystem.RegisterLayout(typeof(XrTrackerDevice),
|
||||||
kLayoutName,
|
kLayoutName,
|
||||||
matches: new InputDeviceMatcher()
|
matches: new InputDeviceMatcher()
|
||||||
@@ -594,7 +594,7 @@ namespace VIVE.OpenXR.Tracker
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void UnregisterDeviceLayout()
|
protected override void UnregisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
// sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
||||||
InputSystem.RemoveLayout(kLayoutName);
|
InputSystem.RemoveLayout(kLayoutName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 763 B |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 237 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 318 KiB |
@@ -282,7 +282,7 @@ namespace VIVE.OpenXR
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void RegisterDeviceLayout()
|
protected override void RegisterDeviceLayout()
|
||||||
{
|
{
|
||||||
Debug.LogFormat("VIVECosmosProfile RegisterDeviceLayout() {0} , product: {1}", kLayoutName, kDeviceLocalizedName);
|
// Debug.LogFormat("VIVECosmosProfile RegisterDeviceLayout() {0} , product: {1}", kLayoutName, kDeviceLocalizedName);
|
||||||
InputSystem.RegisterLayout(typeof(ViveCosmosController),
|
InputSystem.RegisterLayout(typeof(ViveCosmosController),
|
||||||
kLayoutName,
|
kLayoutName,
|
||||||
matches: new InputDeviceMatcher()
|
matches: new InputDeviceMatcher()
|
||||||
@@ -295,7 +295,7 @@ namespace VIVE.OpenXR
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void UnregisterDeviceLayout()
|
protected override void UnregisterDeviceLayout()
|
||||||
{
|
{
|
||||||
Debug.LogFormat("VIVECosmosProfile UnregisterDeviceLayout() {0}", kLayoutName);
|
// Debug.LogFormat("VIVECosmosProfile UnregisterDeviceLayout() {0}", kLayoutName);
|
||||||
InputSystem.RemoveLayout(kLayoutName);
|
InputSystem.RemoveLayout(kLayoutName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -500,7 +500,7 @@ namespace VIVE.OpenXR
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void RegisterDeviceLayout()
|
protected override void RegisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
// sb.Clear().Append("RegisterDeviceLayout() ").Append(kLayoutName).Append(", product: ").Append(kDeviceLocalizedName); DEBUG(sb);
|
||||||
InputSystem.RegisterLayout(typeof(VIVEFocus3Controller),
|
InputSystem.RegisterLayout(typeof(VIVEFocus3Controller),
|
||||||
kLayoutName,
|
kLayoutName,
|
||||||
matches: new InputDeviceMatcher()
|
matches: new InputDeviceMatcher()
|
||||||
@@ -513,7 +513,7 @@ namespace VIVE.OpenXR
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void UnregisterDeviceLayout()
|
protected override void UnregisterDeviceLayout()
|
||||||
{
|
{
|
||||||
sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
// sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
|
||||||
InputSystem.RemoveLayout(kLayoutName);
|
InputSystem.RemoveLayout(kLayoutName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 763 B |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 237 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 318 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 521 KiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 10 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 10 MiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 7.3 MiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 16 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 3.8 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 8.0 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 22 MiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 856 KiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 3.9 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 2.7 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 16 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 3.8 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 8.0 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 22 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 2.4 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 16 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 9.0 MiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 21 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 21 MiB |
|
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 21 MiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 127 KiB |
|
Before Width: | Height: | Size: 131 B After Width: | Height: | Size: 417 KiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 994 KiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 130 B After Width: | Height: | Size: 22 KiB |