Merge branch 'tgeotex_streaming'

Author: Erfan-Ahmadi

24_ColorSpaceTest/main.cpp

@@ -541,7 +541,7 @@ class ColorSpaceTestSampleApp final : public SimpleWindowedApplication, public B
 						struct
 						{
 							std::string path;
-							json data;
+							::json data;
 						} current, reference;
 
 						current.path = (localOutputCWD / filename).make_preferred().string() + "_" + modeAsString + extension.string() + ".json";
@@ -552,7 +552,7 @@ class ColorSpaceTestSampleApp final : public SimpleWindowedApplication, public B
 						m_logger->log("Mode: \"%s\"", ILogger::ELL_INFO, modeAsString.c_str());
 						m_logger->log("Writing \"%ls\"'s image hash to \"%s\"", ILogger::ELL_INFO, filename.c_str(), current.path.c_str());
 
-						current.data["image"] = json::array();
+						current.data["image"] = ::json::array();
 						for (const auto& it : hash)
 							current.data["image"].push_back(it);
 

62_CAD/CMakeLists.txt

@@ -14,31 +14,13 @@ set(EXAMPLE_SOURCES
   "${CMAKE_CURRENT_SOURCE_DIR}/DrawResourcesFiller.h"
   "${CMAKE_CURRENT_SOURCE_DIR}/SingleLineText.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/SingleLineText.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/GeoTexture.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/GeoTexture.h"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Images.cpp"
   "../../src/nbl/ext/TextRendering/TextRendering.cpp" # TODO: this one will be a part of dedicated Nabla ext called "TextRendering" later on which uses MSDF + Freetype
 )
 set(EXAMPLE_INCLUDES
   "${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/boost/superproject/libs/math/include")
 nbl_create_executable_project("${EXAMPLE_SOURCES}" "" "${EXAMPLE_INCLUDES}" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
-
-if(NBL_EMBED_BUILTIN_RESOURCES)
-	set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)
-	set(RESOURCE_DIR "app_resources")
-
-	get_filename_component(_SEARCH_DIRECTORIES_ "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
-	get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
-	get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
-
-    file(GLOB_RECURSE BUILTIN_RESOURCE_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}" CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}/*")
-    foreach(RES_FILE ${BUILTIN_RESOURCE_FILES})
-      LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "${RES_FILE}")
-    endforeach()
-
-	ADD_CUSTOM_BUILTIN_RESOURCES(${_BR_TARGET_} RESOURCES_TO_EMBED "${_SEARCH_DIRECTORIES_}" "${RESOURCE_DIR}" "nbl::this_example::builtin" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}")
-
-	LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} ${_BR_TARGET_})
-endif()
+target_link_libraries(${EXECUTABLE_NAME} PRIVATE Nabla::ext::FullScreenTriangle)
 
 # if enabled then try use Nabla "Text Rendering" extension 
 # with an implemented interface using the 3rdparty deps 
@@ -83,7 +65,7 @@ set(JSON [=[
 		"CAPS": [${REQUIRED_CAPS}]
     },
     {
-		"INPUT": "shaders/main_pipeline/fragment.hlsl",
+		"INPUT": "shaders/main_pipeline/all_fragment_shaders.hlsl",
 		"KEY": "main_pipeline_fragment_shader",
 		"CAPS": [${REQUIRED_CAPS}]
     }

62_CAD/DrawResourcesFiller.cpp

@@ -812,7 +812,7 @@ static constexpr float64_t FillPatternShapeExtent = 32.0;
 
 void line(std::vector<CPolyline>& polylines, float64_t2 begin, float64_t2 end)
 {
-	std::vector<float64_t2> points = {
+	std::array<float64_t2, 2> points = {
 		begin, end
 	};
 	CPolyline polyline;
@@ -846,15 +846,23 @@ void checkered(std::vector<CPolyline>& polylines, const float64_t2& offset)
 		float64_t2(0.0, 1.0),
 	};
 	{
-		std::vector<float64_t2> points;
-		points.reserve(squarePointsCW.size());
-		for (const auto& p : squarePointsCW) points.push_back(p * FillPatternShapeExtent + offset);
+		std::array<float64_t2, 5> points;
+		auto i = 0u;
+		for (const auto& p : squarePointsCW)
+		{
+			points[i] = p * FillPatternShapeExtent + offset;
+			i++;
+		}
 		polyline.addLinePoints(points);
 	}
 	{
-		std::vector<float64_t2> points;
-		points.reserve(squarePointsCW.size());
-		for (const auto& p : squarePointsCW) points.push_back((p + float64_t2(0.5, -0.5)) * FillPatternShapeExtent + offset);
+		std::array<float64_t2, 5> points;
+		auto i = 0u;
+		for (const auto& p : squarePointsCW)
+		{
+			points[i] = (p + float64_t2(0.5, -0.5)) * FillPatternShapeExtent + offset;
+			i++;
+		}
 		polyline.addLinePoints(points);
 	}
 	polylines.push_back(std::move(polyline));
@@ -885,16 +893,24 @@ void diamonds(std::vector<CPolyline>& polylines, const float64_t2& offset)
 
 	// Outer
 	{
-		std::vector<float64_t2> points;
-		points.reserve(diamondPointsCW.size());
-		for (const auto& p : diamondPointsCW) points.push_back(p * outerSize + origin);
+		std::array<float64_t2, 5> points;
+		auto i = 0u;
+		for (const auto& p : diamondPointsCW)
+		{
+			points[i] = p * outerSize + origin;
+			i++;
+		}
 		polyline.addLinePoints(points);
 	}
 	// Inner
 	{
-		std::vector<float64_t2> points;
-		points.reserve(diamondPointsCCW.size());
-		for (const auto& p : diamondPointsCCW) points.push_back(p * innerSize + origin);
+		std::array<float64_t2, 5> points;
+		auto i = 0u;
+		for (const auto& p : diamondPointsCCW)
+		{
+			points[i] = p * innerSize + origin;
+			i++;
+		}	
 		polyline.addLinePoints(points);
 	}
 	polylines.push_back(std::move(polyline));
@@ -915,9 +931,13 @@ void crossHatch(std::vector<CPolyline>& polylines, const float64_t2& offset)
 			float64_t2(0.375, 0.0),
 	};
 	{
-		std::vector<float64_t2> points;
-		points.reserve(outerPointsCW.size());
-		for (const auto& p : outerPointsCW) points.push_back(p * FillPatternShapeExtent + offset);
+		std::array<float64_t2, 9u> points;
+		auto i = 0u;
+		for (const auto& p : outerPointsCW)
+		{
+			points[i] = p * FillPatternShapeExtent + offset;
+			i++;
+		}
 		polyline.addLinePoints(points);
 	}
 
@@ -930,9 +950,13 @@ void crossHatch(std::vector<CPolyline>& polylines, const float64_t2& offset)
 	};
 	{
 		float64_t2 origin = float64_t2(FillPatternShapeExtent/2.0, FillPatternShapeExtent/2.0) + offset;
-		std::vector<float64_t2> points;
-		points.reserve(diamondPointsCCW.size());
-		for (const auto& p : diamondPointsCCW) points.push_back(p * 0.75 * FillPatternShapeExtent + origin);
+		std::array<float64_t2, 5u> points;
+		auto i = 0u;
+		for (const auto& p : diamondPointsCCW)
+		{
+			points[i] = p * 0.75 * FillPatternShapeExtent + origin;
+			i++;
+		}
 		polyline.addLinePoints(points);
 	}
 	polylines.push_back(std::move(polyline));
@@ -948,7 +972,7 @@ void hatch(std::vector<CPolyline>& polylines, const float64_t2& offset)
 	{
 		float64_t2 radiusOffsetTL = float64_t2(+lineDiameter / 2.0, +lineDiameter / 2.0) * FillPatternShapeExtent / 8.0;
 		float64_t2 radiusOffsetBL = float64_t2(-lineDiameter / 2.0, -lineDiameter / 2.0) * FillPatternShapeExtent / 8.0;
-		std::vector<float64_t2> points = {
+		std::array<float64_t2, 5u> points = {
 			basePt0 + radiusOffsetTL,
 			basePt0 + radiusOffsetBL, // 0
 			basePt1 + radiusOffsetBL, // 1
@@ -1052,7 +1076,7 @@ void reverseHatch(std::vector<CPolyline>& polylines, const float64_t2& offset)
 	{
 		float64_t2 radiusOffsetTL = float64_t2(-lineDiameter / 2.0, +lineDiameter / 2.0) * FillPatternShapeExtent / 8.0;
 		float64_t2 radiusOffsetBL = float64_t2(+lineDiameter / 2.0, -lineDiameter / 2.0) * FillPatternShapeExtent / 8.0;
-		std::vector<float64_t2> points = {
+		std::array<float64_t2, 5u> points = {
 			basePt0 + radiusOffsetTL,
 			basePt1 + radiusOffsetTL, // 0
 			basePt1 + radiusOffsetBL, // 1