Use constructor delegation instead of init functions when possible

[libs/gl.git] / source / render / object.h

diff --git a/source/render/object.h b/source/render/object.h
index b7b549536f4b92bd97c0ee9506e8ab3c48d42111..ac62c702b4e1e2f9c6033c40e95e2db812b84735 100644 (file)
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -9,11 +9,9 @@
 namespace Msp {
 namespace GL {
 
-class Material;
 class Mesh;
 class ObjectInstance;
 class Technique;
-class Texture;
 
 /**
 Combines a Mesh with a Technique to give it an appearance.  The Technique will
@@ -52,10 +50,10 @@ public:
        class Loader: public LodLoader
        {
        public:
-               Loader(Object &);
-               Loader(Object &, Collection &);
+               Loader(Object &o): Loader(o, 0) { }
+               Loader(Object &o, Collection &c): Loader(o, &c) { }
        private:
-               void init();
+               Loader(Object &, Collection *);
                virtual void finish();
 
                void bounding_sphere_hint(float, float, float, float);
@@ -73,7 +71,7 @@ private:
        Geometry::BoundingSphere<float, 3> bounding_sphere;
        bool lod0_watched;
 
-       static Matrix identity_matrix;
+       static const Matrix identity_matrix;
 
 public:
        Object();