X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=a1bc2fd3e868c8aa2e6a948237e5608ff11b491b;hp=62e0efcc314250505ea3513a159425e4a5a81580;hb=37f56fcbe571b2322243f6de59494bf9e0cbb37a;hpb=29072985d0a00a53e5b578a1444cee61a0c9e1f2

diff --git a/util.cpp b/util.cpp
index 62e0efc..a1bc2fd 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,11 +1,15 @@
-#include <stdio.h>
+#include <GL/glew.h>
+#include <assert.h>
 #include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <GL/glew.h>
+#include <Eigen/Core>
 
-#include "util.h"
 #include "init.h"
+#include "util.h"
+
+extern std::string *movit_data_directory;
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -65,10 +69,12 @@ void hsv2rgb_normalized(float h, float s, float v, float *r, float *g, float *b)
 
 std::string read_file(const std::string &filename)
 {
+	const std::string full_pathname = *movit_data_directory + "/" + filename;
+
 	static char buf[131072];
-	FILE *fp = fopen(filename.c_str(), "r");
+	FILE *fp = fopen(full_pathname.c_str(), "r");
 	if (fp == NULL) {
-		perror(filename.c_str());
+		perror(full_pathname.c_str());
 		exit(1);
 	}