Skip to content

Commit b1c9159

Browse files
committed
Fix Randomized Tiling regression (#1078)
1 parent f041455 commit b1c9159

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

include/slg/scene/scene.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class Scene {
293293
VolumeConstPtr defaultWorldVolume;
294294

295295
// This image map is required for some other textures
296-
ImageMapSPtr randomImageMap;
296+
inline static ImageMapSPtr randomImageMap{ImageMap::AllocRandomImageMap(512)};
297297

298298
// Here are the containers for the scene elements:
299299
ExtMeshCache extMeshCache; // Mesh objects cache

src/slg/scene/scene.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,15 @@ using namespace slg;
5858
// Scene
5959
//------------------------------------------------------------------------------
6060

61-
Scene::Scene(luxrays::PropertiesRPtr resizePolicyProps) :
62-
randomImageMap(ImageMap::AllocRandomImageMap(512))
61+
Scene::Scene(luxrays::PropertiesRPtr resizePolicyProps)
6362
{
6463
Init(resizePolicyProps);
6564
}
6665

6766
Scene::Scene(
6867
PropertiesRPtr scnProps,
6968
PropertiesRPtr resizePolicyProps
70-
) :
71-
randomImageMap(ImageMap::AllocRandomImageMap(512))
69+
)
7270
{
7371
Init(resizePolicyProps);
7472

@@ -86,7 +84,7 @@ void Scene::Init(luxrays::PropertiesRPtr resizePolicyProps) {
8684
if (resizePolicyProps)
8785
imgMapCache.SetImageResizePolicy(ImageMapResizePolicy::FromProperties(*resizePolicyProps));
8886
// Add random image map to imgMapCache and specify its resize policy
89-
imgMapCache.DefineImageMap(ImageMap::AllocRandomImageMap(512));
87+
imgMapCache.DefineImageMap(randomImageMap);
9088
imgMapCache.resizePolicyToApply.push_back(false);
9189

9290
enableParsePrint = true;

0 commit comments

Comments
 (0)