X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.h;h=b6bd3a69d9b5c00ff74a14233963a11787eb70fb;hb=77a534371433054384d213922a2e8c55f8a69ad6;hp=ca41ffac0a2f086633dcb7153046b08ef1554d3d;hpb=b7ecc29c204faede028556d1942b2d61d5cda9ee;p=libs%2Fgl.git diff --git a/source/render/object.h b/source/render/object.h index ca41ffac..b6bd3a69 100644 --- a/source/render/object.h +++ b/source/render/object.h @@ -3,17 +3,15 @@ #include #include "renderable.h" -#include "renderpass.h" +#include "rendermethod.h" #include "resourceobserver.h" 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 @@ -39,7 +37,7 @@ private: LevelOfDetail &lod; public: - LodLoader(Object &, unsigned, Collection *); + LodLoader(Object &, unsigned, Collection &); private: void mesh(const std::string &); @@ -52,10 +50,8 @@ public: class Loader: public LodLoader { public: - Loader(Object &); Loader(Object &, Collection &); private: - void init(); virtual void finish(); void bounding_sphere_hint(float, float, float, float); @@ -71,7 +67,7 @@ private: std::vector lods; Geometry::BoundingSphere bounding_sphere; - bool lod0_watched; + bool lod0_watched = false; static const Matrix identity_matrix; @@ -120,7 +116,7 @@ protected: virtual void finish_render(Renderer &, Tag) const { } private: - const RenderPass *get_pass(Tag, unsigned) const; + const RenderMethod *get_method(Tag, unsigned) const; virtual void resource_loaded(Resource &); virtual void resource_removed(Resource &);