X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=a1fac6da35473ed1a77d64b8ed39bc53a9024a09;hp=eeea198a4a074fa357311356d3157e7d00f15d36;hb=18fdebc534adc6b7a4c36b290b01d598bcb671bc;hpb=34f5f331bd3b643949ccbb0c3488af2823634d59

diff --git a/util.cpp b/util.cpp
index eeea198..a1fac6d 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,11 +1,14 @@
+#include <GL/glew.h>
+#include <assert.h>
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
+#include <Eigen/Core>
 
-#include <math.h>
-#include "util.h"
-#include "opengl.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 +68,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);
 	}