HairyFotr il y a 7 ans
Parent
commit
5af90501df

+ 3 - 3
cmake/FindSDL2.cmake

@@ -4,12 +4,12 @@
 # SDL2_FOUND, if false, do not try to link to SDL2
 # SDL2_INCLUDE_DIR, where to find SDL.h
 #
-# This module responds to the the flag:
+# This module responds to the flag:
 # SDL2_BUILDING_LIBRARY
 # If this is defined, then no SDL2_main will be linked in because
 # only applications need main().
 # Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
+# module will attempt to locate and set the proper link flags
 # as part of the returned SDL2_LIBRARY variable.
 #
 # Don't forget to include SDL2main.h and SDL2main.m your project for the
@@ -130,7 +130,7 @@ IF(NOT APPLE)
 ENDIF(NOT APPLE)
 
 # MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
+# Its total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
 # (Actually on second look, I think it only needs one of the m* libraries.)
 IF(MINGW)
   SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")

+ 1 - 1
examples/opengl/gl.c

@@ -52,7 +52,7 @@ void init_gl(gl_ctx* ctx, int w, int h)
 
 	SDL_GL_SetSwapInterval(1);
 
-	// Disable ctrl-c catching on linux (and OS X?) 
+	// Disable ctrl-c catching on Linux (and OS X?)
 #ifdef __unix
 	signal(SIGINT, SIG_DFL);
 #endif

+ 3 - 3
examples/opengl/main.c

@@ -148,13 +148,13 @@ int main(int argc, char** argv)
 	//distortion coefficients
 	ohmd_device_getf(hmd, OHMD_UNIVERSAL_DISTORTION_K, &(distortion_coeffs[0]));
 	ohmd_device_getf(hmd, OHMD_UNIVERSAL_ABERRATION_K, &(aberr_scale[0]));
-	//calculate lens centers (assuming the eye separation is the distance betweenteh lense centers)
+	//calculate lens centers (assuming the eye separation is the distance between the lens centers)
 	ohmd_device_getf(hmd, OHMD_LENS_HORIZONTAL_SEPARATION, &sep);
 	ohmd_device_getf(hmd, OHMD_LENS_VERTICAL_POSITION, &(left_lens_center[1]));
 	ohmd_device_getf(hmd, OHMD_LENS_VERTICAL_POSITION, &(right_lens_center[1]));
 	left_lens_center[0] = viewport_scale[0] - sep/2.0f;
 	right_lens_center[0] = sep/2.0f;
-	//asume calibration was for lens view to which ever edge of screen is further away from lens center
+	//assume calibration was for lens view to which ever edge of screen is further away from lens center
 	float warp_scale = (left_lens_center[0] > right_lens_center[0]) ? left_lens_center[0] : right_lens_center[0];
 	float warp_adj = 1.0f;
 
@@ -238,7 +238,7 @@ int main(int argc, char** argv)
 						printf("lens separation: %04f\n", sep);
 						printf("IPD: %0.4f\n", ipd);
 						printf("warp_scale: %0.4f\r\n", warp_scale);
-						printf("distoriton coeffs: [%0.4f, %0.4f, %0.4f, %0.4f]\n", distortion_coeffs[0], distortion_coeffs[1], distortion_coeffs[2], distortion_coeffs[3]);
+						printf("distortion coeffs: [%0.4f, %0.4f, %0.4f, %0.4f]\n", distortion_coeffs[0], distortion_coeffs[1], distortion_coeffs[2], distortion_coeffs[3]);
 						printf("aberration coeffs: [%0.4f, %0.4f, %0.4f]\n", aberr_scale[0], aberr_scale[1], aberr_scale[2]);
 						printf("left_lens_center: [%0.4f, %0.4f]\n", left_lens_center[0], left_lens_center[1]);
 						printf("right_lens_center: [%0.4f, %0.4f]\n", right_lens_center[0], right_lens_center[1]);

+ 2 - 2
src/drv_deepoon/deepoon.c

@@ -254,13 +254,13 @@ static ohmd_device* open_device(ohmd_driver* driver, ohmd_device_desc* desc)
 	ohmd_set_default_device_properties(&priv->base.properties);
 
 	// Set device properties
-	//NOTE: These values are estimations, no one has taken one appart to check
+	//NOTE: These values are estimations, no one has taken one apart to check
 	priv->base.properties.hsize = 0.1698f;
 	priv->base.properties.vsize = 0.0936f;
 	priv->base.properties.hres = 1920;
 	priv->base.properties.vres = 1080;
 	priv->base.properties.lens_sep = 0.0849f;
-	priv->base.properties.lens_vpos = 0.0468f;;
+	priv->base.properties.lens_vpos = 0.0468f;
 	priv->base.properties.fov = DEG_TO_RAD(110.0); // TODO calculate.
 	priv->base.properties.ratio = ((float)1920 / (float)1080) / 2.0f;
 

+ 2 - 2
src/drv_oculus_rift/rift.c

@@ -87,7 +87,7 @@ static void set_coordinate_frame(rift_priv* priv, rift_coordinate_frame coordfra
 	}
 
 	// read the state again, set the hw_coordinate_frame to match what
-	// the hardware actually is set to just incase it doesn't stick.
+	// the hardware actually is set to just in case it doesn't stick.
 	size = get_feature_report(priv, RIFT_CMD_SENSOR_CONFIG, buf);
 	if(size <= 0){
 		LOGW("could not set coordinate frame");
@@ -249,7 +249,7 @@ static ohmd_device* open_device(ohmd_driver* driver, ohmd_device_desc* desc)
 	if(!priv->handle) {
 		char* path = _hid_to_unix_path(desc->path);
 		ohmd_set_error(driver->ctx, "Could not open %s.\n"
-		                            "Check your rights: "
+		                            "Check your permissions: "
 		                            UDEV_WIKI_URL, path);
 		free(path);
 		goto cleanup;

+ 1 - 1
src/fusion.c

@@ -96,7 +96,7 @@ void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* acc
 			}
 		}
 
-		// preform gravity tilt correction
+		// perform gravity tilt correction
 		if(me->grav_error_angle > min_tilt_error){
 			float use_angle;
 			// if less than 2000 iterations have passed, set the up axis to the correction value outright

+ 3 - 3
src/openhmd.c

@@ -5,7 +5,7 @@
  * Distributed under the Boost 1.0 licence, see LICENSE for full text.
  */
 
-/* Main Lib Implemenation */
+/* Main Lib Implementation */
 
 #include "openhmdi.h"
 #include "shaders.h"
@@ -554,7 +554,7 @@ void ohmd_calc_default_proj_matrices(ohmd_device_properties* props)
 	// same projection matrix with the exception of the offset.
 	omat4x4f_init_perspective(&proj_base, props->fov, props->ratio, props->znear, props->zfar);
 
-	// Setup the two adjusted projection matricies. Each is setup to deal
+	// Setup the two adjusted projection matrices. Each is setup to deal
 	// with the fact that the lens is not in the center of the screen.
 	// These matrices only change of the hardware changes, so static.
 	mat4x4f translate;
@@ -587,7 +587,7 @@ uint64_t ohmd_monotonic_per_sec(ohmd_context* ctx)
 }
 
 /*
- * Grabbed from druntime, good thing its BOOST v1.0 as well.
+ * Grabbed from druntime, good thing it's BOOST v1.0 as well.
  */
 uint64_t ohmd_monotonic_conv(uint64_t ticks, uint64_t srcTicksPerSecond, uint64_t dstTicksPerSecond)
 {