From fa658c8500fb0c368a8299bd1210688640b50352 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 10 Sep 2017 15:37:54 +0300
Subject: [PATCH] Remove useless namespace prefixes

---
 source/capsule.cpp   | 2 +-
 source/pose.cpp      | 2 +-
 source/resources.cpp | 4 ++--
 source/technique.cpp | 6 +++---
 source/technique.h   | 6 +++---
 source/text.cpp      | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/capsule.cpp b/source/capsule.cpp
index 2576f40d..65a18eb3 100644
--- a/source/capsule.cpp
+++ b/source/capsule.cpp
@@ -58,7 +58,7 @@ void CapsuleBuilder::build(PrimitiveBuilder &builder) const
 
 	for(unsigned i=0; i<segments; ++i)
 	{
-		builder.begin(GL::TRIANGLE_STRIP);
+		builder.begin(TRIANGLE_STRIP);
 		builder.element(0);
 		for(unsigned j=0; j+1<rings; ++j)
 		{
diff --git a/source/pose.cpp b/source/pose.cpp
index 7433626f..99fa6bb3 100644
--- a/source/pose.cpp
+++ b/source/pose.cpp
@@ -37,7 +37,7 @@ void Pose::rotate_link(unsigned i, float angle, const Vector3 &axis)
 	// Keep the base point stationary
 	Vector3 base = arm_link.get_base();
 	Vector3 new_base = links[i].local_matrix*base;
-	links[i].local_matrix = GL::Matrix::translation(base-new_base)*links[i].local_matrix;
+	links[i].local_matrix = Matrix::translation(base-new_base)*links[i].local_matrix;
 
 	if(const Armature::Link *parent = arm_link.get_parent())
 		links[i].matrix = links[parent->get_index()].matrix*links[i].local_matrix;
diff --git a/source/resources.cpp b/source/resources.cpp
index db01b30b..2637b12b 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -85,7 +85,7 @@ Mesh *Resources::create_mesh(const string &name)
 
 	if(RefPtr<IO::Seekable> io = open_from_sources(name))
 	{
-		RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+		RefPtr<Mesh> mesh = new Mesh(resource_manager);
 		resource_manager->set_resource_location(*mesh, *this, name);
 		return mesh.release();
 	}
@@ -105,7 +105,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 		if(!resource_manager)
 			image.load_io(*io);
 
-		RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
+		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
 		if(is_mipmapped(default_tex_filter))
 		{
diff --git a/source/technique.cpp b/source/technique.cpp
index 1e8f8fcc..2b02f35f 100644
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -13,17 +13,17 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-RenderPass &Technique::add_pass(const GL::Tag &tag)
+RenderPass &Technique::add_pass(const Tag &tag)
 {
 	return insert_unique(passes, tag, RenderPass())->second;
 }
 
-bool Technique::has_pass(const GL::Tag &tag) const
+bool Technique::has_pass(const Tag &tag) const
 {
 	return passes.count(tag);
 }
 
-const RenderPass &Technique::get_pass(const GL::Tag &tag) const
+const RenderPass &Technique::get_pass(const Tag &tag) const
 {
 	return get_item(passes, tag);
 }
diff --git a/source/technique.h b/source/technique.h
index 41157f0a..7ea69537 100644
--- a/source/technique.h
+++ b/source/technique.h
@@ -46,9 +46,9 @@ private:
 	PassMap passes;
 
 public:
-	RenderPass &add_pass(const GL::Tag &);
-	bool has_pass(const GL::Tag &) const;
-	const RenderPass &get_pass(const GL::Tag &) const;
+	RenderPass &add_pass(const Tag &);
+	bool has_pass(const Tag &) const;
+	const RenderPass &get_pass(const Tag &) const;
 	const PassMap &get_passes() const { return passes; }
 	void replace_texture(const std::string &, const Texture &);
 	bool has_shaders() const;
diff --git a/source/text.cpp b/source/text.cpp
index cb39a695..f791c3b2 100644
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -34,7 +34,7 @@ void Text::set_text(const string &text, StringCodec::Decoder &dec)
 {
 	clear();
 	width = font.get_string_width(text, dec);
-	GL::MeshBuilder bld(mesh);
+	MeshBuilder bld(mesh);
 	bld.matrix() *= Matrix::translation(Vector3(-horz_align*width, vert_offset, 0.0f));
 	font.build_string(text, dec, bld);
 }
-- 
2.45.2