diff options
-rw-r--r-- | src/survive_data.c | 2 | ||||
-rw-r--r-- | tools/plot_lighthouse/Makefile | 4 | ||||
-rw-r--r-- | tools/plot_lighthouse/main.c | 5 | ||||
-rw-r--r-- | tools/process_rawcap/process_to_points.c | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/survive_data.c b/src/survive_data.c index afda235..b79f96e 100644 --- a/src/survive_data.c +++ b/src/survive_data.c @@ -135,8 +135,10 @@ static void handle_lightcap( struct SurviveObject * so, struct LightcapElement * int32_t delta1 = so->last_time[0] - so->recent_sync_time; int32_t delta2 = so->last_time[1] - so->last_time[0]; + //XXX Axlecrusher -> Add your code here!!! ctx->lightproc( so, -1, acode_array[0], delta1, so->last_time[0], so->last_length[0] ); ctx->lightproc( so, -2, acode_array[1], delta2, so->last_time[1], so->last_length[1] ); + so->recent_sync_time = so->last_time[1]; //Throw out everything if our sync pulses look like they're bad. diff --git a/tools/plot_lighthouse/Makefile b/tools/plot_lighthouse/Makefile index d156bdb..db382ea 100644 --- a/tools/plot_lighthouse/Makefile +++ b/tools/plot_lighthouse/Makefile @@ -1,7 +1,7 @@ UNAME := $(shell uname) ifeq ($(UNAME), Linux) -CFLAGS:= -lGL -lGLU -lglut +CFLAGS:= -lGL -lGLU -lglut -I../../redist -DLINUX -lm -lpthread endif # Darwin is Mac OSX !! @@ -10,6 +10,6 @@ CFLAGS:= -w -framework OpenGL -framework GLUT endif all: - gcc -O3 -o plot_lighthouse main.c glutil.c fileutil.c ../../redist/os_generic.c $(CFLAGS) + gcc -O3 -o plot_lighthouse main.c glutil.c fileutil.c ../../redist/os_generic.c ../../redist/linmath.c $(CFLAGS) clean: rm -f plot_lighthouse diff --git a/tools/plot_lighthouse/main.c b/tools/plot_lighthouse/main.c index 8088828..4a64c28 100644 --- a/tools/plot_lighthouse/main.c +++ b/tools/plot_lighthouse/main.c @@ -13,6 +13,11 @@ #include "glutil.h" #include "fileutil.h" +#ifdef LINUX +#include <GL/freeglut.h> +#endif + + // Required to set up a window #define WIDTH 800 #define HEIGHT 600 diff --git a/tools/process_rawcap/process_to_points.c b/tools/process_rawcap/process_to_points.c index a1e835d..3ccfcc1 100644 --- a/tools/process_rawcap/process_to_points.c +++ b/tools/process_rawcap/process_to_points.c @@ -192,7 +192,8 @@ int main( int argc, char ** argv ) stddevtim += Sdiff * Sdiff; stddevlen += Ldiff * Ldiff; - Sdiff/=4; + //Cast a wider net for the histogram. + //Sdiff/=4; int llm = Sdiff + (HISTOGRAMSIZE/2.0); if( llm < 0 ) llm = 0; |