ソースを参照

Removed some leftover code

TheOnlyJoey 9 年 前
コミット
c913194e83
2 ファイル変更2 行追加5 行削除
  1. 1 3
      src/fusion.c
  2. 1 2
      src/fusion.h

+ 1 - 3
src/fusion.c

@@ -23,7 +23,7 @@ void ofusion_init(fusion* me)
 	me->grav_gain = 0.05f;
 }
 
-void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* accel, const vec3f* mag, const float prox)
+void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* accel, const vec3f* mag)
 {
 	me->ang_vel = *ang_vel;
 	me->accel = *accel;
@@ -34,8 +34,6 @@ void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* acc
 	vec3f world_accel;
 	oquatf_get_rotated(&me->orient, accel, &world_accel);
 
-	me->prox = prox;
-
 	me->iterations += 1;
 	me->time += dt;
 

+ 1 - 2
src/fusion.h

@@ -22,7 +22,6 @@ typedef struct {
 	vec3f ang_vel;  // angular velocity
 	vec3f mag;      // magnetometer
 	vec3f raw_mag;  // raw magnetometer values
-	float prox;     // proximity sensor
 
 	int iterations;
 	float time;
@@ -40,6 +39,6 @@ typedef struct {
 } fusion;
 
 void ofusion_init(fusion* me);
-void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* accel, const vec3f* mag_field, const float prox);
+void ofusion_update(fusion* me, float dt, const vec3f* ang_vel, const vec3f* accel, const vec3f* mag_field);
 
 #endif