Derive ProgramCompiler::DeclarationCombiner from BlockModifier

[libs/gl.git] / source / objectinstance.cpp

diff --git a/source/objectinstance.cpp b/source/objectinstance.cpp
index 78042bd1a8182de436d6963bf4d7e4dc512381b9..b3fc133d4d78060e0aec5d01a4155f53e557d79c 100644 (file)
--- a/source/objectinstance.cpp
+++ b/source/objectinstance.cpp
@@ -1,13 +1,7 @@
-/* $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 +10,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