WIP: Linux support

.gitignore

@@ -8,3 +8,12 @@ ipch
 /OpenVR-SpaceCalibratorDriver/x64/
 /x64/
 /lib/boost*
+*.o
+*.a
+*.srctrlprj
+*.srctrldb
+*.srctrlbm
+*.out
+OpenVR-SpaceCalibratorDriver/01spacecalibrator/bin/linux64/
+build
+*.gitignore

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "OpenVR-SpaceCalibrator/gl3w"]
+	path = OpenVR-SpaceCalibrator/gl3w
+	url = https://github.com/skaslev/gl3w.git
+[submodule "modules/imgui"]
+	path = modules/imgui
+	url = https://github.com/ocornut/imgui.git
+[submodule "modules/openvr"]
+	path = modules/openvr
+	url = https://github.com/ValveSoftware/openvr.git

CMakeLists.txt

@@ -0,0 +1,120 @@
+cmake_minimum_required(VERSION 3.10)
+
+project (OpenVR-SpaceCalibrator VERSION 1.0)
+add_definitions(-D__linux__)
+
+set(CMAKE_BUILD_TYPE Debug)
+set(DRIVER_LOG_FILE "/tmp/spaceCalDriverLog.txt" CACHE PATH "Driver Log Path" )
+set(LINUX_CONFIG_DIR ".config/OpenVR-SpaceCalibrator" CACHE PATH "Config subdirectory (from HOME)" )
+
+add_library(imgui 
+	lib/imgui/imgui.cpp
+	lib/imgui/imgui_demo.cpp
+	lib/imgui/imgui_draw.cpp
+	lib/imgui/imgui_impl_glfw.cpp
+	lib/imgui/imgui_impl_opengl3.cpp
+    modules/imgui/backends/imgui_impl_glfw.cpp
+)
+
+find_library(glfw libglfw.so)
+find_library(GL libGL.so)
+find_library( openvr_api  libopenvr_api.so PATHS ./modules/openvr/bin/linux64/libopenvr_api.so )
+
+include_directories(OpenVR-SpaceCalibratorDriver)
+include_directories(/usr/include/eigen3)
+include_directories(lib/gl3w/include)
+include_directories(lib)
+include_directories(modules/openvr/headers)
+
+add_library( gl3w lib/gl3w/src/gl3w.c )
+
+#configure_file(LinixConfig.h.in LinuxConfig.h)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+add_executable(OpenVR-SpaceCalibrator 
+    OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.cpp
+    OpenVR-SpaceCalibrator/Calibration.cpp
+    OpenVR-SpaceCalibrator/Configuration.cpp
+    OpenVR-SpaceCalibrator/EmbeddedFiles.cpp
+    OpenVR-SpaceCalibrator/IPCClient.cpp
+    OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.cpp
+    OpenVR-SpaceCalibrator/UserInterface.cpp
+    OpenVR-SpaceCalibrator/stdafx.cpp
+    ./OpenVR-SpaceCalibratorDriver/compat.cpp
+    ./OpenVR-SpaceCalibratorDriver/Logging.cpp
+)
+TARGET_LINK_LIBRARIES(OpenVR-SpaceCalibrator PRIVATE openvr_api imgui gl3w GL glfw)
+
+add_library(
+    driver_01spacecalibrator
+    SHARED
+    OpenVR-SpaceCalibratorDriver/OpenVR-SpaceCalibratorDriver.cpp
+    OpenVR-SpaceCalibratorDriver/Hooking.cpp
+    OpenVR-SpaceCalibratorDriver/IPCServer.cpp
+    OpenVR-SpaceCalibratorDriver/InterfaceHookInjector.cpp
+    OpenVR-SpaceCalibratorDriver/Logging.cpp
+    OpenVR-SpaceCalibratorDriver/ServerTrackedDeviceProvider.cpp
+    OpenVR-SpaceCalibratorDriver/compat.cpp
+    OpenVR-SpaceCalibratorDriver/dllmain.cpp
+)
+
+set_target_properties(driver_01spacecalibrator PROPERTIES
+    OUTPUT_NAME driver_01spacecalibrator
+    PREFIX ""
+)
+
+#######################################################################################
+set( APP_MANIFEST_PATH ${CMAKE_INSTALL_PREFIX}/share/openvr-spacecalibrator/manifest.vrmanifest )
+set( DRIVER_INSTALLER_PATH ${CMAKE_INSTALL_PREFIX}/share/openvr-spacecalibrator )
+set( DRIVER_MANIFEST_PATH ${CMAKE_INSTALL_PREFIX}/lib/steamvr/OpenVR-SpaceCalibrator/01spacecalibrator )
+configure_file( StaticConfig.h.in StaticConfig.h )
+
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+configure_file( ./OpenVR-SpaceCalibrator/manifest.vrmanifest ${CMAKE_CURRENT_BINARY_DIR}/manifest.vrmanifest )
+configure_file( ./OpenVR-SpaceCalibratorDriver/01spacecalibrator/driver.vrdrivermanifest ${CMAKE_CURRENT_BINARY_DIR}/driver.vrdrivermanifest )
+configure_file( ./driverInstall.py ${CMAKE_CURRENT_BINARY_DIR}/driverInstall.py )
+
+
+#######################################################################################
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.vrmanifest
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/openvr-spacecalibrator
+)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/driver.vrdrivermanifest
+    DESTINATION lib/steamvr/OpenVR-SpaceCalibrator/01spacecalibrator
+)
+
+install(
+    TARGETS OpenVR-SpaceCalibrator 
+)
+install(
+    TARGETS driver_01spacecalibrator
+    DESTINATION lib/steamvr/OpenVR-SpaceCalibrator/01spacecalibrator/bin/linux64/
+)
+
+install(
+    FILES driverInstall.py
+    DESTINATION "${DRIVER_INSTALLER_PATH}"
+)
+
+find_package(Git QUIET)
+
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+    # Update submodules as needed
+    option(GIT_SUBMODULE "Check submodules during build" ON)
+    if(GIT_SUBMODULE)
+        message(STATUS "Submodule update")
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        RESULT_VARIABLE GIT_SUBMOD_RESULT)
+        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+            message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+        endif()
+    endif()
+endif()
+

