version 2.5.1

.gitattributes

@@ -1,24 +1,132 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
+#https://gist.githubusercontent.com/nemotoo/b8a1c3a0f1225bb9231979f389fd4f3f/raw/dc3e8cab80fc62d1c60db70c761b1ffa636aa796/.gitattributes
+#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
-## Unity ##
+# Code
-*.txt text
+*.cs text diff=csharp
-*.cs diff=csharp text
+# Unity Text Assets
-*.cginc text
+*.meta unityyaml
-*.shader text
+*.unity unityyaml
-*.mat merge=unityyamlmerge eol=lf
+*.asset unityyaml
-*.anim merge=unityyamlmerge eol=lf
+*.prefab unityyaml
-*.unity merge=unityyamlmerge eol=lf
+*.mat unityyaml
-*.prefab merge=unityyamlmerge eol=lf
+#asink: anim files can get large
-*.physicsMaterial2D merge=unityyamlmerge eol=lf
+*.anim unityyaml lfs 
-*.physicsMaterial merge=unityyamlmerge eol=lf
+*.controller unityyaml
-*.physicMaterial merge=unityyamlmerge eol=lf
+*.overrideController unityyaml
-*.asset merge=unityyamlmerge eol=lf
+*.physicMaterial unityyaml
-*.meta merge=unityyamlmerge eol=lf
+*.physicsMaterial2D unityyaml
-*.controller merge=unityyamlmerge eol=lf
+*.playable unityyaml
-*.flare merge=unityyamlmerge eol=lf
+*.mask unityyaml
+*.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
-*.FBX -text
+*.FBX filter=lfs diff=lfs merge=lfs -text
-*.fbx -text
+*.fbx filter=lfs diff=lfs merge=lfs -text
-*.blend -text
+*.blend filter=lfs diff=lfs merge=lfs -text
-*.obj -text
+*.obj filter=lfs diff=lfs merge=lfs -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
+*.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

com.htc.upm.vive.openxr/Runtime/CompositionLayer/Scripts/CompositionLayerPassthroughAPI.cs

@@ -416,7 +416,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_DestroyPassthrough(passthroughID);
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -475,7 +474,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 			else
 				return false;
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -547,7 +545,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetMesh(passthroughID, (uint)vertexBuffer.Length, vertexBufferXrVector, (uint)indexBuffer.Length, indexBufferUint); ;
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -626,7 +623,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetMeshTransform(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType), meshXrPose, meshXrScale);
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -665,7 +661,7 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetLayerType(passthroughID, layerType, compositionDepth);
 #endif
-			return false;
+
 		}
 
 		/// <summary>
@@ -706,7 +702,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetMeshTransformSpace(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType));
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -769,7 +764,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetMeshTransformPosition(passthroughID, OpenXRHelper.ToOpenXRVector(trackingSpaceMeshPosition, convertFromUnityToOpenXR));
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -832,7 +826,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetMeshTransformOrientation(passthroughID, OpenXRHelper.ToOpenXRQuaternion(trackingSpaceMeshRotation, convertFromUnityToOpenXR));
 #endif
-			return false;
 		}
 
 		/// <summary>
@@ -874,7 +867,6 @@ namespace VIVE.OpenXR.CompositionLayer.Passthrough
 #if UNITY_ANDROID
 			return passthroughFeature.HTCPassthrough_SetMeshTransformScale(passthroughID, OpenXRHelper.ToOpenXRVector(meshScale, false));
 #endif
-			return false;
 		}
 
 		/// <summary>

com.htc.upm.vive.openxr/Runtime/Features/Hand/Interaction/Scripts/ViveHandInteraction.cs

@@ -209,7 +209,7 @@ namespace VIVE.OpenXR.Hand
         /// </summary>
         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),
                 kLayoutName,
                 matches: new InputDeviceMatcher()
@@ -222,7 +222,7 @@ namespace VIVE.OpenXR.Hand
         /// </summary>
         protected override void UnregisterDeviceLayout()
         {
-            // sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
+            sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
             InputSystem.RemoveLayout(kLayoutName);
         }
 

com.htc.upm.vive.openxr/Runtime/Features/Hand/Interaction/Scripts/ViveHandInteractionExt.cs

@@ -226,7 +226,7 @@ namespace VIVE.OpenXR.Hand
         #region Supported component paths
         /// <summary>
         /// Constant for a pose interaction binding '.../input/aim/pose' OpenXR Input Binding.<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>
+        /// 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>
         /// When using a controller interaction profile, the "aim" pose is typically paired with a trigger or a button for aim and fire operations.
         /// </summary>
         public const string aim = "/input/aim/pose";
