Remove static instance 'NullScene' - fix memory error on pyluxcore exit

Author: howetuft

include/slg/engines/caches/photongi/photongicache.h

@@ -267,7 +267,7 @@ class PhotonGICache {
 	PhotonGICache(SceneConstRef scn, const PhotonGICacheParams &params);
 	virtual ~PhotonGICache();
 
-	void SetScene(SceneRef scn) { scene = scn; }
+	void SetScene(SceneRef scn) { scene = &scn; }
 	PhotonGIDebugType GetDebugType() const { return params.debugType; }
 
 	bool IsIndirectEnabled() const { return params.indirect.enabled; }
@@ -337,7 +337,7 @@ class PhotonGICache {
 
 	template<class Archive> void serialize(Archive &ar, const u_int version);
 
-	std::reference_wrapper<const Scene> scene;
+	SceneConstPtr scene;
 
 	PhotonGICacheParams params;
 

include/slg/renderconfig.h

@@ -118,8 +118,8 @@ class RenderConfig {
 	);
 
 	// Accessors
-	SceneConstRef GetScene() const { return sceneRef; }
-	SceneRef GetScene() { return sceneRef; }
+	SceneConstRef GetScene() const { return *sceneRef; }
+	SceneRef GetScene() { return *sceneRef; }
 	PropertiesConstRef GetConfig() const { return *cfg; }
 	PropertiesRef GetConfig() { return *cfg; }
 	PropertiesRPtr GetConfigPtr() { return cfg; }
@@ -161,7 +161,7 @@ class RenderConfig {
 	//   RenderConfig constructor will generate an internal scene, and sceneRef will
 	//   be set to reference this internal scene
 	SceneUPtr internalScene;
-	std::reference_wrapper<Scene> sceneRef;
+	ScenePtr sceneRef;
 };
 
 }  // namespace slg

include/slg/scene/scene.h

@@ -369,8 +369,6 @@ class Scene {
 	BOOST_SERIALIZATION_SPLIT_MEMBER()
 };
 
-extern slg::Scene NullScene;
-
 }  // namespace slg
 
 BOOST_CLASS_VERSION(slg::Scene, 1)

src/slg/engines/caches/photongi/pgicradius.cpp