OpenVR-SpaceCalibrator/Calibration.h

@@ -87,7 +87,7 @@ struct CalibrationContext
 			Progress
 		} type = String;
 
-		Message(Type type) : type(type) { }
+		Message(Type _type) : type(_type) { }
 
 		std::string str;
 		int progress, target;
@@ -120,4 +120,4 @@ void InitCalibrator();
 void CalibrationTick(double time);
 void StartCalibration();
 void LoadChaperoneBounds();
-void ApplyChaperoneBounds();
+void ApplyChaperoneBounds();

OpenVR-SpaceCalibrator/Configuration.cpp

@@ -4,11 +4,21 @@
 #include <picojson.h>
 
 #include <string>
-#include <iostream>
+#include "stdio.h"
 #include <fstream>
 #include <iomanip>
 #include <limits>
 
+#include "Logging.h"
+
+#ifdef __linux__
+#include <unistd.h> 
+#include <string.h>
+#include <sys/stat.h>
+#include "StaticConfig.h"
+#define LINUX_CONFIG_FILE "spacecal-config.json"
+#endif
+
 static picojson::array FloatArray(const float *buf, int numFloats)
 {
 	picojson::array arr;
@@ -25,7 +35,7 @@ static void LoadFloatArray(const picojson::value &obj, float *buf, int numFloats
 		throw std::runtime_error("expected array, got " + obj.to_str());
 
 	auto &arr = obj.get<picojson::array>();
-	if (arr.size() != numFloats)
+	if (arr.size() != (size_t) numFloats)
 		throw std::runtime_error("wrong buffer size");
 
 	for (int i = 0; i < numFloats; i++)
@@ -142,17 +152,77 @@ static void WriteProfile(CalibrationContext &ctx, std::ostream &out)
 	out << profilesV.serialize(true);
 }
 
+#ifdef __linux__
+// NOP
+#else
+static const char *RegistryKey = "Software\\OpenVR-SpaceCalibrator";
 static void LogRegistryResult(LSTATUS result)
 {
 	char *message;
 	FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, 0, result, LANG_USER_DEFAULT, (LPSTR)&message, 0, NULL);
 	std::cerr << "Opening registry key: " << message << std::endl;
 }