@@ -245,7 +245,7 @@ namespace VIVE.OpenXR.Hand
 
         /// <summary>
         /// Constant for a pose interaction binding '.../input/grip/pose' OpenXR Input Binding.<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>
+        /// 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>
         /// 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>
         public const string grip = "/input/grip/pose";
@@ -319,7 +319,7 @@ namespace VIVE.OpenXR.Hand
         /// </summary>
         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),
                 kLayoutName,
                 matches: new InputDeviceMatcher()
@@ -332,7 +332,7 @@ namespace VIVE.OpenXR.Hand
         /// </summary>
         protected override void UnregisterDeviceLayout()
         {
-            // sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
+            sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
             InputSystem.RemoveLayout(kLayoutName);
         }
 

com.htc.upm.vive.openxr/Runtime/Features/Tracker/Wrist/Scripts/ViveWristTracker.cs

@@ -208,7 +208,7 @@ namespace VIVE.OpenXR.Tracker
         /// </summary>
         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),
                 kLayoutName,
                 matches: new InputDeviceMatcher()
@@ -221,7 +221,7 @@ namespace VIVE.OpenXR.Tracker
         /// </summary>
         protected override void UnregisterDeviceLayout()
         {
-            // sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
+            sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
             InputSystem.RemoveLayout(kLayoutName);
         }
 

com.htc.upm.vive.openxr/Runtime/Features/Tracker/XR/Scripts/ViveXRTracker.cs

@@ -581,7 +581,7 @@ namespace VIVE.OpenXR.Tracker
         /// </summary>
         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),
                 kLayoutName,
                 matches: new InputDeviceMatcher()
@@ -594,7 +594,7 @@ namespace VIVE.OpenXR.Tracker
         /// </summary>
         protected override void UnregisterDeviceLayout()
         {
-            // sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
+            sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
             InputSystem.RemoveLayout(kLayoutName);
         }
 

com.htc.upm.vive.openxr/Runtime/Models/Hand/2.5/Materials.meta

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

com.htc.upm.vive.openxr/Runtime/Models/Hand/2.5/Shaders.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
-guid: 6541b1cca7e65874aa164f80c6f23143
+guid: 6541b1cca7e65874aa164f80c6f23143
-folderAsset: yes
+folderAsset: yes
-DefaultImporter:
+DefaultImporter:
-  externalObjects: {}
+  externalObjects: {}
-  userData: 
+  userData: 
-  assetBundleName: 
+  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleVariant: 

com.htc.upm.vive.openxr/Runtime/Models/Hand/2.5/Shaders/handBlueGrafillOL.shader.meta

@@ -1,9 +1,9 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
-guid: 1fe62d92a6498bd41994b44944d6b552
+guid: 1fe62d92a6498bd41994b44944d6b552
-ShaderImporter:
+ShaderImporter:
-  externalObjects: {}
+  externalObjects: {}
-  defaultTextures: []
+  defaultTextures: []
-  nonModifiableTextures: []
+  nonModifiableTextures: []
-  userData: 
+  userData: 
-  assetBundleName: 
+  assetBundleName: 
-  assetBundleVariant: 
+  assetBundleVariant: 

com.htc.upm.vive.openxr/Runtime/Models/Hand/2.5/Textures.meta

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

com.htc.upm.vive.openxr/Runtime/VIVECosmosProfile.cs

@@ -282,7 +282,7 @@ namespace VIVE.OpenXR
         /// </summary>
         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),
                 kLayoutName,
                 matches: new InputDeviceMatcher()
@@ -295,7 +295,7 @@ namespace VIVE.OpenXR
         /// </summary>
         protected override void UnregisterDeviceLayout()
         {
-            // Debug.LogFormat("VIVECosmosProfile UnregisterDeviceLayout() {0}", kLayoutName);
+            Debug.LogFormat("VIVECosmosProfile UnregisterDeviceLayout() {0}", kLayoutName);
             InputSystem.RemoveLayout(kLayoutName);
         }
 

com.htc.upm.vive.openxr/Runtime/VIVEFocus3Profile.cs

@@ -500,7 +500,7 @@ namespace VIVE.OpenXR
 		/// </summary>
 		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),
 				kLayoutName,
 				matches: new InputDeviceMatcher()
@@ -513,7 +513,7 @@ namespace VIVE.OpenXR
 		/// </summary>
 		protected override void UnregisterDeviceLayout()
 		{
-			// sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
+			sb.Clear().Append("UnregisterDeviceLayout() ").Append(kLayoutName); DEBUG(sb);
 			InputSystem.RemoveLayout(kLayoutName);
 		}