X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectinstance.cpp;h=e3bb8f80b0e60f62c45b3926428d258737e52c20;hp=78042bd1a8182de436d6963bf4d7e4dc512381b9;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8 diff --git a/source/objectinstance.cpp b/source/objectinstance.cpp index 78042bd1..e3bb8f80 100644 --- a/source/objectinstance.cpp +++ b/source/objectinstance.cpp @@ -1,13 +1,8 @@ -/* $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; namespace Msp { namespace GL { @@ -16,14 +11,15 @@ ObjectInstance::ObjectInstance(const Object &obj): object(obj) { } -void ObjectInstance::render() const +void ObjectInstance::render(const Tag &tag) const { - object.render(this); + Renderer renderer(0); + render(renderer, tag); } -void ObjectInstance::render(const std::string &pn) const +void ObjectInstance::render(Renderer &renderer, const Tag &tag) const { - object.render(pn, this); + object.render(renderer, *this, tag); } } // namespace GL