Merge branch 'underwater' into for_v2.11

Author: howetuft

include/luxrays/utils/observer_ptr.h

@@ -61,14 +61,14 @@ class observer_ptr {
         "Template parameter T cannot be void"
     );
 public:
-      using element_type = std::remove_extent_t<T>;
+	using element_type = std::remove_extent_t<T>;
 
 	// Default constructor: initialize to nullptr
 	constexpr observer_ptr() noexcept : ptr(nullptr) {}
 	constexpr observer_ptr(std::nullptr_t) noexcept : ptr(nullptr) {}
 
 	// Constructor from raw pointer (implicit conversions allowed)
-	constexpr observer_ptr(T* p) noexcept : ptr(p) {}
+	constexpr explicit observer_ptr(T* p) noexcept : ptr(p) {}
 
 	// Copy constructor and assignment
 	constexpr observer_ptr(const observer_ptr&) noexcept = default;
@@ -160,39 +160,47 @@ class observer_ptr {
 
 // Free function for dynamic casting observer_ptr<B> to observer_ptr<A>
 template<class T, class U>
-observer_ptr<T> dynamic_observer_cast(const observer_ptr<U>& r) noexcept
+inline observer_ptr<T>
+dynamic_observer_cast(const observer_ptr<U>& r) noexcept
 {
-    if (auto p = dynamic_cast<typename observer_ptr<T>::element_type*>(r.get()))
-        return observer_ptr<T>(r);
-    else
-        return observer_ptr<T>{nullptr};
+	auto* p = dynamic_cast<typename observer_ptr<T>::element_type*>(r.get());
+
+	if (p) return observer_ptr<T>(p);
+
+	return observer_ptr<T>{nullptr};
 }
 
 template<class T, class U>
-observer_ptr<const T> dynamic_observer_cast(const observer_ptr<const U>& r) noexcept
+inline observer_ptr<const T>
+dynamic_observer_cast(const observer_ptr<const U>& r) noexcept
 {
-    if (auto p = dynamic_cast<const typename observer_ptr<const T>::element_type*>(r.get()))
-        return observer_ptr<const T>(p);
-    else
-        return observer_ptr<const T>{nullptr};
-}
+	const auto* p = dynamic_cast<const typename observer_ptr<const T>::element_type*>(r.get());
+
+	if (p) return observer_ptr<const T>(p);
+
+	return observer_ptr<const T>{nullptr};
+	}
 
 template<class T, class U>
-observer_ptr<T> static_observer_cast(const observer_ptr<U>& r) noexcept
+inline observer_ptr<T>
+static_observer_cast(const observer_ptr<U>& r) noexcept
 {
-    if (auto p = static_cast<typename observer_ptr<T>::element_type*>(r.get()))
-        return observer_ptr<T>(r);
-    else
-        return observer_ptr<T>{nullptr};
+	auto* p = static_cast<typename observer_ptr<T>::element_type*>(r.get());
+
+	if (p) return observer_ptr<T>(p);
+
+	return observer_ptr<T>{nullptr};
 }
 
 template<class T, class U>
-observer_ptr<const T> static_observer_cast(const observer_ptr<const U>& r) noexcept
+inline observer_ptr<const T>
+static_observer_cast(const observer_ptr<const U>& r) noexcept
 {
-    if (auto p = static_cast<const typename observer_ptr<const T>::element_type*>(r.get()))
-        return observer_ptr<const T>(p);
-    else
-        return observer_ptr<const T>{nullptr};
+	const auto* p = static_cast<const typename observer_ptr<const T>::element_type*>(r.get());
+
+	if (p) return observer_ptr<const T>(p);
+
+	return observer_ptr<const T>{nullptr};
 }
 
 // Non-member swap

include/slg/bsdf/bsdf.h

@@ -117,7 +117,7 @@ class BSDF {
 	bool IsShadowCatcherOnlyInfiniteLights() const { return material->IsShadowCatcherOnlyInfiniteLights(); }
 	bool IsCameraInvisible() const;
 	bool IsVolume() const {
-		auto ptr = dynamic_observer_cast<VolumeConstPtr>(material);
+		auto ptr = dynamic_observer_cast<const Volume>(material);
 		return bool(ptr);
 	}
 	bool IsPhotonGIEnabled() const { return material->IsPhotonGIEnabled(); }

include/slg/lights/lightsourcedefs.h

@@ -75,7 +75,7 @@ class LightSourceDefinitions {
 
 	LightSourceRef GetLightSource(size_t n) const { return lights[n]; }
 	LightSourcePtr GetLightSourcePtr(size_t n) const {
-		return std::addressof(lights[n].get());
+		return LightSourcePtr(std::addressof(lights[n].get()));
 	}
 
 	auto ViewEnvLightSources() {

src/slg/engines/pathocl/pathoclnativethread.cpp

@@ -89,7 +89,7 @@ FilmPtr PathOCLNativeRenderThread::GetThreadFilmPtr() {
 	auto * thread0 = static_cast<PathOCLNativeRenderThread *>(
 		engine->renderNativeThreads[0]
 	);
-	return thread0->threadFilm.get();
+	return FilmPtr(thread0->threadFilm.get());
 }
 
 FilmRef PathOCLNativeRenderThread::GetThreadFilm() {

src/slg/engines/tilepathcpu/tilepathcputhread.cpp

@@ -108,7 +108,7 @@ void TilePathCPURenderThread::RenderFunc(std::stop_token stop_token) {
 		// Render the tile
 		//----------------------------------------------------------------------
 
-		sampler.Init(&tileWork, tileFilm.get());
+		sampler.Init(&tileWork, FilmPtr(tileFilm.get()));
 
 		for (u_int y = 0; y < tileWork.GetCoord().height && !interruptionRequested; ++y) {
 			for (u_int x = 0; x < tileWork.GetCoord().width && !interruptionRequested; ++x) {

src/slg/lights/lightsourcedefs.cpp

@@ -101,7 +101,7 @@ LightSourceConstPtr LightSourceDefinitions::GetLightSourcePtr(const string &name
 	if (e == lightsByName.end())
 		throw runtime_error("Reference to an undefined LightSource in LightSourceDefinitions::GetLightSource(): " + name);
 
-	return e->second.get();
+	return LightSourceConstPtr(e->second.get());
 }
 
 LightSourcePtr LightSourceDefinitions::GetLightSourcePtr(const string &name) {
@@ -111,7 +111,7 @@ LightSourcePtr LightSourceDefinitions::GetLightSourcePtr(const string &name) {
 	if (e == lightsByName.end())
 		throw runtime_error("Reference to an undefined LightSource in LightSourceDefinitions::GetLightSource(): " + name);
 
-	return e->second.get();
+	return LightSourcePtr(e->second.get());
 }
 
 TriangleLightConstRef LightSourceDefinitions::GetLightSourceByMeshAndTriIndex(const u_int meshIndex, const u_int triIndex) const {

src/slg/lights/strategies/distributionlightstrategy.cpp

@@ -60,7 +60,7 @@ LightSourcePtr DistributionLightStrategy::SampleLights(
 		assert ((lightIndex >= 0) && (lightIndex < scene.GetLightSources().GetSize()));
 
 		if (*pdf > 0.f)
-			return &scene.GetLightSources().GetLightSource(lightIndex);
+			return LightSourcePtr(&scene.GetLightSources().GetLightSource(lightIndex));
 		else
 			return nullptr;
 	} else