X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.cpp;h=e3bb8f80b0e60f62c45b3926428d258737e52c20;hp=10dae3926c05374d07df95e9cd58d7184eb23853;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=4324df6e3d807d35e02e828320e436c509275520 diff --git a/source/objectinstance.cpp b/source/objectinstance.cpp index 10dae392..e3bb8f80 100644 --- a/source/objectinstance.cpp +++ b/source/objectinstance.cpp @@ -1,13 +1,6 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include "object.h" #include "objectinstance.h" -#include "programdata.h" +#include "renderer.h" using namespace std; @@ -18,19 +11,15 @@ ObjectInstance::ObjectInstance(const Object &obj): object(obj) { } -bool ObjectInstance::has_pass(const string &pn) const -{ - return object.has_pass(pn); -} - -void ObjectInstance::render() const +void ObjectInstance::render(const Tag &tag) const { - object.render(*this); + Renderer renderer(0); + render(renderer, tag); } -void ObjectInstance::render(const string &pn) const +void ObjectInstance::render(Renderer &renderer, const Tag &tag) const { - object.render(pn, *this); + object.render(renderer, *this, tag); } } // namespace GL