[62.cad] dedicated test case for msdfs + cleanups

Author: Erfan-Ahmadi

62_CAD/DrawResourcesFiller.cpp

@@ -10,7 +10,7 @@ DrawResourcesFiller::DrawResourcesFiller(smart_refctd_ptr<IUtilities>&& utils, I
 
 // function is called when buffer is filled and we should submit draws and clear the buffers and continue filling
 
-void DrawResourcesFiller::setSubmitDrawsFunction(SubmitFunc func)
+void DrawResourcesFiller::setSubmitDrawsFunction(const SubmitFunc& func)
 {
 	submitDraws = func;
 }
@@ -825,12 +825,12 @@ DrawResourcesFiller::msdf_hash DrawResourcesFiller::hashFontGlyph(size_t fontHas
 	return hash;
 }
 
-void DrawResourcesFiller::setGlyphMSDFTextureFunction(GetGlyphMSDFTextureFunc func)
+void DrawResourcesFiller::setGlyphMSDFTextureFunction(const GetGlyphMSDFTextureFunc& func)
 {
 	getGlyphMSDF = func;
 }
 
-void DrawResourcesFiller::setHatchFillMSDFTextureFunction(GetHatchFillPatternMSDFTextureFunc  func)
+void DrawResourcesFiller::setHatchFillMSDFTextureFunction(const GetHatchFillPatternMSDFTextureFunc& func)
 {
 	getHatchFillPatternMSDF = func;
 }

62_CAD/DrawResourcesFiller.h

@@ -44,7 +44,7 @@ struct DrawResourcesFiller
 	DrawResourcesFiller(smart_refctd_ptr<IUtilities>&& utils, IQueue* copyQueue);
 
 	typedef std::function<void(SIntendedSubmitInfo&)> SubmitFunc;
-	void setSubmitDrawsFunction(SubmitFunc func);
+	void setSubmitDrawsFunction(const SubmitFunc& func);
 
 	void allocateIndexBuffer(ILogicalDevice* logicalDevice, uint32_t indices);
 
@@ -62,8 +62,8 @@ struct DrawResourcesFiller
 	// it's up to user to return cached or generate on the fly.
 	typedef std::function<core::smart_refctd_ptr<ICPUBuffer>(nbl::ext::TextRendering::FontFace* /*face*/, uint32_t /*glyphIdx*/)> GetGlyphMSDFTextureFunc;
 	typedef std::function<core::smart_refctd_ptr<ICPUBuffer>(HatchFillPattern/*pattern*/)> GetHatchFillPatternMSDFTextureFunc;
-	void setGlyphMSDFTextureFunction(GetGlyphMSDFTextureFunc func);
-	void setHatchFillMSDFTextureFunction(GetHatchFillPatternMSDFTextureFunc func);
+	void setGlyphMSDFTextureFunction(const GetGlyphMSDFTextureFunc& func);
+	void setHatchFillMSDFTextureFunction(const GetHatchFillPatternMSDFTextureFunc& func);
 
 	//! this function fills buffers required for drawing a polyline and submits a draw through provided callback when there is not enough memory.
 	void drawPolyline(const CPolylineBase& polyline, const LineStyleInfo& lineStyleInfo, SIntendedSubmitInfo& intendedNextSubmit);

62_CAD/Hatch.cpp

@@ -133,7 +133,7 @@ std::array<double, 2> Hatch::Segment::intersect(const Segment& other) const
 	return result;
 }
 
-Hatch::Hatch(std::span<CPolyline> lines, const MajorAxis majorAxis, int32_t& debugStep, std::function<void(CPolyline, LineStyleInfo)> debugOutput /* tmp */)
+Hatch::Hatch(std::span<CPolyline> lines, const MajorAxis majorAxis, int32_t* debugStepPtr, const std::function<void(CPolyline, LineStyleInfo)>& debugOutput)
 {
 	intersectionAmounts = std::vector<uint32_t>();
 	// this threshsold is used to decide when to consider minor position to be 
@@ -150,8 +150,11 @@ Hatch::Hatch(std::span<CPolyline> lines, const MajorAxis majorAxis, int32_t& deb
 
 	int major = (int)majorAxis;
 	int minor = 1-major; // Minor = Opposite of major (X)
-
+	
 #ifdef DEBUG_HATCH_VISUALLY
+	int32_t debugStepDefault = 0u;
+	int32_t& debugStep = (debugStepPtr) ? *debugStepPtr : debugStepDefault;
+
 	auto drawDebugBezier = [&](QuadraticBezier bezier, float32_t4 color)
 	{
 		CPolyline outputPolyline;

62_CAD/Hatch.h

@@ -75,7 +75,8 @@ class Hatch
 		// checks if it's a straight line e.g. if you're sweeping along y axis the it's a line parallel to x
 		bool isStraightLineConstantMajor() const;
 	};
-	Hatch(std::span<CPolyline> lines, const MajorAxis majorAxis, int32_t& debugStep, std::function<void(CPolyline, LineStyleInfo)> debugOutput /* tmp */);
+
+	Hatch(std::span<CPolyline> lines, const MajorAxis majorAxis, int32_t* debugStep = nullptr, const std::function<void(CPolyline, LineStyleInfo)>& debugOutput = {});
 
 	// (temporary)
 	Hatch(std::vector<CurveHatchBox>&& in_hatchBoxes) :