Use RED format for ambient occlusion render target

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

diff --git a/source/animatedobject.cpp b/source/animatedobject.cpp
index d2157fd1bc128ebc6dd676ef0cc10c54b9204e5c..390b90b869ce6acc9eb5a5a93a6fbe701776429e 100644 (file)
--- a/source/animatedobject.cpp
+++ b/source/animatedobject.cpp
@@ -37,6 +37,20 @@ void AnimatedObject::set_pose_matrix(unsigned link, const Matrix &m)
        }
 }
 
+ProgramData &AnimatedObject::get_shader_data()
+{
+       if(!shdata)
+               throw invalid_operation("AnimatedObject::get_shader_data");
+       return *shdata;
+}
+
+const ProgramData &AnimatedObject::get_shader_data() const
+{
+       if(!shdata)
+               throw invalid_operation("AnimatedObject::get_shader_data");
+       return *shdata;
+}
+
 void AnimatedObject::set_uniform(const string &name, const KeyFrame::AnimatedUniform &uni)
 {
        if(!shdata)
@@ -63,8 +77,9 @@ void AnimatedObject::setup_render(Renderer &renderer, const Tag &) const
 
 
 AnimatedObject::Loader::Loader(AnimatedObject &o):
-       DataFile::ObjectLoader<AnimatedObject>(o)
+       DataFile::DerivedObjectLoader<AnimatedObject, ObjectInstance::Loader>(o)
 {
+       // Deprecated; Use the transform statement defined in ObjectInstance instead
        add("position", &Loader::position);
        add("rotation", &Loader::rotation);
        add("scale", &Loader::scale);