[62.CAD] Small fixes and edits to CAD example classes

Author: Erfan-Ahmadi

62_CAD/DrawResourcesFiller.cpp

@@ -218,6 +218,7 @@ void DrawResourcesFiller::drawPolyline(const CPolylineBase& polyline, uint32_t p
 	}
 }
 
+// TODO[Erfan]: Makes more sense if parameters are: solidColor + fillPattern + patternColor
 void DrawResourcesFiller::drawHatch(
 		const Hatch& hatch,
 		const float32_t4& foregroundColor, 
@@ -241,6 +242,9 @@ void DrawResourcesFiller::drawHatch(
 		const HatchFillPattern fillPattern,
 		SIntendedSubmitInfo& intendedNextSubmit)
 {
+	if (color.a == 0.0f) // not visible
+		return;
+
 	uint32_t textureIdx = InvalidTextureIdx;
 	if (fillPattern != HatchFillPattern::SOLID_FILL)
 	{

62_CAD/DrawResourcesFiller.h

@@ -211,6 +211,7 @@ struct DrawResourcesFiller
 	// we need to store the clip projection stack to make sure the front is always available in memory
 	void pushClipProjectionData(const ClipProjectionData& clipProjectionData);
 	void popClipProjectionData();
+	const std::deque<ClipProjectionData>& getClipProjectionStack() const { return clipProjections; }
 
 	smart_refctd_ptr<IGPUImageView> getMSDFsTextureArray() { return msdfTextureArray; }
 
@@ -443,7 +444,7 @@ struct DrawResourcesFiller
 	std::set<uint32_t>					msdfTextureArrayIndicesUsed = {}; // indices in the msdf texture array allocator that have been used in the current frame // TODO: make this a dynamic bitset
 	std::vector<MSDFTextureCopy>		msdfTextureCopies = {}; // queued up texture copies
 	std::unique_ptr<MSDFsLRUCache>		msdfLRUCache; // LRU Cache to evict Least Recently Used in case of overflow
-	static constexpr asset::E_FORMAT	MSDFTextureFormat = asset::E_FORMAT::EF_R8G8B8_SNORM;
+	static constexpr asset::E_FORMAT	MSDFTextureFormat = asset::E_FORMAT::EF_R8G8B8A8_SNORM;
 
 	bool m_hasInitializedMSDFTextureArrays = false;
 };

62_CAD/Hatch.cpp

@@ -1156,12 +1156,13 @@ void lightShaded(std::vector<CPolyline>& polylines, const float64_t2& offset)
 
 void shaded(std::vector<CPolyline>& polylines, const float64_t2& offset)
 {
+	float64_t2 size = float64_t2(1.0, 1.0)/8.0 * FillPatternShapeExtent;
 	for (uint32_t x = 0; x < 8; x++)
 	{
 		for (uint32_t y = 0; y < 8; y++)
 		{
 			if (x % 2 != y % 2)
-				square(polylines, float64_t2((double)x, (double)y)/8.0 * FillPatternShapeExtent + offset);
+				square(polylines, float64_t2((double)x, (double)y)/8.0 * FillPatternShapeExtent + offset, size);
 		}
 	}
 

62_CAD/Hatch.h

@@ -76,6 +76,8 @@ class Hatch
 		bool isStraightLineConstantMajor() const;
 	};
 
+	Hatch() = default;
+
 	Hatch(std::span<CPolyline> lines, const MajorAxis majorAxis, nbl::system::logger_opt_smart_ptr logger = nullptr, int32_t* debugStep = nullptr, const std::function<void(CPolyline, LineStyleInfo)>& debugOutput = {});
 
 	// (temporary)
@@ -91,6 +93,6 @@ class Hatch
 	static core::smart_refctd_ptr<asset::ICPUImage> generateHatchFillPatternMSDF(nbl::ext::TextRendering::TextRenderer* textRenderer, HatchFillPattern fillPattern, uint32_t2 msdfExtents);
 
 private:
-	std::vector<CurveHatchBox> hatchBoxes;
+	std::vector<CurveHatchBox> hatchBoxes = {};
 };
 

62_CAD/Polyline.cpp

@@ -451,6 +451,9 @@ void CPolyline::makeWideWhole(CPolyline& outOffset1, CPolyline& outOffset2, floa
 
 	if (!m_closedPolygon)
 	{
+		if (outOffset1.getSectionsCount() == 0u || outOffset2.getSectionsCount() == 0u)
+			return;
+
 		nbl::hlsl::float64_t2 beginToBeginConnector[2u];
 		beginToBeginConnector[0u] = outOffset1.getSectionFirstPoint(outOffset1.getSectionInfoAt(0u));
 		beginToBeginConnector[1u] = outOffset2.getSectionFirstPoint(outOffset2.getSectionInfoAt(0u));
@@ -468,7 +471,7 @@ void CPolyline::stippleBreakDown(const LineStyleInfo& lineStyle, const OutputPol
 		return;
 
 	// currently only works for road styles with only 2 stipple values (1 draw, 1 gap)
-	assert(lineStyle.stipplePatternSize == 1);
+	assert(lineStyle.stipplePatternSize <= 1);
 
 	const float64_t patternLen = 1.0 / lineStyle.reciprocalStipplePatternLen;
 	const float32_t drawSectionNormalizedLen = lineStyle.stipplePattern[0];

62_CAD/Polyline.h

@@ -13,7 +13,7 @@ struct PolylineSettings
 	static constexpr bool ResetLineStyleOnDiscontinuity = false;
 };
 
-// holds values for `LineStyle` struct and caculates stipple pattern re values, cant think of better name
+// holds values for `LineStyle` struct and caculates stipple pattern processed values, cant think of better name
 // Also used for TextStyles aliased with some members here. (temporarily?)
 struct LineStyleInfo
 {
@@ -23,9 +23,9 @@ struct LineStyleInfo
 	static constexpr float PatternEpsilon = 1e-3f;  // TODO: I think for phase shift in normalized stipple space this is a reasonable value? right?
 	static const uint32_t StipplePatternMaxSize = LineStyle::StipplePatternMaxSize;
 
-	float32_t4 color;
-	float screenSpaceLineWidth; // alternatively used as TextStyle::italicTiltSlope
-	float worldSpaceLineWidth;  // alternatively used as TextStyle::boldInPixels
+	float32_t4 color = {};
+	float screenSpaceLineWidth = 0.0f; // alternatively used as TextStyle::italicTiltSlope
+	float worldSpaceLineWidth = 0.0f;  // alternatively used as TextStyle::boldInPixels
 
 	/*
 		Stippling Values:
@@ -366,7 +366,7 @@ class CPolyline : public CPolylineBase
 public:
 	CPolyline() :
 		m_Min(float64_t2(nbl::hlsl::numeric_limits<float64_t>::max, nbl::hlsl::numeric_limits<float64_t>::max)),
-		m_Max(float64_t2(nbl::hlsl::numeric_limits<float64_t>::min, nbl::hlsl::numeric_limits<float64_t>::min)),
+		m_Max(float64_t2(nbl::hlsl::numeric_limits<float64_t>::lowest, nbl::hlsl::numeric_limits<float64_t>::lowest)),
 		m_closedPolygon(false)
 	{}
 
@@ -619,6 +619,44 @@ class CPolyline : public CPolylineBase
 	float64_t2 getMin() const { return m_Min; }
 	float64_t2 getMax() const { return m_Max; }
 
+	void transform(const float64_t2x2& rotScale, float64_t2 translate)
+	{
+		// transform is linear
+		for (auto& linePoint : m_linePoints)
+			linePoint.p = mul(rotScale,linePoint.p) + translate;
+		for (auto& bezierPoint : m_quadBeziers)
+		{
+			bezierPoint.shape.P0 = mul(rotScale,bezierPoint.shape.P0) + translate;
+			bezierPoint.shape.P1 = mul(rotScale,bezierPoint.shape.P1) + translate;
+			bezierPoint.shape.P2 = mul(rotScale,bezierPoint.shape.P2) + translate;
+		}
+
+		// not useful for markers:
+#if 0
+		std::array<float64_t2, 4> corners = {
+			float64_t2{ m_Min.x, m_Min.y },
+			float64_t2{ m_Max.x, m_Min.y },
+			float64_t2{ m_Min.x, m_Max.y },
+			float64_t2{ m_Max.x, m_Max.y }
+		};
+	
+		std::array<float64_t2, 4> transformedCorners;
+		for (uint32_t i = 0; i < 4u; ++i)
+			transformedCorners[i] = mul(rotScale, corners[i]) + translate;
+	
+		// Compute new AABB by finding min and max of transformed corners (OBB)
+		m_Min = { nbl::hlsl::numeric_limits<float64_t>::max, nbl::hlsl::numeric_limits<float64_t>::max };
+		m_Max = { nbl::hlsl::numeric_limits<float64_t>::lowest, nbl::hlsl::numeric_limits<float64_t>::lowest };
+
+		for (const auto& corner : transformedCorners) {
+			m_Min.x = nbl::core::min(m_Min.x, corner.x);
+			m_Min.y = nbl::core::min(m_Min.y, corner.y);
+			m_Max.x = nbl::core::max(m_Max.x, corner.x);
+			m_Max.y = nbl::core::max(m_Max.y, corner.y);
+		}
+#endif
+	}
+
 protected:
 	std::vector<PolylineConnector> m_polylineConnector;
 	std::vector<SectionInfo> m_sections;
@@ -636,6 +674,7 @@ class CPolyline : public CPolylineBase
 		m_Max.y = nbl::hlsl::max(m_Max.y, point.y);
 	}
 
+	// AABB
 	float64_t2 m_Min; // min coordinate of the whole polyline
 	float64_t2 m_Max; // max coordinate of the whole polyline
 

62_CAD/SingleLineText.cpp

@@ -1,8 +1,7 @@
 #include "SingleLineText.h"
 
-SingleLineText::SingleLineText(core::smart_refctd_ptr<nbl::ext::TextRendering::FontFace>&& face, const std::string& text)
+SingleLineText::SingleLineText(nbl::ext::TextRendering::FontFace* face, const std::string& text)
 {
-	m_face = std::move(face);
 	m_glyphBoxes.reserve(text.length());
 
 	m_boundingBox.min = float64_t2(0.0, 0.0);
@@ -12,14 +11,14 @@ SingleLineText::SingleLineText(core::smart_refctd_ptr<nbl::ext::TextRendering::F
 	float64_t2 currentPos = float32_t2(0.0, 0.0);
 	for (uint32_t i = 0; i < text.length(); i++)
 	{
-		const auto glyphIndex = m_face->getGlyphIndex(wchar_t(text.at(i)));
-		const auto glyphMetrics = m_face->getGlyphMetrics(glyphIndex);
+		const auto glyphIndex = face->getGlyphIndex(wchar_t(text.at(i)));
+		const auto glyphMetrics = face->getGlyphMetrics(glyphIndex);
 		const bool skipGenerateGlyph = (glyphIndex == 0 || (glyphMetrics.size.x == 0.0 && glyphMetrics.size.y == 0.0));
 
 		if (!skipGenerateGlyph)
 		{
 #ifdef VERIFY_DEBUG
-			msdfgen::Shape shape = m_face->generateGlyphShape(glyphIndex);
+			msdfgen::Shape shape = face->generateGlyphShape(glyphIndex);
 			_NBL_BREAK_IF(shape.contours.empty());
 #endif
 			GlyphBox glyphBbox = 
@@ -43,6 +42,7 @@ SingleLineText::SingleLineText(core::smart_refctd_ptr<nbl::ext::TextRendering::F
 void SingleLineText::Draw(
 	DrawResourcesFiller& drawResourcesFiller,
 	SIntendedSubmitInfo& intendedNextSubmit,
+	nbl::ext::TextRendering::FontFace* face,
 	const float64_t2& baselineStart,
 	const float32_t2& scale,
 	const float32_t& rotateAngle,
@@ -74,8 +74,8 @@ void SingleLineText::Draw(
 
 		// float32_t3 xx = float64_t3(0.0, -glyphBox.size.y, 0.0);
 		const float32_t aspectRatio = static_cast<float32_t>(glm::length(dirV) / glm::length(dirU)); // check if you can just do: (glyphBox.size.y * scale.y) / glyphBox.size.x * scale.x)
-		const float32_t2 minUV = m_face->getUV(float32_t2(0.0f,0.0f), glyphBox.size, drawResourcesFiller.getMSDFResolution(), MSDFPixelRange);
-		drawResourcesFiller.drawFontGlyph(m_face.get(), glyphBox.glyphIdx, topLeft, dirU, aspectRatio, minUV, glyphObjectIdx, intendedNextSubmit);
+		const float32_t2 minUV = face->getUV(float32_t2(0.0f,0.0f), glyphBox.size, drawResourcesFiller.getMSDFResolution(), MSDFPixelRange);
+		drawResourcesFiller.drawFontGlyph(face, glyphBox.glyphIdx, topLeft, dirU, aspectRatio, minUV, glyphObjectIdx, intendedNextSubmit);
 	}
 
 }

62_CAD/SingleLineText.h

@@ -7,11 +7,12 @@ using namespace nbl::core;
 using namespace nbl::asset;
 using namespace nbl::ext::TextRendering;
 
+/// This is basically a Text Layout in Font Unit Space + a Draw method with transformations, color and additional parameters
 class SingleLineText
 {
 public:
 	// constructs and fills the `glyphBoxes`
-	SingleLineText(core::smart_refctd_ptr<nbl::ext::TextRendering::FontFace>&& face, const std::string& text);
+	SingleLineText(nbl::ext::TextRendering::FontFace* face, const std::string& text);
 
 	struct BoundingBox
 	{
@@ -30,6 +31,7 @@ class SingleLineText
 	void Draw(
 		DrawResourcesFiller& drawResourcesFiller,
 		SIntendedSubmitInfo& intendedNextSubmit,
+		nbl::ext::TextRendering::FontFace* face,
 		const float64_t2& baselineStart = float64_t2(0.0,0.0),
 		const float32_t2& scale = float64_t2(1.0f, 1.0f),
 		const float32_t& rotateAngle = 0.0f,
@@ -49,5 +51,4 @@ class SingleLineText
 
 	BoundingBox m_boundingBox = {};
 	std::vector<GlyphBox> m_glyphBoxes;
-	core::smart_refctd_ptr<nbl::ext::TextRendering::FontFace> m_face;
 };

62_CAD/main.cpp

@@ -1042,7 +1042,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 
 		const auto str = "MSDF: ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnoprstuvwxyz '1234567890-=\"!@#$%&*()_+";
 		singleLineText = std::unique_ptr<SingleLineText>(new SingleLineText(
-			core::smart_refctd_ptr<FontFace>(m_font), 
+			m_font.get(),
 			std::string(str)));
 
 		drawResourcesFiller.setGlyphMSDFTextureFunction(
@@ -1480,6 +1480,7 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 		// We only support one swapchain mode, surface, the other one is Display which we have not implemented yet.
 		retval.swapchainMode = video::E_SWAPCHAIN_MODE::ESM_SURFACE;
 		retval.validations = true;
+		retval.synchronizationValidation = true;
 		return retval;
 	}
 protected:
@@ -3061,10 +3062,10 @@ class ComputerAidedDesign final : public examples::SimpleWindowedApplication, pu
 			{
 				float32_t rotation = 0.0; // nbl::core::PI<float>()* abs(cos(m_timeElapsed * 0.00005));
 				float32_t italicTiltAngle = nbl::core::PI<float>() / 9.0f;
-				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, float64_t2(0.0,-100.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), 0.0f, 0.0f);
-				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, float64_t2(0.0,-150.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), 0.0f, 0.5f);
-				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, float64_t2(0.0,-200.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), italicTiltAngle, 0.0f);
-				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, float64_t2(0.0,-250.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), italicTiltAngle, 0.5f);
+				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, m_font.get(), float64_t2(0.0,-100.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), 0.0f, 0.0f);
+				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, m_font.get(), float64_t2(0.0,-150.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), 0.0f, 0.5f);
+				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, m_font.get(), float64_t2(0.0,-200.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), italicTiltAngle, 0.0f);
+				singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, m_font.get(), float64_t2(0.0,-250.0), float32_t2(1.0, 1.0), rotation, float32_t4(1.0, 1.0, 1.0, 1.0), italicTiltAngle, 0.5f);
 				// singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, float64_t2(0.0,-200.0), float32_t2(1.0, 1.0), nbl::core::PI<float>() * abs(cos(m_timeElapsed * 0.00005)));
 				// Smaller text to test mip maps
 				//singleLineText->Draw(drawResourcesFiller, intendedNextSubmit, float64_t2(0.0,-130.0), float32_t2(0.4, 0.4), rotation);