-
-static const char *RegistryKey = "Software\\OpenVR-SpaceCalibrator";
+#endif
 
 static std::string ReadRegistryKey()
 {
+#ifdef __linux__
+
+    char configPath[1024];
+    const char * home = getenv("HOME");
+    snprintf( configPath, 1024, "%s/" LINUX_CONFIG_DIR, home);
+
+    struct stat statResult;
+    if(stat(LINUX_CONFIG_DIR, &statResult)){
+        if(errno != 2){ // no idea why 2 is returned instead of the documented ENOTDIR
+            int rr = errno;
+            LOG("Error determining if %s is a directory: %s, %s", configPath, strerror(rr), strerror(2));
+            return "";
+        } else {
+            int rr = errno;
+            LOG("The directory %s is confirmed to not exist %d-%s", configPath, rr, strerror(rr));
+            int retCode;
+
+            char cmd[1500];
+            snprintf(cmd, 1500, "mkdir -p %s", configPath);
+            LOG("Running: %s", cmd);
+            if( (retCode = system(cmd)) ){
+                LOG("Error %d making directory " LINUX_CONFIG_DIR, retCode);
+                return "";
+            }
+        }
+    }
+
+    char configFilePath[2000];
+    snprintf(configFilePath, 2000, "%s/" LINUX_CONFIG_FILE, configPath);
+
+    LOG("Opening file at %s", configFilePath);
+
+    FILE* file = fopen(configFilePath, "r");
+
+
+
+
+
+
+
+    if(!file) return "";
+
+    std::string ret;
+    const int buffSize = 4097;
+    int count = 0;
+    char buff[buffSize];
+    buff[buffSize-1] = 0;
+
+    do{
+        count = fread((void*) buff, 1, buffSize, file);
+        if(count > 0){
+            ret += buff;
+        }
+    }while(buffSize == count);
+    fclose(file);
+    return ret;
+#else
 	DWORD size = 0;
 	auto result = RegGetValueA(HKEY_CURRENT_USER_LOCAL_SETTINGS, RegistryKey, "Config", RRF_RT_REG_SZ, 0, 0, &size);
 	if (result != ERROR_SUCCESS)
@@ -173,10 +243,52 @@ static std::string ReadRegistryKey()
 
 	str.resize(size - 1);
 	return str;
+#endif
 }
 
 static void WriteRegistryKey(std::string str)
 {
+#ifdef __linux__
+    struct stat statResult;
+
+    char configPath[1024];
+    const char * home = getenv("HOME");
+    snprintf( configPath, 1024, "%s/" LINUX_CONFIG_DIR, home);
+
+    if(stat(LINUX_CONFIG_DIR, &statResult)){
+        if(errno != 2){ // no idea why 2 is returned instead of the documented ENOTDIR
+            int rr = errno;
+            LOG("Error determining if %s is a directory: %s, %s", configPath, strerror(rr), strerror(2));
+            return;
+        } else {
+            int rr = errno;
+            LOG("The directory %s is confirmed to not exist %d-%s", configPath, rr, strerror(rr));
+            int retCode;
+
+            char cmd[1500];
+            snprintf(cmd, 1500, "mkdir -p %s", configPath);
+            LOG("Running: %s", cmd);
+            if( (retCode = system(cmd)) ){
+                LOG("Error %d making directory " LINUX_CONFIG_DIR, retCode);
+                return;
+            }
+        }
+    }
+
+    char configFilePath[2000];
+    snprintf(configFilePath, 2000, "%s/" LINUX_CONFIG_FILE, configPath);
+
+    FILE* file = fopen(configFilePath, "w");
+    if(!file) {
+        LOG("%s - %d-%s", "Error opening config file for writing", errno, strerror(errno));
+        return;
+    } else {
+        LOG("Opened file at %s to save settings", configFilePath);
+    }
+
+    fprintf(file, "%s", str.c_str());
+    fclose(file);
+#else
 	HKEY hkey;
 	auto result = RegCreateKeyExA(HKEY_CURRENT_USER_LOCAL_SETTINGS, RegistryKey, 0, REG_NONE, 0, KEY_ALL_ACCESS, 0, &hkey, 0);
 	if (result != ERROR_SUCCESS)
@@ -192,6 +304,7 @@ static void WriteRegistryKey(std::string str)
 		LogRegistryResult(result);
 
 	RegCloseKey(hkey);
+#endif
 }
 
 void LoadProfile(CalibrationContext &ctx)

OpenVR-SpaceCalibrator/Configuration.h

@@ -2,5 +2,9 @@
 
 #include "Calibration.h"
 
+#ifdef __linux__
+#include "StaticConfig.h"
+#endif
+
 void LoadProfile(CalibrationContext &ctx);
 void SaveProfile(CalibrationContext &ctx);