Subdiv: add adaptive option

Author: howetuft

include/slg/shapes/subdiv.h

@@ -29,15 +29,20 @@ class Camera;
 
 class SubdivShape : public Shape {
 public:
-	SubdivShape(const Camera *camera, luxrays::ExtTriangleMesh *srcMesh,
-			const u_int maxLevel, const float maxEdgeScreenSize);
+	SubdivShape(
+		const Camera *camera,
+		luxrays::ExtTriangleMesh *srcMesh,
+		const u_int maxLevel,
+		const float maxEdgeScreenSize,
+		const bool adaptive
+	);
 	virtual ~SubdivShape();
 
 	virtual ShapeType GetType() const { return SUBDIV; }
 
 	static float MaxEdgeScreenSize(const Camera *camera, luxrays::ExtTriangleMesh *srcMesh);
 	static luxrays::ExtTriangleMesh *ApplySubdiv(luxrays::ExtTriangleMesh *srcMesh,
-			const u_int maxLevel);
+			const u_int maxLevel, const bool adaptive);
 
 protected:
 	virtual luxrays::ExtTriangleMesh *RefineImpl(const Scene *scene);

src/slg/scene/parseshapes.cpp

@@ -266,12 +266,13 @@ ExtTriangleMesh *Scene::CreateShape(const string &shapeName, const Properties &p
 		const string sourceMeshName = props.Get(Property(propName + ".source")("")).Get<string>();
 		if (!extMeshCache.IsExtMeshDefined(sourceMeshName))
 			throw runtime_error("Unknown shape name in a subdiv shape: " + shapeName);
-		
+
 		const u_int maxLevel = props.Get(Property(propName + ".maxlevel")(2)).Get<u_int>();
 		const float maxEdgeScreenSize = Max(props.Get(Property(propName + ".maxedgescreensize")(0.f)).Get<float>(), 0.f);
+		const bool subdivAdaptive = props.Get(Property(propName + ".adaptive")(true)).Get<bool>();
 
 		shape = new SubdivShape(camera, (ExtTriangleMesh *)extMeshCache.GetExtMesh(sourceMeshName),
-				maxLevel, maxEdgeScreenSize);
+				maxLevel, maxEdgeScreenSize, subdivAdaptive);
 	} else if (shapeType == "displacement") {
 		const string sourceMeshName = props.Get(Property(propName + ".source")("")).Get<string>();
 		if (!extMeshCache.IsExtMeshDefined(sourceMeshName))

src/slg/shapes/subdiv.cpp

@@ -156,7 +156,9 @@ float SubdivShape::MaxEdgeScreenSize(const Camera *camera, ExtTriangleMesh *srcM
 
 static Far::TopologyRefiner * createFarTopologyRefiner(const ExtTriangleMesh*);
 
-ExtTriangleMesh *SubdivShape::ApplySubdiv(ExtTriangleMesh *srcMesh, const u_int maxLevel) {
+ExtTriangleMesh *SubdivShape::ApplySubdiv(
+	ExtTriangleMesh *srcMesh, const u_int maxLevel, const bool adaptive
+) {
 	//--------------------------------------------------------------------------
 	// Check data
 	//--------------------------------------------------------------------------
@@ -174,10 +176,17 @@ ExtTriangleMesh *SubdivShape::ApplySubdiv(ExtTriangleMesh *srcMesh, const u_int
 	// Set-up refiner
 	std::unique_ptr<Far::TopologyRefiner> refiner(createFarTopologyRefiner(srcMesh));
 
-	// Uniformly refine the topology up to 'maxlevel'
-	Far::TopologyRefiner::UniformOptions refiner_options(maxLevel);
-	refiner_options.fullTopologyInLastLevel = true;
-	refiner->RefineUniform(refiner_options);
+	// Refine the topology up to 'maxlevel'
+	if (adaptive) {
+		SDL_LOG("Subdiv - Refining (adaptive)");
+		Far::TopologyRefiner::AdaptiveOptions refiner_options(maxLevel);
+		refiner->RefineAdaptive(refiner_options);
+	} else {
+		SDL_LOG("Subdiv - Refining (uniform)");
+		Far::TopologyRefiner::UniformOptions refiner_options(maxLevel);
+		refiner_options.fullTopologyInLastLevel = true;
+		refiner->RefineUniform(refiner_options);
+	}
 
 	Far::TopologyLevel const& refFirstLevel = refiner->GetLevel(0);
 	Far::TopologyLevel const& refLastLevel = refiner->GetLevel(maxLevel);
@@ -412,7 +421,7 @@ ExtTriangleMesh *SubdivShape::ApplySubdiv(ExtTriangleMesh *srcMesh, const u_int
 }
 
 SubdivShape::SubdivShape(const Camera *camera, ExtTriangleMesh *srcMesh,
-		const u_int maxLevel, const float maxEdgeScreenSize) {
+		const u_int maxLevel, const float maxEdgeScreenSize, const bool adaptive) {
 	const double startTime = WallClockTime();
 
 	if ((maxEdgeScreenSize > 0.f) && !camera)
@@ -433,7 +442,7 @@ SubdivShape::SubdivShape(const Camera *camera, ExtTriangleMesh *srcMesh,
 					break;
 
 				// Subdivide by one level and re-try
-				ExtTriangleMesh *newMesh = ApplySubdiv(mesh, 1);
+				ExtTriangleMesh *newMesh = ApplySubdiv(mesh, 1, adaptive);
 				SDL_LOG("Subdivided shape step #" << i << " from " << mesh->GetTotalTriangleCount() << " to " << newMesh->GetTotalTriangleCount() << " faces");
 
 				// Replace old mesh with new one
@@ -443,7 +452,7 @@ SubdivShape::SubdivShape(const Camera *camera, ExtTriangleMesh *srcMesh,
 		} else {
 			SDL_LOG("Subdividing shape " << srcMesh->GetName() << " at level: " << maxLevel);
 
-			mesh = ApplySubdiv(srcMesh, maxLevel);
+			mesh = ApplySubdiv(srcMesh, maxLevel, adaptive);
 		}
 	} else {
 		// Nothing to do, just make a copy