X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.h;h=69759c80a7fde69b7ffe9ccc2a35abb064a758fa;hb=3cdcc7f689b3868dd275774b9bd9adb5c436f244;hp=a574fb645ddd2b20fbbce4f9c32fffa0de8d57f9;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git diff --git a/source/object.h b/source/object.h index a574fb64..69759c80 100644 --- a/source/object.h +++ b/source/object.h @@ -23,10 +23,6 @@ similar objects. See class ObjectInstance. */ class Object: public Renderable { -private: - std::vector > meshes; - RefPtr technique; - public: class Loader: public DataFile::CollectionObjectLoader { @@ -45,7 +41,13 @@ public: void technique(const std::string &); }; +private: + std::vector > meshes; + RefPtr technique; + +public: Object(); + Object(const Mesh *, const Technique *); ~Object(); void set_mesh(const Mesh *m) { set_mesh(0, m); }