Skip to content

Commit 17259c0

Browse files
committed
2.4.1b (sdk 1.7.15) - Binding fixes, fallback fixes, and pull requests
Changes for 2.4.1b * Some fixes for fallback mode * Fixed some cosmos bindings * Added index hmd proximity binding * Increased default ColliderArraySize for Hands in the Interaction System to 32. * Removed ResolutionDialogSetting warning in Unity 2019.1 (#498) * Fix partial bindings not including default actions (#494) * Fix Unity crash on "Open binding UI" when using as package (#491) * Fix for copy example input files failing on Linux/OSX (#490) * Add Treadmill Source to Input Sources (#486) * 2D Debug: Camera navigation up/down (E/Q) support (#481) * Fixed an issue with Unity throwing "cannot find ın" error in PCs with Turkish default language. (#479) * Exposed useItemPackagePreview (#432) * Modified Throwable to optionally ease into release velocity scaling. (#173)
1 parent 6427282 commit 17259c0

35 files changed

+340
-176
lines changed

Assets/SteamVR/Editor/SteamVR_UnitySettingsWindow.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public class SteamVR_UnitySettingsWindow : EditorWindow
4343
const int recommended_DefaultScreenWidth = 1024;
4444
const int recommended_DefaultScreenHeight = 768;
4545
const bool recommended_RunInBackground = true;
46+
#if !UNITY_2019_1_OR_NEWER
4647
const ResolutionDialogSetting recommended_DisplayResolutionDialog = ResolutionDialogSetting.HiddenByDefault;
48+
#endif
4749
const bool recommended_ResizableWindow = true;
4850
const D3D11FullscreenMode recommended_FullscreenMode = D3D11FullscreenMode.FullscreenWindow;
4951
const bool recommended_VisibleInBackground = true;

Assets/SteamVR/Input/Editor/SteamVR_CopyExampleInputFiles.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ public static void CopyFiles(bool force = false)
4747
string[] files = Directory.GetFiles(path, "*.json");
4848
foreach (string file in files)
4949
{
50-
lastIndex = file.LastIndexOf("\\");
51-
string filename = file.Substring(lastIndex + 1);
50+
string filename = Path.GetFileName(file);
5251

5352
string newPath = Path.Combine(dataPath, filename);
5453

Assets/SteamVR/Input/Editor/SteamVR_Input_ActionManifest_Manager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,10 @@ protected static void ImportBindings(SteamVR_Input_ActionFile currentActionsFile
249249
continue;
250250
}
251251

252-
SteamVR_Input_BindingFile importingBindingFile = GetBindingFileObject(newDefaultPath.binding_url);
252+
SteamVR_Input_BindingFile importingBindingFile = GetBindingFileObject(Path.Combine(directory, newDefaultPath.binding_url));
253253
if (importingBindingFile == null)
254254
{
255-
Debug.LogError("<b>[SteamVR]</b> There was an error deserializing the binding at path: " + newDefaultPath.binding_url);
255+
Debug.LogError("<b>[SteamVR]</b> There was an error deserializing the binding at path: " + Path.Combine(directory, newDefaultPath.binding_url));
256256
continue;
257257
}
258258

Assets/SteamVR/Input/ExampleJSON/actions.json

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
"type": "boolean",
4141
"requirement": "optional"
4242
},
43+
{
44+
"name": "/actions/default/in/SnapTurnLeft",
45+
"type": "boolean",
46+
"requirement": "suggested"
47+
},
48+
{
49+
"name": "/actions/default/in/SnapTurnRight",
50+
"type": "boolean"
51+
},
4352
{
4453
"name": "/actions/default/out/Haptic",
4554
"type": "vibration"
@@ -97,10 +106,6 @@
97106
"controller_type": "vive_controller",
98107
"binding_url": "bindings_vive_controller.json"
99108
},
100-
{
101-
"controller_type": "vive_cosmos_controller",
102-
"binding_url": "bindings_vive_cosmos_controller.json"
103-
},
104109
{
105110
"controller_type": "oculus_touch",
106111
"binding_url": "bindings_oculus_touch.json"
@@ -113,10 +118,22 @@
113118
"controller_type": "holographic_controller",
114119
"binding_url": "bindings_holographic_controller.json"
115120
},
121+
{
122+
"controller_type": "vive_cosmos_controller",
123+
"binding_url": "bindings_vive_cosmos_controller.json"
124+
},
125+
{
126+
"controller_type": "vive_cosmos",
127+
"binding_url": "binding_vive_cosmos.json"
128+
},
116129
{
117130
"controller_type": "vive",
118131
"binding_url": "binding_vive.json"
119132
},
133+
{
134+
"controller_type": "index_hmd",
135+
"binding_url": "binding_index_hmd.json"
136+
},
120137
{
121138
"controller_type": "vive_pro",
122139
"binding_url": "binding_vive_pro.json"
@@ -146,7 +163,9 @@
146163
"/actions/default/in/SkeletonRightHand": "Skeleton (Right)",
147164
"/actions/default/in/Teleport": "Teleport",
148165
"/actions/default/out/Haptic": "Haptic",
149-
"/actions/platformer/in/Jump": "Jump"
166+
"/actions/platformer/in/Jump": "Jump",
167+
"/actions/default/in/SnapTurnLeft": "Snap Turn (Left)",
168+
"/actions/default/in/SnapTurnRight": "Snap Turn (Right)"
150169
}
151170
]
152171
}

Assets/SteamVR/Input/ExampleJSON/actions.json.meta

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/SteamVR/Input/ExampleJSON/binding_holographic_hmd.json.meta

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"alias_info": {},
3+
"bindings": {
4+
"/actions/default": {
5+
"chords": [],
6+
"haptics": [],
7+
"poses": [],
8+
"skeleton": [],
9+
"sources": [
10+
{
11+
"inputs": {
12+
"click": {
13+
"output": "/actions/default/in/headsetonhead"
14+
}
15+
},
16+
"mode": "button",
17+
"path": "/user/head/proximity"
18+
}
19+
]
20+
}
21+
},
22+
"controller_type": "index_hmd",
23+
"description": "",
24+
"name": "index hmd defaults",
25+
"options": {},
26+
"simulated_actions": []
27+
}

Assets/SteamVR/Input/ExampleJSON/binding_vive_cosmos_controller.json.meta renamed to Assets/SteamVR/Input/ExampleJSON/binding_index_hmd.json.meta

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/SteamVR/Input/ExampleJSON/binding_rift.json.meta

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/SteamVR/Input/ExampleJSON/binding_vive.json.meta

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)