Move some declarations around a bit

diff --git a/source/buffer.cpp b/source/buffer.cpp
index fbb1e159ee564df8b2d7816e459adda6312cfc20..e033871f45ea818f2376ebf41166210cf3715a14 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -8,6 +8,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
+
 Buffer::Buffer(BufferType t):
        type(t),
        usage(STATIC_DRAW)
@@ -88,7 +90,5 @@ void Buffer::restore(const Buffer *buf, BufferType type)
        }
 }
 
-const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
-
 } // namespace GL
 } // namespace Msp

diff --git a/source/light.cpp b/source/light.cpp
index 067cc3d1fee1416cce0451e37a90c6482f7cc2e9..4b2e289c6c5d7c1b21ebb7f749a0a963523412e4 100644 (file)
--- a/source/light.cpp
+++ b/source/light.cpp
@@ -7,6 +7,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+unsigned Light::current_unit = 0;
+vector<const Light *> Light::current_lights(1);
+
 Light::Light():
        ambient(0),
        diffuse(1),
@@ -117,8 +120,5 @@ void Light::unbind_from(unsigned i)
        unbind();
 }
 
-unsigned Light::current_unit = 0;
-vector<const Light *> Light::current_lights(1);
-
 } // namespace GL
 } // namespace Msp

diff --git a/source/object.h b/source/object.h
index bd66e7ee0896899d3ca6df814828f64b3839f827..69759c80a7fde69b7ffe9ccc2a35abb064a758fa 100644 (file)
--- a/source/object.h
+++ b/source/object.h
@@ -23,10 +23,6 @@ similar objects.  See class ObjectInstance.
 */
 class Object: public Renderable
 {
-private:
-       std::vector<RefPtr<const Mesh> > meshes;
-       RefPtr<const Technique> technique;
-
 public:
        class Loader: public DataFile::CollectionObjectLoader<Object>
        {
@@ -45,6 +41,11 @@ public:
                void technique(const std::string &);
        };
 
+private:
+       std::vector<RefPtr<const Mesh> > meshes;
+       RefPtr<const Technique> technique;
+
+public:
        Object();
        Object(const Mesh *, const Technique *);
        ~Object();