Version 2.2

Author: keithbradner

Assets/SteamVR/Input/SteamVR_Behaviour_Pose.cs

@@ -67,9 +67,7 @@ public class SteamVR_Behaviour_Pose : MonoBehaviour
         protected int deviceIndex = -1;
 
         protected SteamVR_HistoryBuffer historyBuffer = new SteamVR_HistoryBuffer(30);
-
-        private bool debugVelocity = true;
-
+        
 
         protected virtual void Start()
         {
@@ -136,20 +134,6 @@ protected virtual void UpdateTransform()
                 transform.localPosition = poseAction[inputSource].localPosition;
                 transform.localRotation = poseAction[inputSource].localRotation;
             }
-
-            if (debugVelocity && isActive)
-            {
-                /*
-                Vector3 positionAtTime, velocityAtTime, angularVelocityAtTime;
-                Quaternion rotationAtTime;
-
-                poseAction[inputSource].GetPoseAtTimeOffset(1 * -0.011f, out positionAtTime, out rotationAtTime, out velocityAtTime, out angularVelocityAtTime);
-
-                SteamVR_Utils.DrawVelocity(-Time.frameCount, positionAtTime, velocityAtTime, Color.green);
-
-                SteamVR_Utils.DrawVelocity(Time.frameCount, transform.position, poseAction[inputSource].velocity, Color.red);
-                    */
-            }
         }
 
         private void SteamVR_Behaviour_Pose_OnChange(SteamVR_Action_Pose fromAction, SteamVR_Input_Sources fromSource)
@@ -239,34 +223,6 @@ public void GetEstimatedPeakVelocities(out Vector3 velocity, out Vector3 angular
             historyBuffer.GetAverageVelocities(out velocity, out angularVelocity, 2, top);
         }
 
