Added all files associated with NOFC v0.2

nanospork · Dec 1, 2017 · 6bd4ceb · 6bd4ceb
1 parent 1cfb559
commit 6bd4ceb
Show file tree

Hide file tree

Showing 22 changed files with 368 additions and 0 deletions.
diff --git a/NOFC/NOFC-version.txt b/NOFC/NOFC-version.txt
@@ -0,0 +1,2 @@
+Nolo OSVR Fusion Configuration
+Version 0.2
diff --git a/NOFC/NOFCv0.2_hdk2.direct.json b/NOFC/NOFCv0.2_hdk2.direct.json
@@ -0,0 +1,41 @@
+{
+	"description": "Version 0.2 of the Nolo OSVR Fusion Configuration. This configuration uses intelligent sensor fusion and additional filters and settings to get the most out of Nolo hardware when used with the HDK.",
+    "display": "displays/OSVR_HDK_2_0.json",
+    "renderManagerConfig": "sample-configs/renderManager.direct.landscape.HDKv2.0.newtracker.json",
+	"drivers": [
+		/* --- NOLO OSVR FUSION CONFIGURATION v0.2 Drivers --- */
+		{
+			"plugin": "je_nourish_fusion", 			"driver": "FusionDevice", 			"params": { 				"name": "NoloFusedHead", 				"position": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1", 				"orientation": { 					"roll": "/NOFC/head/roll", 					"pitch": "/NOFC/head/pitch", 					"yawFast": "/NOFC/head/yaw", 					"yawAccurate": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1",
+			// DO NOT EDIT ABOVE THIS LINE
+			"alpha": 0.9995,
+			// DO NOT EDIT BELOW THIS LINE
+			"recenterButton": "/NOFC/recenterButton" 				}, 				"timestamp": "rotation", 				"flipButton": "/NOFC/flipButton", 				"flipOrigin": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1" 			} 		}, 		{ 			"plugin": "je_nourish_fusion", 			"driver": "FusionDevice", 			"params": { 				"name": "NoloControllerLeft", 				"position": "/com_osvr_Nolo/LYRobotix Nolo/tracker/2", 				"orientation": "/com_osvr_Nolo/LYRobotix Nolo/tracker/2", 				"flipButton": "/NOFC/flipButton", 				"flipOrigin": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1" 			} 		}, 		{ 			"plugin": "je_nourish_fusion", 			"driver": "FusionDevice", 			"params": { 				"name": "NoloControllerRight", 				"position": "/com_osvr_Nolo/LYRobotix Nolo/tracker/3", 				"orientation": "/com_osvr_Nolo/LYRobotix Nolo/tracker/3", 				"flipButton": "/NOFC/flipButton", 				"flipOrigin": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1" 			} 		}, 		{ 			"plugin": "org_osvr_filter_oneeuro", 			"driver": "OneEuroFilter", 			"params": { 				"name": "FilteredControllerLeft", 				"input": "/je_nourish_fusion/NoloControllerLeft/tracker/0", 				"position": { 					"minCutoff": 1.15, 					"beta": 0.5, 					"derivativeCutoff": 1.2 				}, 				"orientation": { 					"minCutoff": 1.5, 					"beta": 0.5, 					"derivativeCutoff": 1.2 				} 			} 		}, 		{ 			"plugin": "org_osvr_filter_oneeuro", 			"driver": "OneEuroFilter", 			"params": { 				"name": "FilteredControllerRight", 				"input": "/je_nourish_fusion/NoloControllerRight/tracker/0", 				"position": { 					"minCutoff": 1.15, 					"beta": 0.5, 					"derivativeCutoff": 1.2 				}, 				"orientation": { 					"minCutoff": 1.5, 					"beta": 0.5, 					"derivativeCutoff": 1.2 				} 			} 		}
+		/* --- End NOFC Drivers --- */
+		/* Add a comma after this comment to add more drivers to this config file */
+	],
+	"aliases": {
+		/* --- NOLO OSVR FUSION CONFIGURATION v0.2 Aliases --- */
+		"/NOFC/head/roll": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd",
+		"/NOFC/head/pitch": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd",
+		"/NOFC/head/yaw": "/hdkYawSpace",
+		"/NOFC/flipButton": "/controller/right/menu",
+		"/NOFC/recenterButton": "/controller/right/system",
+
+		"/hdkYawSpace": {
+			"rotate": {
+				"axis": "y",
+				"degrees": -180
+			},
+			"child": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd"
+        },	
+
+		"/me/head": "/je_nourish_fusion/NoloFusedHead/tracker/0",
+		"/me/hands/left": "/org_osvr_filter_oneeuro/FilteredControllerLeft/tracker/0",
+		"/me/hands/right": "/org_osvr_filter_oneeuro/FilteredControllerRight/tracker/0"
+		/* --- End NOFC Aliases --- */	
+		/* Add a comma after this comment to add more aliases to this config file */
+    },
+	"server": {
+		"sleep": 1
+	}
+}
diff --git a/NOFC/NOFCv0.2_hdk2.distv2.json b/NOFC/NOFCv0.2_hdk2.distv2.json
@@ -0,0 +1,146 @@
+{
+	"description": "[Distortion Correction V2 variant] Version 0.2 of the Nolo OSVR Fusion Configuration. This configuration uses intelligent sensor fusion and additional filters and settings to get the most out of Nolo hardware when used with the HDK.",
+	"sleep": 1,
+	"renderManagerConfig": {
+		"meta": {
+			"schemaVersion": 1
+		},
+		"renderManagerConfig": {
+			"directModeEnabled": true,
+			"directDisplayIndex": 0,
+			"directHighPriorityEnabled": true,
+			"numBuffers": 2,
+			"verticalSyncEnabled": true,
+			"verticalSyncBlockRenderingEnabled": true,
+			"renderOverfillFactor": 1.2,
+			"renderOversampleFactor": 1,
+			"window": {
+				"title": "OSVR",
+				"fullScreenEnabled": true,
+				"xPosition": 2560,
+				"yPosition": 0
+				},
+			"display": {
+				"rotation": 180,
+				"bitsPerColor": 8
+			},
+			"prediction": {
+				"enabled": true,
+				"staticDelayMS": 26,
+				"leftEyeDelayMS": 0,
+				"rightEyeDelayMS": 0,
+				"localTimeOverride": true
+			},
+			"timeWarp": {
+				"enabled": true,
+				"asynchronous": false,
+				"maxMsBeforeVSync": 5
+			}
+		}
+	},
+	"display": "c:/OSVR/hdk.v2.testdisplay.json",
+	"drivers": [
+		/* --- NOLO OSVR FUSION CONFIGURATION v0.2 Drivers --- */
+		{
+			"plugin": "je_nourish_fusion",
+			"driver": "FusionDevice",
+			"params": {
+				"name": "NoloFusedHead",
+				"position": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1",
+				"orientation": {
+					"roll": "/NOFC/head/roll",
+					"pitch": "/NOFC/head/pitch",
+					"yawFast": "/NOFC/head/yaw",
+					"yawAccurate": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1",
+					"alpha": 0.9995,
+					"recenterButton": "/NOFC/recenterButton"
+				},
+				"timestamp": "rotation",
+				"flipButton": "/NOFC/flipButton",
+				"flipOrigin": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1"
+			}
+		},
+		{
+			"plugin": "je_nourish_fusion",
+			"driver": "FusionDevice",
+			"params": {
+				"name": "NoloControllerLeft",
+				"position": "/com_osvr_Nolo/LYRobotix Nolo/tracker/2",
+				"orientation": "/com_osvr_Nolo/LYRobotix Nolo/tracker/2",
+				"flipButton": "/NOFC/flipButton",
+				"flipOrigin": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1"
+			}
+		},
+		{
+			"plugin": "je_nourish_fusion",
+			"driver": "FusionDevice",
+			"params": {
+				"name": "NoloControllerRight",
+				"position": "/com_osvr_Nolo/LYRobotix Nolo/tracker/3",
+				"orientation": "/com_osvr_Nolo/LYRobotix Nolo/tracker/3",
+				"flipButton": "/NOFC/flipButton",
+				"flipOrigin": "/com_osvr_Nolo/LYRobotix Nolo/tracker/1"
+			}
+		},
+		{
+			"plugin": "org_osvr_filter_oneeuro",
+			"driver": "OneEuroFilter",
+			"params": {
+				"name": "FilteredControllerLeft",
+				"input": "/je_nourish_fusion/NoloControllerLeft/tracker/0",
+				"position": {
+					"minCutoff": 1.15,
+					"beta": 0.5,
+					"derivativeCutoff": 1.2
+				},
+				"orientation": {
+					"minCutoff": 1.5,
+					"beta": 0.5,
+					"derivativeCutoff": 1.2
+				}
+			}
+		},
+		{
+			"plugin": "org_osvr_filter_oneeuro",
+			"driver": "OneEuroFilter",
+			"params": {
+				"name": "FilteredControllerRight",
+				"input": "/je_nourish_fusion/NoloControllerRight/tracker/0",
+				"position": {
+					"minCutoff": 1.15,
+					"beta": 0.5,
+					"derivativeCutoff": 1.2
+				},
+				"orientation": {
+					"minCutoff": 1.5,
+					"beta": 0.5,
+					"derivativeCutoff": 1.2
+				}
+			}
+		}
+		/* --- End NOFC Drivers --- */
+		/* Add a comma after this comment to add more drivers to this config file */
+	],
+	"aliases": {
+		/* --- NOLO OSVR FUSION CONFIGURATION v0.2 Aliases --- */
+		"/NOFC/head/roll": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd",
+		"/NOFC/head/pitch": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd",
+		"/NOFC/head/yaw": "/hdkYawSpace",
+		"/NOFC/flipButton": "/controller/right/menu",
+		"/NOFC/recenterButton": "/controller/right/system",
+
+		"/hdkYawSpace": {
+			"rotate": {
+				"axis": "y",
+				"degrees": -180
+			},
+			"child": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd"
+        },	
+
+		"/me/head": "/je_nourish_fusion/NoloFusedHead/tracker/0",
+		"/me/hands/left": "/org_osvr_filter_oneeuro/FilteredControllerLeft/tracker/0",
+		"/me/hands/right": "/org_osvr_filter_oneeuro/FilteredControllerRight/tracker/0"
+		/* --- End NOFC Aliases --- */	
+		/* Add a comma after this comment to add more aliases to this config file */
+    }
+}
diff --git a/NOFC/OSVR-Core/bin/NOFC-version.txt b/NOFC/OSVR-Core/bin/NOFC-version.txt
@@ -0,0 +1,2 @@
+Nolo OSVR Fusion Configuration
+Version 0.2
diff --git a/NOFC/OSVR-Core/bin/hidapi.dll b/NOFC/OSVR-Core/bin/hidapi.dll
diff --git a/NOFC/OSVR-Core/bin/osvr-plugins-0/com_osvr_Nolo.dll b/NOFC/OSVR-Core/bin/osvr-plugins-0/com_osvr_Nolo.dll
diff --git a/NOFC/OSVR-Core/bin/osvr-plugins-0/je_nourish_fusion.dll b/NOFC/OSVR-Core/bin/osvr-plugins-0/je_nourish_fusion.dll
diff --git a/NOFC/OSVR-SteamVR/NOFC-version.txt b/NOFC/OSVR-SteamVR/NOFC-version.txt
@@ -0,0 +1,2 @@
+Nolo OSVR Fusion Configuration
+Version 0.2
diff --git a/NOFC/OSVR-SteamVR/bin/osvr_print_displays.exe b/NOFC/OSVR-SteamVR/bin/osvr_print_displays.exe
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/SDL2.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/SDL2.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/d3dcompiler_47.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/d3dcompiler_47.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/driver_osvr.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/driver_osvr.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/glew32.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/glew32.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrClient.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrClient.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrClientKit.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrClientKit.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrCommon.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrCommon.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrRenderManager.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrRenderManager.dll
diff --git a/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrUtil.dll b/NOFC/OSVR-SteamVR/osvr/bin/win64/osvrUtil.dll
diff --git a/NOFC/OSVR-SteamVR/register_osvr_driver.cmd b/NOFC/OSVR-SteamVR/register_osvr_driver.cmd
@@ -0,0 +1,14 @@
+@echo off
+cls
+SET mypath=%~dp0
+
+REM detect Steam install directory
+for /f "tokens=2*" %%A in ('reg query hku /e /c /v /f SteamPath /t REG_SZ /s 2^>^NUL') DO (
+	set SteamPath=%%B
+	goto :start
+)
+:start
+
+REM register driver
+"%SteamPath%\steamapps\common\SteamVR\bin\win32\vrpathreg.exe" adddriver "%mypath:~0,-1%\osvr"
+
diff --git a/NOFC/OSVR-SteamVR/unregister_osvr_driver.cmd b/NOFC/OSVR-SteamVR/unregister_osvr_driver.cmd
@@ -0,0 +1,16 @@
+@echo off
+cls
+SET mypath=%~dp0
+
+REM detect Steam install directory
+for /f "tokens=2*" %%A in ('reg query hku /e /c /v /f SteamPath /t REG_SZ /s 2^>^NUL') DO (
+	set SteamPath=%%B
+	goto :start
+)
+:start
+
+REM unregister driver
+"%SteamPath%\steamapps\common\SteamVR\bin\win32\vrpathreg.exe" removedriver "%mypath:~0,-1%\osvr"
+
+REM always return with 0 to not interrupt uninstall
+exit /b 0