Switch build settings

BenoitGeslain · Mar 20, 2024 · e4374fc · e4374fc
1 parent f30eea6
commit e4374fc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor.unity b/Visuo-haptic Toolkit/Assets/Demo Scenes/Corridor/Scenes/RedirectionCorridor.unity
@@ -2108,9 +2108,9 @@ MonoBehaviour:
   - {fileID: 904384536}
   - {fileID: 1432806454}
   - {fileID: 1678945701}
-  redirectionAmount: 180
-  start: {fileID: 0}
-  end: {fileID: 0}
+  redirectionAmount: 360
+  start: {fileID: 2099766480}
+  end: {fileID: 1861591714}
 --- !u!114 &844723481
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Visuo-haptic Toolkit/Assets/Oculus/OculusProjectConfig.asset b/Visuo-haptic Toolkit/Assets/Oculus/OculusProjectConfig.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 05d394ae2a81edd4cbc3c51917e766e3, type: 3}
   m_Name: OculusProjectConfig
   m_EditorClassIdentifier: 
-  targetDeviceTypes: 03000000
+  targetDeviceTypes: 02000000
   allowOptional3DofHeadTracking: 0
   handTrackingSupport: 1
   handTrackingFrequency: 1

diff --git a/...Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Parameters/High Parameters (Literature).asset b/...Toolkit/Assets/Visuo-Haptic Toolkit/Scripts/Parameters/High Parameters (Literature).asset
@@ -18,26 +18,30 @@ MonoBehaviour:
   VerticalAngles:
     up: 4.48
     down: -4.4
-  Gain:
-    faster: 1.07
-    slower: 0.88
+  DepthGain:
+    forward: 0
+    backward: 0
   RedirectionBuffer: 0.1
-  MaxRedirectionThreshold: 0.5
+  RedirectionLateness: 0
+  ControlPoint: {x: 0, y: 0}
   GoGoCoefficient: 1
   GoGoActivationDistance: 0.167
   ResetRedirectionCoeff: 0.087
   RotationalError: 0.5
-  RotationThreshold: 0
+  RotationalThreshold: 0
   WalkingThreshold: 0.2
   DampeningDistanceThreshold: 1.25
   DampeningRange: 1.57
   SmoothingFactor: 0.2
+  SteerToOrbitRadius: 5
   OverTimeRotation: 0.2
   GainsTranslational: {x: 1, y: 1, z: 1}
   GainsRotational:
     same: 1.3
     opposite: 0.85
-  CurvatureRadius: 15
-  a: {x: 0, y: 0, z: 0}
+  CurvatureRadius: 7.5
+  HybridWeights: {x: 1, y: 1, z: 1}
+  smoothingParameter: 0
+  rescale: 0
   SwampSquareLength: 0.25
   SwampCDRatio: 0.75
diff --git a/...lkit/Assets/Visuo-Haptic Toolkit/Scripts/Parameters/Medium Parameters (Recommended).asset b/...lkit/Assets/Visuo-Haptic Toolkit/Scripts/Parameters/Medium Parameters (Recommended).asset
@@ -37,10 +37,11 @@ MonoBehaviour:
   OverTimeRotation: 0.1
   GainsTranslational: {x: 1, y: 1, z: 1}
   GainsRotational:
-    same: 1.03
-    opposite: 0.995
+    same: 1.04
+    opposite: 0.998
   CurvatureRadius: 15
   HybridWeights: {x: 1, y: 1, z: 1}
-  a: {x: 0, y: 0, z: 0}
+  smoothingParameter: 0
+  rescale: 0
   SwampSquareLength: 0.25
   SwampCDRatio: 0.75
diff --git a/Visuo-haptic Toolkit/ProjectSettings/EditorBuildSettings.asset b/Visuo-haptic Toolkit/ProjectSettings/EditorBuildSettings.asset
@@ -24,7 +24,7 @@ EditorBuildSettings:
     path: Assets/Demo Scenes/Azmandian 3 Cubes/Static Floating Cubes.unity
     guid: 885a34dea4cdceb4fb2045466d51655a
   m_configObjects:
-    Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 7871a6cd7edfb6e4e90388d9be0cd361, type: 2}
+    Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bef35fcb086b81645a51417234b42549, type: 2}
     Unity.XR.OpenVR.Settings: {fileID: 11400000, guid: b6bf661543b159f4f93e0c7221185c37, type: 2}
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 59bb4fa2062df8549bae6e1c8690288b, type: 2}
     com.unity.xr.openxr.settings4: {fileID: 11400000, guid: f15c911359537b241b84e33fd34fbf49, type: 2}