From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 9 Aug 2012 19:34:23 +0000 (+0300)
Subject: Move some member functions to more logical positions
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=06b79262c9d455669e93213200d959db5b221dc2;p=libs%2Fgl.git

Move some member functions to more logical positions
---

diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp
index 8806ea6c..c4f714c6 100644
--- a/source/framebuffer.cpp
+++ b/source/framebuffer.cpp
@@ -106,6 +106,15 @@ void Framebuffer::check_size()
 		}
 }
 
+unsigned Framebuffer::get_attachment_index(FramebufferAttachment attch)
+{
+	for(unsigned i=0; i<attachments.size(); ++i)
+		if(attachments[i].attachment==attch)
+			return i;
+	attachments.push_back(Attachment(attch));
+	return attachments.size()-1;
+}
+
 void Framebuffer::attach(FramebufferAttachment attch, Renderbuffer &rbuf)
 {
 	if(!id)
@@ -228,15 +237,6 @@ Framebuffer &Framebuffer::system()
 	return sys_framebuf;
 }
 
-unsigned Framebuffer::get_attachment_index(FramebufferAttachment attch)
-{
-	for(unsigned i=0; i<attachments.size(); ++i)
-		if(attachments[i].attachment==attch)
-			return i;
-	attachments.push_back(Attachment(attch));
-	return attachments.size()-1;
-}
-
 
 Framebuffer::Attachment::Attachment(FramebufferAttachment a):
 	attachment(a),
diff --git a/source/framebuffer.h b/source/framebuffer.h
index cf64b45c..8a97222c 100644
--- a/source/framebuffer.h
+++ b/source/framebuffer.h
@@ -107,6 +107,7 @@ public:
 private:
 	void update_attachment(unsigned) const;
 	void check_size();
+	unsigned get_attachment_index(FramebufferAttachment);
 public:
 	void attach(FramebufferAttachment attch, Renderbuffer &rbuf);
 	void attach(FramebufferAttachment attch, Texture2D &tex, unsigned level = 0);
@@ -141,8 +142,6 @@ public:
 	static void unbind();
 
 	static Framebuffer &system();
-private:
-	unsigned get_attachment_index(FramebufferAttachment);
 };
 
 inline BufferBits operator|(BufferBits a, BufferBits b)
diff --git a/source/texture2d.h b/source/texture2d.h
index ff4d35b6..f81231d1 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -62,11 +62,14 @@ public:
 	the image must be compatible with the defined storage. */
 	void load_image(const std::string &fn);
 
+private:
+	void image(const Graphics::Image &);
+
+public:
 	unsigned get_width() const  { return width; }
 	unsigned get_height() const { return height; }
 
 private:
-	void image(const Graphics::Image &);
 	void get_level_size(unsigned, unsigned &, unsigned &);
 };