Last fixes before merge, see pull/87

README.md

@@ -103,7 +103,4 @@ Will be available soon.
 ## Using OpenHMD
 See the examples/ subdirectory for usage examples. The OpenGL example is not built by default, to build it use the --enable-openglexample option for the configure script. It requires SDL, glew and OpenGL.
 
-An API reference can be generated using doxygen and is also available here: http://openhmd.net/doxygen/0.1.0/openhmd_8h.html
-
-
-
+An API reference can be generated using doxygen and is also available here: http://openhmd.net/doxygen/0.1.0/openhmd_8h.html

examples/opengl/gl.h

@@ -10,7 +10,7 @@
 #ifndef GL_H
 #define GL_H
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include <GL/glew.h>
 #include <GL/gl.h>

src/drv_htc_vive/config.h

@@ -1,41 +0,0 @@
-/* Suppress the warnings for this include, since we don't care about them for external dependencies
- * Requires at least GCC 4.6 or higher
-*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#pragma GCC diagnostic ignored "-Wswitch"
-#include "../ext_deps/miniz.c"
-#include "../ext_deps/mjson.h"
-#pragma GCC diagnostic pop
-
-//Temporary, will get 'structed up'
-static double acc_bias[3];
-static double acc_scale[3];
-static double gyro_bias[3];
-static double gyro_scale[3];
-//end of temporary
-
-//Vive config packet
-const struct json_attr_t sensor_offsets[] = {
-    {"acc_bias", t_array,   .addr.array.element_type = t_real,
-                            .addr.array.arr.reals.store = acc_bias,
-                            .addr.array.maxlen = 3},
-    {"acc_scale", t_array,  .addr.array.element_type = t_real,
-                            .addr.array.arr.reals.store = acc_scale,
-                            .addr.array.maxlen = 3},
-    {"device", t_object},
-    {"device_class", t_ignore},
-    {"device_pid", t_ignore},
-    {"device_serial_number", t_ignore},
-    {"device_vid", t_ignore},
-    {"display_edid", t_ignore},
-    {"display_gc", t_ignore},
-    {"display_mc", t_ignore},
-    {"gyro_bias", t_array,  .addr.array.element_type = t_real,
-                            .addr.array.arr.reals.store = gyro_bias,
-                            .addr.array.maxlen = 3},
-    {"gyro_scale", t_array, .addr.array.element_type = t_real,
-                            .addr.array.arr.reals.store = gyro_scale,
-                            .addr.array.maxlen = 3},
-    {NULL},
-};

src/drv_htc_vive/packet.c

@@ -1,5 +1,5 @@
 #include "vive.h"
-#include "config.h"
+#include "vive_config.h"
 
 inline static uint8_t read8(const unsigned char** buffer)
 {

src/fusion.c

@@ -124,4 +124,3 @@ void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* acc
 	// inprecision with quat multiplication.
 	oquatf_normalize_me(&me->orient);
 }
-