Remove last fragments of rendererless rendering

diff --git a/source/mesh.cpp b/source/mesh.cpp
index e901536535cd04716d973594200700cb8829807a..4b247e8d4f759aa6f68287590207076ff0dbf5cc 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -114,27 +114,6 @@ void Mesh::set_winding(const WindingTest *w)
        winding = w;
 }
 
-void Mesh::draw() const
-{
-       const Mesh *cur = current();
-       if(cur && cur!=this)
-               throw invalid_operation("Mesh::draw");
-
-       if(manager)
-       {
-               manager->resource_used(*this);
-               if(disallow_rendering)
-                       return;
-       }
-
-       BindRestore bind_vtxs(vtx_setup);
-       BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-       Bind bind_winding(winding);
-
-       for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-               i->draw();
-}
-
 void Mesh::draw(Renderer &renderer) const
 {
        if(manager)

diff --git a/source/mesh.h b/source/mesh.h
index 54ff28031d369affe732031d5a5f6c4d6a3afa01..2de418ae077bff1a9f43621d9051057fd81893e0 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -86,7 +86,6 @@ public:
 
        void set_winding(const WindingTest *);
 
-       void draw() const;
        void draw(Renderer &) const;
        void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
 

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index fa06fc5c0a985021a20353b1752cb849664e2a59..9fcf35188fc42589e280ed33a7e9b6f68aff2266 100644 (file)
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -202,14 +202,6 @@ void Pipeline::finish_frame()
                i->renderable->finish_frame();
 }
 
-void Pipeline::render()
-{
-       Renderer renderer(camera);
-       setup_frame(renderer);
-       render(renderer);
-       finish_frame();
-}
-
 void Pipeline::render(Renderer &renderer, const Tag &tag) const
 {
        if(tag.id)

diff --git a/source/pipeline.h b/source/pipeline.h
index e8ffaf5ee46f3bcc3500143769e9c4ab2744ab42..d2ce6ab88adc0cd8993e9ad1e68402fb1a001723 100644 (file)
--- a/source/pipeline.h
+++ b/source/pipeline.h
@@ -135,7 +135,6 @@ public:
        virtual void setup_frame(Renderer &);
        virtual void finish_frame();
 
-       void render();
        virtual void render(Renderer &, const Tag &tag = Tag()) const;
 
 private: