Cad Example: SingleLineText to take wchar

Author: Erfan-Ahmadi

62_CAD/SingleLineText.cpp

@@ -1,6 +1,6 @@
 #include "SingleLineText.h"
 
-SingleLineText::SingleLineText(nbl::ext::TextRendering::FontFace* face, const std::string& text)
+SingleLineText::SingleLineText(nbl::ext::TextRendering::FontFace* face, const std::wstring& text)
 {
 	m_glyphBoxes.reserve(text.length());
 
@@ -11,7 +11,7 @@ SingleLineText::SingleLineText(nbl::ext::TextRendering::FontFace* face, const st
 	float64_t2 currentPos = float32_t2(0.0, 0.0);
 	for (uint32_t i = 0; i < text.length(); i++)
 	{
-		const auto glyphIndex = face->getGlyphIndex(wchar_t(text.at(i)));
+		const auto glyphIndex = face->getGlyphIndex(text.at(i));
 		const auto glyphMetrics = face->getGlyphMetrics(glyphIndex);
 		const bool skipGenerateGlyph = (glyphIndex == 0 || (glyphMetrics.size.x == 0.0 && glyphMetrics.size.y == 0.0));
 

62_CAD/SingleLineText.h

@@ -12,7 +12,7 @@ class SingleLineText
 {
 public:
 	// constructs and fills the `glyphBoxes`
-	SingleLineText(nbl::ext::TextRendering::FontFace* face, const std::string& text);
+	SingleLineText(nbl::ext::TextRendering::FontFace* face, const std::wstring& text);
 
 	struct BoundingBox
 	{

62_CAD/main.cpp

@@ -83,7 +83,7 @@ constexpr std::array<float, (uint32_t)ExampleMode::CASE_COUNT> cameraExtents =
 	1000.0	// CASE_11
 };
 
-constexpr ExampleMode mode = ExampleMode::CASE_5;
+constexpr ExampleMode mode = ExampleMode::CASE_8;
 
 class Camera2D
 {
@@ -1098,10 +1098,10 @@ class ComputerAidedDesign final : public nbl::examples::SimpleWindowedApplicatio
 		if (m_font->getFreetypeFace()->num_charmaps > 0)
 			FT_Set_Charmap(m_font->getFreetypeFace(), m_font->getFreetypeFace()->charmaps[0]);
 
-		const auto str = "MSDF: ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnoprstuvwxyz '1234567890-=\"!@#$%&*()_+";
+		const std::wstring str = L"MSDF: ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnoprstuvwxyz '1234567890-=\"!@#$%&*()_+";
 		singleLineText = std::unique_ptr<SingleLineText>(new SingleLineText(
 			m_font.get(),
-			std::string(str)));
+			str));
 
 		drawResourcesFiller.setGlyphMSDFTextureFunction(
 			[&](nbl::ext::TextRendering::FontFace* face, uint32_t glyphIdx) -> core::smart_refctd_ptr<asset::ICPUImage>