X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=9cd611f8518ed3cd2a4d58c8dd2bb7a69ce0cfb0;hp=b17c0d62c6d524aa8909ad619c03f228f5b322d4;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=6602e2b9d5e5a44c0f075fe083ecc26feb10c173

diff --git a/effect.cpp b/effect.cpp
index b17c0d6..9cd611f 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -8,7 +8,9 @@
 #include "effect_util.h"
 #include "util.h"
 
-bool Effect::set_int(const std::string &key, int value)
+using namespace std;
+
+bool Effect::set_int(const string &key, int value)
 {
 	if (params_int.count(key) == 0) {
 		return false;
@@ -17,7 +19,7 @@ bool Effect::set_int(const std::string &key, int value)
 	return true;
 }
 
-bool Effect::set_float(const std::string &key, float value)
+bool Effect::set_float(const string &key, float value)
 {
 	if (params_float.count(key) == 0) {
 		return false;
@@ -26,7 +28,7 @@ bool Effect::set_float(const std::string &key, float value)
 	return true;
 }
 
-bool Effect::set_vec2(const std::string &key, const float *values)
+bool Effect::set_vec2(const string &key, const float *values)
 {
 	if (params_vec2.count(key) == 0) {
 		return false;
@@ -35,7 +37,7 @@ bool Effect::set_vec2(const std::string &key, const float *values)
 	return true;
 }
 
-bool Effect::set_vec3(const std::string &key, const float *values)
+bool Effect::set_vec3(const string &key, const float *values)
 {
 	if (params_vec3.count(key) == 0) {
 		return false;
@@ -44,7 +46,7 @@ bool Effect::set_vec3(const std::string &key, const float *values)
 	return true;
 }
 
-bool Effect::set_vec4(const std::string &key, const float *values)
+bool Effect::set_vec4(const string &key, const float *values)
 {
 	if (params_vec4.count(key) == 0) {
 		return false;
@@ -53,31 +55,31 @@ bool Effect::set_vec4(const std::string &key, const float *values)
 	return true;
 }
 
-void Effect::register_int(const std::string &key, int *value)
+void Effect::register_int(const string &key, int *value)
 {
 	assert(params_int.count(key) == 0);
 	params_int[key] = value;
 }
 
-void Effect::register_float(const std::string &key, float *value)
+void Effect::register_float(const string &key, float *value)
 {
 	assert(params_float.count(key) == 0);
 	params_float[key] = value;
 }
 
-void Effect::register_vec2(const std::string &key, float *values)
+void Effect::register_vec2(const string &key, float *values)
 {
 	assert(params_vec2.count(key) == 0);
 	params_vec2[key] = values;
 }
 
-void Effect::register_vec3(const std::string &key, float *values)
+void Effect::register_vec3(const string &key, float *values)
 {
 	assert(params_vec3.count(key) == 0);
 	params_vec3[key] = values;
 }
 
-void Effect::register_vec4(const std::string &key, float *values)
+void Effect::register_vec4(const string &key, float *values)
 {
 	assert(params_vec4.count(key) == 0);
 	params_vec4[key] = values;
@@ -85,31 +87,31 @@ void Effect::register_vec4(const std::string &key, float *values)
 
 // Output convenience uniforms for each parameter.
 // These will be filled in per-frame.
-std::string Effect::output_convenience_uniforms() const
+string Effect::output_convenience_uniforms() const
 {
-	std::string output = "";
-	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
+	string output = "";
+	for (map<string, float*>::const_iterator it = params_float.begin();
 	     it != params_float.end();
 	     ++it) {
 		char buf[256];
 		sprintf(buf, "uniform float PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec2.begin();
+	for (map<string, float*>::const_iterator it = params_vec2.begin();
 	     it != params_vec2.end();
 	     ++it) {
 		char buf[256];
 		sprintf(buf, "uniform vec2 PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
+	for (map<string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++it) {
 		char buf[256];
 		sprintf(buf, "uniform vec3 PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec4.begin();
+	for (map<string, float*>::const_iterator it = params_vec4.begin();
 	     it != params_vec4.end();
 	     ++it) {
 		char buf[256];
@@ -119,24 +121,24 @@ std::string Effect::output_convenience_uniforms() const
 	return output;
 }
 
-void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+void Effect::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 {
-	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
+	for (map<string, float*>::const_iterator it = params_float.begin();
 	     it != params_float.end();
 	     ++it) {
 		set_uniform_float(glsl_program_num, prefix, it->first, *it->second);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec2.begin();
+	for (map<string, float*>::const_iterator it = params_vec2.begin();
 	     it != params_vec2.end();
 	     ++it) {
 		set_uniform_vec2(glsl_program_num, prefix, it->first, it->second);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
+	for (map<string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++it) {
 		set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec4.begin();
+	for (map<string, float*>::const_iterator it = params_vec4.begin();
 	     it != params_vec4.end();
 	     ++it) {
 		set_uniform_vec4(glsl_program_num, prefix, it->first, it->second);