Don't crash in bounding sphere generation if an object has a null mesh

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

diff --git a/source/object.cpp b/source/object.cpp
index 964099e51e4022c09335c16b7ca023d491de7c26..d48b0843fb9f3b73591588631429ce09e2709a8c 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -7,6 +7,7 @@
 #include "program.h"
 #include "programdata.h"
 #include "renderer.h"
+#include "resourcemanager.h"
 #include "technique.h"
 #include "texturing.h"
 
@@ -25,20 +26,67 @@ Object::Object(const Mesh *m, const Technique *t)
        set_technique(t);
 }
 
+// Avoid synthesizing ~RefPtr in files including object.h
 Object::~Object()
 {
+       if(meshes[0])
+               if(ResourceManager *rm = meshes[0]->get_manager())
+                       rm->unwatch_resource(*meshes[0], *this);
 }
 
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
        if(i>meshes.size())
-               throw invalid_argument("Object::set_mesh");
+               throw out_of_range("Object::set_mesh");
 
        if(i==meshes.size())
                meshes.push_back(m);
        else
+       {
+               if(i==0 && meshes[i])
+                       if(ResourceManager *rm = meshes[i]->get_manager())
+                               rm->unwatch_resource(*meshes[i], *this);
                meshes[i] = m;
+       }
        meshes[i].keep();
+
+       if(i==0 && m)
+               if(ResourceManager *rm = m->get_manager())
+                       rm->watch_resource(*m, *this);
+
+       update_bounding_sphere();
+}
+
+void Object::update_bounding_sphere()
+{
+       vector<Vector3> points;
+       for(vector<RefPtr<const Mesh> >::const_iterator i=meshes.begin(); i!=meshes.end(); ++i)
+       {
+               if(!*i)
+                       continue;
+
+               const VertexArray &vertices = (*i)->get_vertices();
+
+               int offset = vertices.get_format().offset(VERTEX3);
+               bool three = true;
+               if(offset<0)
+               {
+                       offset = vertices.get_format().offset(VERTEX2);
+                       three = false;
+                       if(offset<0)
+                               continue;
+               }
+
+               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], (three ? v[offset+2] : 0.0f)));
+               }
+       }
+
+       bounding_sphere = Geometry::BoundingSphere<float, 3>::from_point_cloud(points.begin(), points.end());
 }
 
 const Mesh *Object::get_mesh(unsigned i) const
@@ -77,11 +125,11 @@ void Object::render(Renderer &renderer, const Tag &tag) const
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader_program(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
@@ -91,23 +139,31 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
                return;
 
        Renderer::Push push(renderer);
-       renderer.set_shader_program(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(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);
 }
 
+void Object::resource_loaded(Resource &res)
+{
+       if(!meshes.empty() && &res==meshes.front().get() && bounding_sphere.is_empty())
+               update_bounding_sphere();
+}
+
 
 Object::Loader::Loader(Object &o):
        DataFile::CollectionObjectLoader<Object>(o, 0)
@@ -129,9 +185,11 @@ void Object::Loader::init()
        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()
@@ -144,7 +202,7 @@ void Object::Loader::mesh_inline()
 void Object::Loader::mesh_inline_lod(unsigned l)
 {
        if(l>obj.meshes.size())
-               throw invalid_argument("Object::Loader::mesh_inline_lod");
+               throw out_of_range("Object::Loader::mesh_inline_lod");
 
        RefPtr<Mesh> msh = new Mesh;
        load_sub(*msh);