Allow tagging objects in a scene file for retrieval after loading

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 3b2147d14d061b64352602aac8bf19a987f2019a..9b36c48ff43faadb0f7ef6da596f37e7806dfd47 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -108,7 +108,7 @@ class SceneExporter:
 
                for o in objs:
                        obj_res = resources[prototypes[o.name].name+".object"]
 
                for o in objs:
                        obj_res = resources[prototypes[o.name].name+".object"]

-                       st = scene_res.create_reference_statement("object", obj_res)
+                       st = scene_res.create_reference_statement("object", obj_res, o.name)

                        # XXX Parent relationships screw up the location and rotation
                        st.sub.append(Statement("position", o.location[0], o.location[1], o.location[2]))
                        if o.rotation_mode=="AXIS_ANGLE":
                        # XXX Parent relationships screw up the location and rotation
                        st.sub.append(Statement("position", o.location[0], o.location[1], o.location[2]))
                        if o.rotation_mode=="AXIS_ANGLE":

diff --git a/source/scene.cpp b/source/scene.cpp
index ef1f246bac0c4f61b2ec5dc3bf402bf32067f10d..e6c62e802f8c9672fafce477d3eae50c9f2efaac 100644 (file)
--- a/source/scene.cpp
+++ b/source/scene.cpp
@@ -75,16 +75,37 @@ bool Scene::frustum_cull(const Renderable &renderable) const
 
 
 Scene::Loader::Loader(Scene &s, Collection &c):
 
 
 Scene::Loader::Loader(Scene &s, Collection &c):

-       DataFile::CollectionObjectLoader<Scene>(s, &c)
+       DataFile::CollectionObjectLoader<Scene>(s, &c),
+       content(0)
+{
+       init();
+}
+
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
+       DataFile::CollectionObjectLoader<Scene>(s, &c),
+       content(&m)
+{
+       init();
+}
+
+void Scene::Loader::init()

 {
        add("object", &Loader::object);
 {
        add("object", &Loader::object);

+       add("object", &Loader::object_tagged);

 }
 
 void Scene::Loader::object(const string &n)
 }
 
 void Scene::Loader::object(const string &n)

+{
+       object_tagged(n, string());
+}
+
+void Scene::Loader::object_tagged(const string &n, const string &t)

 {
        RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
        load_sub(*anob);
        obj.add(*anob);
 {
        RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
        load_sub(*anob);
        obj.add(*anob);

+       if(content && !t.empty())
+               (*content)[t] = anob.get();

        obj.owned_data.push_back(anob.release());
 }
 
        obj.owned_data.push_back(anob.release());
 }
 

diff --git a/source/scene.h b/source/scene.h
index 9e90b1284a014e90aa9a03191172b7137c80e35b..639a467fa849cb526c19ac31744b957f820af7ea 100644 (file)
--- a/source/scene.h
+++ b/source/scene.h
@@ -21,13 +21,23 @@ public:
        class Loader: public DataFile::CollectionObjectLoader<Scene>
        {
        public:
        class Loader: public DataFile::CollectionObjectLoader<Scene>
        {
        public:

-               Loader(Scene &, Collection &);
+               typedef std::map<std::string, Renderable *> ContentMap;
+
+       private:
+               ContentMap *content;

 
 

+       public:
+               Loader(Scene &, Collection &);
+               Loader(Scene &, Collection &, ContentMap &);

        private:
        private:

+               void init();
+

                void object(const std::string &);
                void object(const std::string &);

+               void object_tagged(const std::string &, const std::string &);

        };
 
 protected:
        };
 
 protected:

+       // XXX If a loaded renderable is removed from the scene it needs to be removed from here as well

        std::vector<Renderable *> owned_data;
        mutable Matrix culling_matrix;
        mutable Vector4 frustum_edges[6];
        std::vector<Renderable *> owned_data;
        mutable Matrix culling_matrix;
        mutable Vector4 frustum_edges[6];