X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=3b15c3787d7e82644d6c5633d9ea05387e0efb88;hp=a1bc2fd3e868c8aa2e6a948237e5608ff11b491b;hb=5b1ec775a021f215307fc63e8df54bb1109aeb58;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/util.cpp b/util.cpp
index a1bc2fd..3b15c37 100644
--- a/util.cpp
+++ b/util.cpp
@@ -9,7 +9,9 @@
 #include "init.h"
 #include "util.h"
 
-extern std::string *movit_data_directory;
+using namespace std;
+
+extern string *movit_data_directory;
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -67,9 +69,9 @@ void hsv2rgb_normalized(float h, float s, float v, float *r, float *g, float *b)
 	}
 }
 
-std::string read_file(const std::string &filename)
+string read_file(const string &filename)
 {
-	const std::string full_pathname = *movit_data_directory + "/" + filename;
+	const string full_pathname = *movit_data_directory + "/" + filename;
 
 	static char buf[131072];
 	FILE *fp = fopen(full_pathname.c_str(), "r");
@@ -81,10 +83,10 @@ std::string read_file(const std::string &filename)
 	int len = fread(buf, 1, sizeof(buf), fp);
 	fclose(fp);
 
-	return std::string(buf, len);
+	return string(buf, len);
 }
 
-GLuint compile_shader(const std::string &shader_src, GLenum type)
+GLuint compile_shader(const string &shader_src, GLenum type)
 {
 	GLuint obj = glCreateShader(type);
 	const GLchar* source[] = { shader_src.data() };
@@ -97,7 +99,7 @@ GLuint compile_shader(const std::string &shader_src, GLenum type)
 	glGetShaderInfoLog(obj, log_length, &log_length, info_log);
 	info_log[log_length] = 0; 
 	if (strlen(info_log) > 0) {
-		printf("shader compile log: %s\n", info_log);
+		fprintf(stderr, "Shader compile log: %s\n", info_log);
 	}
 
 	GLint status;
@@ -117,7 +119,7 @@ void print_3x3_matrix(const Eigen::Matrix3d& m)
 	printf("\n");
 }
 
-std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m)
+string output_glsl_mat3(const string &name, const Eigen::Matrix3d &m)
 {
 	char buf[1024];
 	sprintf(buf,