-        /// <summary>Rewrite the history buffer using SteamVR's actual recorded poses and get velocities based on those.</summary>
-        public void GetRealPeakVelocities(out Vector3 velocity, out Vector3 angularVelocity)
-        {
-            System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();
-            stopwatch.Start();
-
-            historyBuffer.Clear();
-
-            for (int framesBack = 1; framesBack < 15; framesBack++)
-            {
-                Vector3 positionAtTime, velocityAtTime, angularVelocityAtTime;
-                Quaternion rotationAtTime;
-
-                poseAction[inputSource].GetPoseAtTimeOffset(framesBack * -0.011f, out positionAtTime, out rotationAtTime, out velocityAtTime, out angularVelocityAtTime);
-
-                historyBuffer.Update(positionAtTime, rotationAtTime, velocityAtTime, angularVelocityAtTime);
-            }
-
-            int top = historyBuffer.GetTopVelocity(10, 1);
-
-            var step = historyBuffer.GetAtIndex(top);
-            velocity = step.velocity;
-            angularVelocity = step.angularVelocity;
-
-            stopwatch.Stop();
-            Debug.Log("ms: " + stopwatch.Elapsed.TotalMilliseconds);
-        }
-
         protected int lastFrameUpdated;
         protected void UpdateHistoryBuffer()
         {

Assets/SteamVR/InteractionSystem/Core/Scripts/Hand.cs

@@ -748,13 +748,6 @@ public void GetEstimatedPeakVelocities(out Vector3 velocity, out Vector3 angular
             angularVelocity = Player.instance.trackingOriginTransform.TransformDirection(angularVelocity);
         }
 
-        public void GetRealPeakVelocities(out Vector3 velocity, out Vector3 angularVelocity)
-        {
-            trackedObject.GetRealPeakVelocities(out velocity, out angularVelocity);
-            velocity = Player.instance.trackingOriginTransform.TransformVector(velocity);
-            angularVelocity = Player.instance.trackingOriginTransform.TransformDirection(angularVelocity);
-        }
-
 
         //-------------------------------------------------
         private void CleanUpAttachedObjectStack()

Assets/SteamVR/InteractionSystem/Core/Scripts/Throwable.cs

@@ -187,7 +187,7 @@ public virtual void GetReleaseVelocities(Hand hand, out Vector3 velocity, out Ve
                     angularVelocity = velocityEstimator.GetAngularVelocityEstimate();
                     break;
                 case ReleaseStyle.AdvancedEstimation:
-                    hand.GetRealPeakVelocities(out velocity, out angularVelocity);
+                    hand.GetEstimatedPeakVelocities(out velocity, out angularVelocity);
                     break;
                 case ReleaseStyle.GetFromHand:
                     velocity = hand.GetTrackedObjectVelocity(releaseVelocityTimeOffset);

Assets/SteamVR/InteractionSystem/Samples/Interactions_Example.unity

@@ -21597,11 +21597,6 @@ Prefab:
       propertyPath: m_LocalRotation.w
       value: 0.9906824
       objectReference: {fileID: 0}
-    - target: {fileID: 114000010658121184, guid: fb710a001890d9a44bb74a8ce4f20cc0,
-        type: 2}
-      propertyPath: scale
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: fb710a001890d9a44bb74a8ce4f20cc0, type: 2}
   m_IsPrefabParent: 0

Assets/SteamVR/Scripts/SteamVR.cs

@@ -433,10 +433,13 @@ private static string GetManifestFile()
 
             string fullPath = Path.Combine(currentPath, "unityProject.vrmanifest");
 
+            FileInfo fullManifestPath = new FileInfo(SteamVR_Settings.instance.actionsFilePath);
+
             if (File.Exists(fullPath))
             {
                 string jsonText = File.ReadAllText(fullPath);
                 SteamVR_Input_ManifestFile existingFile = Valve.Newtonsoft.Json.JsonConvert.DeserializeObject<SteamVR_Input_ManifestFile>(jsonText);
+
                 if (existingFile != null && existingFile.applications != null && existingFile.applications.Count > 0 &&
                     existingFile.applications[0].app_key != SteamVR_Settings.instance.editorAppKey)
                 {
@@ -446,6 +449,18 @@ private static string GetManifestFile()
                         existingInfo.IsReadOnly = false;
                     existingInfo.Delete();
                 }
+
+                if (existingFile != null && existingFile.applications != null && existingFile.applications.Count > 0 &&
+                    existingFile.applications[0].action_manifest_path != fullManifestPath.FullName)
+                {
+                    Debug.Log("<b>[SteamVR]</b> Deleting existing VRManifest because it has a different action manifest path:" +
+                        "\nExisting:" + existingFile.applications[0].action_manifest_path +
+                        "\nNew: " + fullManifestPath.FullName);
+                    FileInfo existingInfo = new FileInfo(fullPath);
+                    if (existingInfo.IsReadOnly)
+                        existingInfo.IsReadOnly = false;
+                    existingInfo.Delete();
+                }
             }
 
             if (File.Exists(fullPath) == false)
@@ -454,7 +469,7 @@ private static string GetManifestFile()
                 manifestFile.source = "Unity";
                 SteamVR_Input_ManifestFile_Application manifestApplication = new SteamVR_Input_ManifestFile_Application();
                 manifestApplication.app_key = SteamVR_Settings.instance.editorAppKey;
-                //manifestApplication.action_manifest_path = SteamVR_Settings.instance.actionsFilePath;
+                manifestApplication.action_manifest_path = fullManifestPath.FullName;
                 manifestApplication.launch_type = "url";
                 //manifestApplication.binary_path_windows = SteamVR_Utils.ConvertToForwardSlashes(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName);
                 //manifestApplication.binary_path_linux = SteamVR_Utils.ConvertToForwardSlashes(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName);
@@ -507,22 +522,19 @@ private static void IdentifyEditorApplication(bool showLogs = true)
         {
             bool isInstalled = OpenVR.Applications.IsApplicationInstalled(SteamVR_Settings.instance.editorAppKey);
 
-            if (isInstalled == false)
-            {
-                string manifestPath = GetManifestFile();
+            string manifestPath = GetManifestFile();
 
-                var addManifestErr = OpenVR.Applications.AddApplicationManifest(manifestPath, true);
-                if (addManifestErr != EVRApplicationError.None)
-                    Debug.LogError("<b>[SteamVR]</b> Error adding vr manifest file: " + addManifestErr.ToString());
-                else
-                {
-                    if (showLogs)
-                        Debug.Log("<b>[SteamVR]</b> Successfully added VR manifest to SteamVR");
-                }
+            EVRApplicationError addManifestErr = OpenVR.Applications.AddApplicationManifest(manifestPath, true);
+            if (addManifestErr != EVRApplicationError.None)
+                Debug.LogError("<b>[SteamVR]</b> Error adding vr manifest file: " + addManifestErr.ToString());
+            else
+            {
+                if (showLogs)
+                    Debug.Log("<b>[SteamVR]</b> Successfully added VR manifest to SteamVR");
             }
 
             int processId = System.Diagnostics.Process.GetCurrentProcess().Id;
-            var applicationIdentifyErr = OpenVR.Applications.IdentifyApplication((uint)processId, SteamVR_Settings.instance.editorAppKey);
+            EVRApplicationError applicationIdentifyErr = OpenVR.Applications.IdentifyApplication((uint)processId, SteamVR_Settings.instance.editorAppKey);
 
             if (applicationIdentifyErr != EVRApplicationError.None)
                 Debug.LogError("<b>[SteamVR]</b> Error identifying application: " + applicationIdentifyErr.ToString());

Assets/SteamVR/readme.txt

@@ -15,36 +15,33 @@ Documentation:
  Documentation can be found online here: https://valvesoftware.github.io/steamvr_unity_plugin/
 
 
-
 Quick Start:
 
- Follow the quickstart guide here: 
-
  If you want to explore the interaction scene you'll need to open the SteamVR Input window (under the Window Menu), click yes to copy example jsons, then click Save and Generate to create input actions.
 
  For the most simple example of VR with tracked controllers see the sample scene at ​SteamVR/Simple Sample
 
  For a more extensive example including picking up, throwing objects, and animated hands see the Interaction System example at ​SteamVR/Interaction System/Samples/Interactions_Example
 
 
-
 Support:
 
  If you're having trouble with the plugin the best place to discuss issues is our github here: https://github.com/ValveSoftware/steamvr_unity_plugin/issues/
 
  If you'd like to discuss features, post guides, and give general feedback please post on the steam forum here: https://steamcommunity.com/app/250820/discussions/7/
 
 
-
-Changes for 2.2:
-
- * Removed some old functions/members in the skeleton behaviour
+Changes for v2.2:
+ 
+ * Removing some unused code
 
 
 Changes for v2.2RC5:
 
  * Fix for controllers that don't support Skeleton Input yet (WinMR)
 
+ * Fixing issue where sometimes SteamVR would load legacy bindings for SteamVR Input projects while in the editor.
+ 
 
 Changes for v2.2RC4: