Fixed Example 43.SumAndCDFFilters + added extra validation for filter

+ Added axesToSum
+ Example 43 to use new IApplicationFramework predefined paths

Author: Erfan-Ahmadi

examples_tests/43.SumAndCDFFilters/main.cpp

@@ -207,6 +207,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
 				state.inMipLevel = MIPMAP_IMAGE;
 				state.outMipLevel = MIPMAP_IMAGE;
 				#endif // IMAGE_VIEW
+				state.axesToSum = (1 << 2) | (1 << 1) | (1 << 0); // ZYX
 
 				if (!sumFilter.execute(core::execution::par_unseq,&state))
 					logger->log("Something went wrong while performing sum operation!", nbl::system::ILogger::ELL_WARNING);
@@ -215,17 +216,19 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
 			}
 			return newSumImage;
 		};
-
-		IAssetLoader::SAssetLoadParams lp(0ull, nullptr, IAssetLoader::ECF_DONT_CACHE_REFERENCES);
-
+		
+        asset::IAssetLoader::SAssetLoadParams loadParams;
+        loadParams.logger = logger.get();
+		
 		#ifdef IMAGE_VIEW
-		auto bundle = assetManager->getAsset("../../media/GLI/earth-cubemap3.dds", lp);
-		auto cpuImageViewFetched = core::smart_refctd_ptr_static_cast<asset::ICPUImageView>(bundle.getContents().begin()[0]);
-
+		auto imgPath = sharedInputCWD / "GLI/earth-cubemap3.dds";
+		auto bundle = assetManager->getAsset(imgPath.string(), loadParams);
+		auto cpuImageViewFetched = core::smart_refctd_ptr_static_cast<asset::ICPUImageView>(bundle.getContents()[0]);
 		auto cpuImage = getSummedImage(cpuImageViewFetched->getCreationParameters().image);
 		#else
-		auto bundle = assetManager->getAsset("../../media/colorexr.exr", lp);
-		auto cpuImage = getSummedImage(core::smart_refctd_ptr_static_cast<asset::ICPUImage>(bundle.getContents().begin()[0]));
+		auto imgPath = sharedInputCWD / "colorexr.exr";
+		auto bundle = assetManager->getAsset(imgPath.string(), loadParams);
+		auto cpuImage = getSummedImage(core::smart_refctd_ptr_static_cast<asset::ICPUImage>(bundle.getContents()[0]));
 		#endif // IMAGE_VIEW
 
 		ICPUImageView::SCreationParams viewParams;
@@ -262,16 +265,20 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
 			();
 
 			asset::IAssetWriter::SAssetWriteParams wparams(cpuImageView.get());
+			wparams.logger = logger.get();
+
 			#ifdef IMAGE_VIEW
-			assetManager->writeAsset(outputFileName = std::string(MODE.data()) + "IMG_VIEW.dds", wparams);
+			outputFileName = std::string(MODE.data()) + "IMG_VIEW.dds";
 			#else
 				#ifdef OVERLAPPING_REGIONS
-				assetManager->writeAsset(outputFileName = std::string(MODE.data()) + "IMG_OVERLAPPING_REGIONS.exr", wparams);
+				outputFileName = std::string(MODE.data()) + "IMG_OVERLAPPING_REGIONS.exr";
 				#else 
-				assetManager->writeAsset(outputFileName = std::string(MODE.data()) + "IMG.exr", wparams);
+				outputFileName = std::string(MODE.data()) + "IMG.exr";
 				#endif // OVERLAPPING_REGIONS
 			#endif // IMAGE_VIEW
-
+			
+			auto outputFilePath = localOutputCWD / outputFileName;
+			assetManager->writeAsset(outputFilePath.string(), wparams);
 			return outputFileName;
 		};
 
@@ -320,8 +327,9 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
 		{
 			const std::string satFileName = writeSATandGetItsOutputName();
 			const std::string convolutedSatFileName = "CONVOLUTED_" + satFileName;
+			const auto convolutedSatFilePath = localOutputCWD / convolutedSatFileName;
 
-			auto bundle = assetManager->getAsset(satFileName, lp);
+			auto bundle = assetManager->getAsset(satFileName, loadParams);
 			#ifdef IMAGE_VIEW
 			auto cpuImageViewFetched = core::smart_refctd_ptr_static_cast<asset::ICPUImageView>(bundle.getContents().begin()[0]);
 			auto cpuImage = getDisConvolutedImage(cpuImageViewFetched->getCreationParameters().image);
@@ -337,7 +345,7 @@ class SumAndCDFFilterSampleApp : public NonGraphicalApplicationBase
 			assert(cpuImageView.get(), "The imageView didn't pass creation validation!");
 
 			asset::IAssetWriter::SAssetWriteParams wparams(cpuImageView.get());
-			assetManager->writeAsset(convolutedSatFileName, wparams);
+			assetManager->writeAsset(convolutedSatFilePath.string(), wparams);
 		}
 	}
 

include/nbl/asset/filters/CSummedAreaTableImageFilter.h

@@ -30,7 +30,7 @@ class CSummedAreaTableImageFilterBase
 				uint8_t*	scratchMemory = nullptr;										//!< memory covering all regions used for temporary filling within computation of sum values
 				size_t	scratchMemoryByteSize = {};											//!< required byte size for entire scratch memory
 				bool normalizeImageByTotalSATValues = false;								//!< after sum performation division will be performed for the entire image by the max sum values in (maxX, 0, z) depending on input image - needed for UNORM and SNORM
-				uint8_t axesToSum = 0u;														//!< which axes you want to sum; X: bit0, Y: bit1, Z: bit2
+				uint8_t axesToSum = 0u;														//!< which axes you want to sum; X: bit0, Y: bit1, Z: bit2 // TODO: make ALL_AXES the default and make sure examples using it work as expected.
 
 				static inline size_t getRequiredScratchByteSize(const ICPUImage* inputImage, asset::VkExtent3D extent)
 				{
@@ -96,13 +96,16 @@ class CSummedAreaTableImageFilter : public CMatchedSizeInOutImageFilterCommon, p
 
 			if (state->scratchMemoryByteSize < state_type::getRequiredScratchByteSize(state->inImage, state->extent))
 				return false;
+			
+			if (state->axesToSum == 0u)
+				return false;
 
 			if (asset::getFormatChannelCount(outFormat) != asset::getFormatChannelCount(inFormat))
 				return false;
 
 			if (asset::getFormatClass(inFormat) > asset::getFormatClass(outFormat)) // TODO in future! Change to a function checking a bit-depth for an each single channel
 				return false;
-
+			
 			return true;
 		}