@@ -56,7 +56,7 @@ float PhotonGICache::EvaluateBestRadius() {
 	PGICFilm2SceneRadiusValidator validator(*this);
 
 	return Film2SceneRadius(
-			scene, imagePlaneRadius, defaultRadius,
+			*scene, imagePlaneRadius, defaultRadius,
 			params.photon.maxPathDepth,
 			params.photon.timeStart, params.photon.timeEnd,
 			&validator);

src/slg/engines/caches/photongi/pgicvisibility.cpp

@@ -34,7 +34,7 @@ class PGICSceneVisibility : public SceneVisibility<PGICVisibilityParticle> {
 public:
 	PGICSceneVisibility(PhotonGICache &cache) :
 		SceneVisibility(
-			cache.scene,
+			*cache.scene,
 			cache.visibilityParticles,
 			cache.params.photon.maxPathDepth,
 			cache.params.visibility.maxSampleCount,

src/slg/engines/caches/photongi/photongicache.cpp

@@ -40,14 +40,14 @@ using namespace slg;
 //------------------------------------------------------------------------------
 
 PhotonGICache::PhotonGICache() :
-		scene(slg::NullScene),
+		scene(nullptr),
 		visibilityParticlesKdTree(nullptr),
 		radiancePhotonsBVH(nullptr) ,
 		causticPhotonsBVH(nullptr) {
 }
 
 PhotonGICache::PhotonGICache(SceneConstRef scn, const PhotonGICacheParams &p) :
-		scene(scn), params(p),
+		scene(&scn), params(p),
 		visibilityParticlesKdTree(nullptr),
 		radiancePhotonsBVH(nullptr) ,
 		indirectPhotonTracedCount(0),

src/slg/engines/caches/photongi/tracephotonsthread.cpp

@@ -117,7 +117,7 @@ bool TracePhotonsThread::TracePhotonPath(RandomGenerator &rndGen,
 	newCausticPhotons.clear();
 	vector<u_int> allNearEntryIndices;
 
-	SceneConstRef scene = pgic.scene;
+	SceneConstRef scene = *pgic.scene;
 	auto& camera = scene.GetCamera();
 
 	bool usefulPath = false;

src/slg/renderconfig.cpp

@@ -25,6 +25,7 @@
 #include <boost/algorithm/string.hpp> 
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/serialization/unique_ptr.hpp>
+#include <boost/serialization/optional.hpp>
 
 #include "luxrays/usings.h"
 #include "luxrays/utils/serializationutils.h"
@@ -89,7 +90,7 @@ static std::unique_ptr<Properties> defaultProperties;
 RenderConfig::RenderConfig(Private p, PropertiesRPtr props, SceneRef scn)
 	:
 	cfg(std::make_unique<Properties>()),
-	sceneRef(scn)
+	sceneRef(&scn)
 {
 	InitDefaultProperties();
 
@@ -110,7 +111,7 @@ RenderConfig::RenderConfig(Private p, PropertiesRPtr props, SceneRef scn)
 RenderConfig::RenderConfig(Private p, PropertiesRPtr props)
 	:
 	cfg(std::make_unique<Properties>()),
-	sceneRef(NullScene)  // Temporary, awaiting scene construction
+	sceneRef(nullptr)  // Temporary, awaiting scene construction
 {
 	InitDefaultProperties();
 
@@ -129,7 +130,7 @@ RenderConfig::RenderConfig(Private p, PropertiesRPtr props)
 		std::make_unique<Properties>(sceneFileName),
 		props
 	);
-	sceneRef = *internalScene;
+	sceneRef = internalScene.get();
 
 	if (!GetScene().HasCamera()) {
 		throw std::runtime_error(
@@ -146,11 +147,11 @@ RenderConfig::RenderConfig(
 	PropertiesUPtr&& p_cfg, SceneRef p_scn, SceneUPtr&& p_internalscene
 ) :
 	cfg(std::move(p_cfg)),
-	sceneRef(p_scn),
+	sceneRef(&p_scn),
 	internalScene(std::move(p_internalscene))
 {
 	if (internalScene) {
-		sceneRef = *internalScene;
+		sceneRef = internalScene.get();
 	}
 }
 
@@ -585,7 +586,7 @@ void slg::RenderConfig::save_construct_data(
 	ar << t->internalScene;
 
     // Save SceneRef (as a pointer)
-    ar << & t->sceneRef;
+    ar << t->sceneRef;
 }
 
 template<class Archive>
@@ -601,7 +602,7 @@ void slg::RenderConfig::load_construct_data(
 	SceneUPtr sptr;
 	ar >> sptr;
 
-	Scene * sref;  // Load reference as a pointer
+	decltype(sceneRef) sref;  // Load reference as a pointer
 	ar >> sref;
 
     // invoke inplace constructor to initialize instance of RenderConfig

src/slg/scene/scene.cpp

@@ -58,14 +58,18 @@ using namespace slg;
 // Scene
 //------------------------------------------------------------------------------
 
-Scene::Scene(luxrays::PropertiesRPtr resizePolicyProps) {
+Scene::Scene(luxrays::PropertiesRPtr resizePolicyProps) :
+	randomImageMap(ImageMap::AllocRandomImageMap(512))
+{
 	Init(resizePolicyProps);
 }
 
 Scene::Scene(
 	PropertiesRPtr scnProps,
 	PropertiesRPtr resizePolicyProps
-) {
+) :
+	randomImageMap(ImageMap::AllocRandomImageMap(512))
+{
 	Init(resizePolicyProps);
 
 	Parse(scnProps);
@@ -852,10 +856,4 @@ string Scene::EncodeTriangleLightNamePrefix(const string &objectName) {
 
 ImageMapConstSPtr Scene::GetRandomImageMap() const { return randomImageMap; }
 
-namespace slg {
-// TODO This is a workaround to initialize references to scenes in default constructors.
-// Correct solution would be to use boost serialization support for references
-Scene NullScene;
-}
-
 // vim: autoindent noexpandtab tabstop=4 shiftwidth=4