From 3ed9b6f6f127c72eb50ee9362f20f88e1917b936 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Sun, 17 Feb 2013 11:24:52 -0500
Subject: [PATCH] mitsuba-python: added some casts() to Scene getters

---
 src/libpython/base.h     |  2 ++
 src/libpython/render.cpp | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/libpython/base.h b/src/libpython/base.h
index 5da0bfda..a35008de 100644
--- a/src/libpython/base.h
+++ b/src/libpython/base.h
@@ -157,6 +157,7 @@ public:
 
 namespace mitsuba {
 	class SerializableObject;
+	class ConfigurableObject;
 };
 
 typedef std::vector<std::string> StringVector;
@@ -165,6 +166,7 @@ typedef std::map<std::string, std::string> StringMap;
 
 extern void export_core();
 extern void export_render();
+extern bp::object cast(mitsuba::ConfigurableObject *obj);
 
 #endif /* __PYTHON_BASE_H */
 
diff --git a/src/libpython/render.cpp b/src/libpython/render.cpp
index 3567ed69..dce8ebfc 100644
--- a/src/libpython/render.cpp
+++ b/src/libpython/render.cpp
@@ -86,15 +86,18 @@ bp::list scene_getSensors(Scene *scene) {
 	bp::list list;
 	ref_vector<Sensor> &sensors = scene->getSensors();
 	for (size_t i=0; i<sensors.size(); ++i)
-		list.append(bp::object(sensors[i].get()));
+		list.append(cast(sensors[i].get()));
 	return list;
 }
 
+bp::object scene_getSensor(Scene *scene) { return cast(scene->getSensor()); }
+bp::object scene_getIntegrator(Scene *scene) { return cast(scene->getIntegrator()); }
+
 bp::list scene_getMeshes(Scene *scene) {
 	bp::list list;
 	std::vector<TriMesh *> &meshes = scene->getMeshes();
 	for (size_t i=0; i<meshes.size(); ++i)
-		list.append(bp::object(meshes[i]));
+		list.append(cast(meshes[i]));
 	return list;
 }
 
@@ -102,7 +105,7 @@ bp::list scene_getShapes(Scene *scene) {
 	bp::list list;
 	ref_vector<Shape> &shapes = scene->getShapes();
 	for (size_t i=0; i<shapes.size(); ++i)
-		list.append(bp::object(shapes[i].get()));
+		list.append(cast(shapes[i].get()));
 	return list;
 }
 
@@ -110,7 +113,7 @@ bp::list scene_getEmitters(Scene *scene) {
 	bp::list list;
 	ref_vector<Emitter> &emitters = scene->getEmitters();
 	for (size_t i=0; i<emitters.size(); ++i)
-		list.append(bp::object(emitters[i].get()));
+		list.append(cast(emitters[i].get()));
 	return list;
 }
 
@@ -118,7 +121,7 @@ bp::list scene_getMedia(Scene *scene) {
 	bp::list list;
 	ref_vector<Medium> &media = scene->getMedia();
 	for (size_t i=0; i<media.size(); ++i)
-		list.append(bp::object(media[i].get()));
+		list.append(cast(media[i].get()));
 	return list;
 }
 
@@ -143,8 +146,6 @@ void export_render() {
 		.value("EDiscrete", EDiscrete)
 		.export_values();
 
-	Sensor *(Scene::*scene_getSensor)(void) = &Scene::getSensor;
-	Integrator *(Scene::*scene_getIntegrator)(void) = &Scene::getIntegrator;
 	Sampler *(Scene::*scene_getSampler)(void) = &Scene::getSampler;
 	Film *(Scene::*scene_getFilm)(void) = &Scene::getFilm;
 
@@ -182,10 +183,10 @@ void export_render() {
 		.def("hasMedia", &Scene::hasMedia)
 		.def("addSensor", &Scene::addSensor)
 		.def("removeSensor", &Scene::removeSensor)
-		.def("getSensor", scene_getSensor, BP_RETURN_VALUE)
+		.def("getSensor", &scene_getSensor, BP_RETURN_VALUE)
 		.def("setSensor", &Scene::setSensor)
 		.def("getSensors", &scene_getSensors)
-		.def("getIntegrator", scene_getIntegrator, BP_RETURN_VALUE)
+		.def("getIntegrator", &scene_getIntegrator, BP_RETURN_VALUE)
 		.def("setIntegrator", &Scene::setIntegrator)
 		.def("getSampler", scene_getSampler, BP_RETURN_VALUE)
 		.def("setSampler", &Scene::setSampler)