X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=b5cbe5bcab7a32b1182f9f2aa90ca6f88c93cb68;hp=50254cdf1de09824cb50f9bd37a9f85436a41606;hb=5b652353d545a3190ea2d86ba82a87b2e3382a0d;hpb=dbc91b65728ab9c0e574bb1127cfe4d2da55de7f diff --git a/source/render/renderer.h b/source/render/renderer.h index 50254cdf..b5cbe5bc 100644 --- a/source/render/renderer.h +++ b/source/render/renderer.h @@ -21,7 +21,6 @@ class Program; class Renderable; class Sampler; class Texture; -class Texturing; class VertexSetup; class WindingTest; @@ -106,7 +105,6 @@ private: SHADER_DATA = 16 }; - const Camera *default_camera; unsigned char changed; std::vector state_stack; State *state; @@ -117,10 +115,6 @@ private: public: Renderer(); - DEPRECATED Renderer(const Camera *); -private: - void init(); -public: ~Renderer(); /** Sets the camera to render from. The model matrix is reset to identity. */ @@ -139,15 +133,8 @@ public: void set_texture(Tag, const Texture *, const Sampler * = 0); private: - void set_texture(Tag, int, const Texture *, const Sampler *); void flush_textures(); public: -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - DEPRECATED void set_texture(const Texture *, const Sampler * = 0); - DEPRECATED void set_texturing(const Texturing *); - DEPRECATED unsigned allocate_effect_texunit(); -#pragma GCC diagnostic pop DEPRECATED void set_material(const Material *); DEPRECATED void set_lighting(const Lighting *);