Remove some deprecated stuff

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

diff --git a/source/object.cpp b/source/object.cpp
index d573fdd4975695eddfd3d164eca0128d97936937..637af62a3753becb9407e346fb471bad9213f94a 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,6 +1,5 @@
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
-#include "except.h"
+#include <msp/strings/format.h>
 #include "material.h"
 #include "mesh.h"
 #include "object.h"
@@ -20,14 +19,20 @@ Object::Object():
        meshes(1)
 { }
 
-Object::~Object()
+Object::Object(const Mesh *m, const Technique *t)
 {
+       set_mesh(m);
+       set_technique(t);
 }
 
+// Avoid synthesizing ~RefPtr in files including object.h
+Object::~Object()
+{ }
+
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
        if(i>meshes.size())
-               throw InvalidParameterValue("LODs must be continuous");
+               throw out_of_range("Object::set_mesh");
 
        if(i==meshes.size())
                meshes.push_back(m);
@@ -36,6 +41,32 @@ void Object::set_mesh(unsigned i, const Mesh *m)
        meshes[i].keep();
 }
 
+void Object::update_bounding_sphere()
+{
+       vector<Vector3> points;
+       for(vector<RefPtr<const Mesh> >::const_iterator i=meshes.begin(); i!=meshes.end(); ++i)
+       {
+               const VertexArray &vertices = (*i)->get_vertices();
+               int offset = vertices.get_format().offset(VERTEX3);
+               if(offset<0)
+               {
+                       // TODO Handle two-dimensional meshes
+                       bounding_sphere = Geometry::BoundingSphere<float, 3>();
+                       return;
+               }
+
+               unsigned n_vertices = vertices.size();
+               points.reserve(points.size()+n_vertices);
+               for(unsigned j=0; j<n_vertices; ++j)
+               {
+                       const float *v = vertices[j];
+                       points.push_back(Vector3(v[offset], v[offset+1], v[offset+2]));
+               }
+       }
+
+       bounding_sphere = Geometry::BoundingSphere<float, 3>::from_point_cloud(points.begin(), points.end());
+}
+
 const Mesh *Object::get_mesh(unsigned i) const
 {
        if(i>=meshes.size())
@@ -72,11 +103,11 @@ void Object::render(Renderer &renderer, const Tag &tag) const
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
-       renderer.set_material(pass->get_material());
-       renderer.set_texturing(pass->get_texturing());
+       pass->apply(renderer);
 
+       setup_render(renderer, tag);
        meshes.front()->draw(renderer);
+       finish_render(renderer, tag);
 }
 
 void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &tag) const
@@ -86,19 +117,21 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
-       renderer.set_material(pass->get_material());
-       renderer.set_texturing(pass->get_texturing());
+       pass->apply(renderer);
 
+       setup_render(renderer, tag);
        inst.setup_render(renderer, tag);
-       unsigned lod = min<unsigned>(inst.get_level_of_detail(), meshes.size()-1);
+       unsigned lod = min<unsigned>(inst.get_level_of_detail(renderer), meshes.size()-1);
        meshes[lod]->draw(renderer);
        inst.finish_render(renderer, tag);
+       finish_render(renderer, tag);
 }
 
 const RenderPass *Object::get_pass(const Tag &tag) const
 {
-       if(!technique || !technique->has_pass(tag))
+       if(!technique)
+               throw logic_error("!technique");
+       if(!technique->has_pass(tag))
                return 0;
        return &technique->get_pass(tag);
 }
@@ -118,17 +151,17 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 void Object::Loader::init()
 {
-       allow_pointer_reload = false;
-
        add("mesh",     &Loader::mesh_inline);
        add("mesh",     &Loader::mesh_inline_lod);
        add("mesh",     &Loader::mesh);
        add("mesh",     &Loader::mesh_lod);
        add("technique", &Loader::technique_inline);
        add("technique", &Loader::technique);
+}
 
-       // Deprecated alias, will be removed
-       add("lod_mesh", &Loader::mesh_lod);
+void Object::Loader::finish()
+{
+       obj.update_bounding_sphere();
 }
 
 void Object::Loader::mesh_inline()
@@ -141,7 +174,7 @@ void Object::Loader::mesh_inline()
 void Object::Loader::mesh_inline_lod(unsigned l)
 {
        if(l>obj.meshes.size())
-               throw InvalidParameterValue("LODs must be continuous");
+               throw out_of_range("Object::Loader::mesh_inline_lod");
 
        RefPtr<Mesh> msh = new Mesh;
        load_sub(*msh);
@@ -153,12 +186,12 @@ void Object::Loader::mesh_inline_lod(unsigned l)
 
 void Object::Loader::mesh(const std::string &n)
 {
-       obj.set_mesh(get_collection().get<Mesh>(n));
+       obj.set_mesh(&get_collection().get<Mesh>(n));
 }
 
 void Object::Loader::mesh_lod(unsigned l, const string &n)
 {
-       obj.set_mesh(l, get_collection().get<Mesh>(n));
+       obj.set_mesh(l, &get_collection().get<Mesh>(n));
 }
 
 void Object::Loader::technique_inline()
@@ -173,7 +206,7 @@ void Object::Loader::technique_inline()
 
 void Object::Loader::technique(const std::string &n)
 {
-       obj.set_technique(get_collection().get<Technique>(n));
+       obj.set_technique(&get_collection().get<Technique>(n));
 }
 
 } // namespace GL