X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_util.cpp;fp=effect_util.cpp;h=f49b47707bde4920fbace424fca80113c979de59;hp=e57a562f870da38f93a07243caf801fa11d48b58;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=a80b859d6c8bb9ed1e7aa547d4a9972f1a041347

diff --git a/effect_util.cpp b/effect_util.cpp
index e57a562..f49b477 100644
--- a/effect_util.cpp
+++ b/effect_util.cpp
@@ -4,13 +4,15 @@
 #include <string>
 #include "util.h"
 
-GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
+using namespace std;
+
+GLint get_uniform_location(GLuint glsl_program_num, const string &prefix, const string &key)
 {
-	std::string name = prefix + "_" + key;
+	string name = prefix + "_" + key;
 	return glGetUniformLocation(glsl_program_num, name.c_str());
 }
 
-void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
+void set_uniform_int(GLuint glsl_program_num, const string &prefix, const string &key, int value)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
@@ -21,7 +23,7 @@ void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const s
 	check_error();
 }
 
-void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value)
+void set_uniform_float(GLuint glsl_program_num, const string &prefix, const string &key, float value)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
@@ -32,7 +34,7 @@ void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const
 	check_error();
 }
 
-void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec2(GLuint glsl_program_num, const string &prefix, const string &key, const float *values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
@@ -43,7 +45,7 @@ void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const
 	check_error();
 }
 
-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec3(GLuint glsl_program_num, const string &prefix, const string &key, const float *values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
@@ -54,7 +56,7 @@ void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const
 	check_error();
 }
 
-void set_uniform_vec4(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec4(GLuint glsl_program_num, const string &prefix, const string &key, const float *values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
@@ -65,7 +67,7 @@ void set_uniform_vec4(GLuint glsl_program_num, const std::string &prefix, const
 	check_error();
 }
 
-void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+void set_uniform_vec4_array(GLuint glsl_program_num, const string &prefix, const string &key, const float *values, size_t num_values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
@@ -76,7 +78,7 @@ void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix,
 	check_error();
 }
 
-void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d& matrix)
+void set_uniform_mat3(GLuint glsl_program_num, const string &prefix, const string &key, const Eigen::Matrix3d& matrix)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {