Updated namespaces in examples

Author: Przemog1

examples_tests/01.HelloWorld/main.cpp

@@ -1,16 +1,16 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
-// This file is part of the "Nabla Engine".
-// For conditions of distribution and use, see copyright notice in nabla.h
-
-#define _NBL_STATIC_LIB_
-#include <irrlicht.h>
+// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
 
-/**
-This example just shows a screen which clears to red,
-nothing fancy, just to show that Irrlicht links fine
+#define _NBL_STATIC_LIB_
+#include <irrlicht.h>
+
+/**
+This example just shows a screen which clears to red,
+nothing fancy, just to show that Irrlicht links fine
 **/
-using namespace irr;
-
+using namespace nbl;
+
 
 /*
 The start of the main function starts like in most other example. We ask the
@@ -19,16 +19,16 @@ user for the desired renderer and start it up.
 int main()
 {
 	// create device with full flexibility over creation parameters
-	// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-	irr::SIrrlichtCreationParameters params;
+	// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; //may have to set to 32bit for some platforms
 	params.ZBufferBits = 24; //we'd like 32bit here
 	params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing
-	params.WindowSize = core::dimension2d<uint32_t>(1280, 720);
-	params.Fullscreen = false;
-	params.Vsync = false;
-	params.Doublebuffer = true;
-	params.Stencilbuffer = false; //! This will not even be a choice soon
+	params.WindowSize = core::dimension2d<uint32_t>(1280, 720);
+	params.Fullscreen = false;
+	params.Vsync = false;
+	params.Doublebuffer = true;
+	params.Stencilbuffer = false; //! This will not even be a choice soon
 	params.AuxGLContexts = 16;
 	auto device = createDeviceEx(params);
 
@@ -38,23 +38,23 @@ int main()
 
 	video::IVideoDriver* driver = device->getVideoDriver();
 	scene::ISceneManager* smgr = device->getSceneManager();
-
+
 
 	uint64_t lastFPSTime = 0;
 
 	while(device->run())
 	if (device->isWindowActive())
 	{
-		driver->beginScene(true, false, video::SColor(255,255,0,0) ); //this gets 11k FPS
+		driver->beginScene(true, false, video::SColor(255,255,0,0) ); //this gets 11k FPS
 
 
 		driver->endScene();
 
 		// display frames per second in window title
 		uint64_t time = device->getTimer()->getRealTime();
 		if (time-lastFPSTime > 1000)
-		{
-		    std::wostringstream str(L"Hello World - Irrlicht Engine [");
+		{
+		    std::wostringstream str(L"Hello World - Irrlicht Engine [");
 		    str.seekp(0,std::ios_base::end);
 			str << driver->getName() << "] FPS:" << driver->getFPS();
 
@@ -64,4 +64,4 @@ int main()
 	}
 
 	return 0;
-}
+}

examples_tests/02.ComputeShader/main.cpp

@@ -4,15 +4,15 @@
 #include "../../source/Irrlicht/COpenGLDriver.h"
 
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 
 
 int main()
 {
 	// create device with full flexibility over creation parameters
-	// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-	irr::SIrrlichtCreationParameters params;
+	// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; //may have to set to 32bit for some platforms
 	params.ZBufferBits = 24; //we'd like 32bit here
 	params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing

examples_tests/03.GPU_Mesh/main.cpp

@@ -13,7 +13,7 @@
 //#include "nbl/ext/ScreenShot/ScreenShot.h"
 
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 
 
@@ -62,8 +62,8 @@ void main()
 int main()
 {
 	// create device with full flexibility over creation parameters
-	// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-	irr::SIrrlichtCreationParameters params;
+	// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; //may have to set to 32bit for some platforms
 	params.ZBufferBits = 24; //we'd like 32bit here
 	params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing

examples_tests/05.NablaTutorialExample/main.cpp

@@ -14,7 +14,7 @@
 	General namespaces. Entire engine consists of those bellow.
 */
 
-using namespace irr;
+using namespace nbl;
 using namespace asset;
 using namespace video;
 using namespace core;
@@ -28,7 +28,7 @@ int main()
 		 Used to create a device.
 	*/
 
-	irr::SIrrlichtCreationParameters params;
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; 
 	params.ZBufferBits = 24;
 	params.DriverType = video::EDT_OPENGL;
@@ -77,7 +77,7 @@ int main()
 	*/
 
 	auto geometryCreator = device->getAssetManager()->getGeometryCreator();
-	auto rectangleGeometry = geometryCreator->createRectangleMesh(irr::core::vector2df_SIMD(1.5, 3));
+	auto rectangleGeometry = geometryCreator->createRectangleMesh(nbl::core::vector2df_SIMD(1.5, 3));
 
 	/*
 		Loading an asset bundle. You can specify some flags 
@@ -293,7 +293,7 @@ int main()
 
 		const auto viewProjection = camera->getConcatenatedMatrix();
 		core::matrix3x4SIMD modelMatrix;
-		modelMatrix.setRotation(irr::core::quaternion(0, 1, 0));
+		modelMatrix.setRotation(nbl::core::quaternion(0, 1, 0));
 
 		auto mv = core::concatenateBFollowedByA(camera->getViewMatrix(), modelMatrix);
 		auto mvp = core::concatenateBFollowedByA(viewProjection, modelMatrix);

examples_tests/06.MeshLoaders/main.cpp

@@ -14,14 +14,14 @@
 //#include "nbl/ext/ScreenShot/ScreenShot.h"
 
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 
 int main()
 {
 	// create device with full flexibility over creation parameters
-	// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-	irr::SIrrlichtCreationParameters params;
+	// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; //may have to set to 32bit for some platforms
 	params.ZBufferBits = 24; //we'd like 32bit here
 	params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing

examples_tests/07.HardwareSkinning/main.cpp

@@ -5,12 +5,12 @@
 #define _IRR_STATIC_LIB_
 #include <irrlicht.h>
 
-#include "irr/ext/ScreenShot/ScreenShot.h"
+#include "nbl/ext/ScreenShot/ScreenShot.h"
 
 #include "../common/QToQuitEventReceiver.h"
 
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 
 
@@ -57,8 +57,8 @@ class SimpleCallBack : public video::IShaderConstantSetCallBack
 int main()
 {
 	// create device with full flexibility over creation parameters
-	// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-	irr::SIrrlichtCreationParameters params;
+	// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; //may have to set to 32bit for some platforms
 	params.ZBufferBits = 24; //we'd like 32bit here
 	params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing

examples_tests/08.HardwareInstancing/main.cpp

@@ -8,7 +8,7 @@
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 #include "../common/QToQuitEventReceiver.h"
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 using namespace asset;
 
@@ -235,8 +235,8 @@ struct CameraData
 int main()
 {
 	// create device with full flexibility over creation parameters
-	// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-	irr::SIrrlichtCreationParameters params;
+	// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24; //may have to set to 32bit for some platforms
 	params.ZBufferBits = 24; //we'd like 32bit here
 	params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing

examples_tests/09.ColorSpaceTest/ApplicationHandler.cpp

@@ -7,7 +7,7 @@
 #include "nbl/ext/FullScreenTriangle/FullScreenTriangle.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 using namespace asset;
 using namespace video;
@@ -38,7 +38,7 @@ void ApplicationHandler::fetchTestingImagePaths()
 	}
 }
 
-void ApplicationHandler::presentImageOnTheScreen(irr::core::smart_refctd_ptr<irr::video::IGPUImageView> gpuImageView, std::string currentHandledImageFileName, std::string currentHandledImageExtension)
+void ApplicationHandler::presentImageOnTheScreen(nbl::core::smart_refctd_ptr<nbl::video::IGPUImageView> gpuImageView, std::string currentHandledImageFileName, std::string currentHandledImageExtension)
 {
 	auto samplerDescriptorSet3 = driver->createGPUDescriptorSet(core::smart_refctd_ptr(gpuDescriptorSetLayout3));
 
@@ -188,7 +188,7 @@ void ApplicationHandler::performImageTest(std::string path)
 
 	if(!tryToWrite(copyImageView->getCreationParameters().image.get()))
 		if(!tryToWrite(copyImageView.get()))
-			os::Printer::log("An unexcepted error occoured while trying to write the asset!", irr::ELL_WARNING);
+			os::Printer::log("An unexcepted error occoured while trying to write the asset!", nbl::ELL_WARNING);
 
 	assetManager->removeCachedGPUObject(asset.get(), gpuImageView);
 	assetManager->removeAssetFromCache(cpuTexture);
@@ -197,7 +197,7 @@ void ApplicationHandler::performImageTest(std::string path)
 
 bool ApplicationHandler::initializeApplication()
 {
-	irr::SIrrlichtCreationParameters params;
+	nbl::SIrrlichtCreationParameters params;
 	params.Bits = 24;
 	params.ZBufferBits = 24; 
 	params.DriverType = video::EDT_OPENGL; 

examples_tests/09.ColorSpaceTest/ApplicationHandler.hpp

@@ -25,27 +25,27 @@ class ApplicationHandler
 
 	private:
 
-		using gpuPipeline = irr::core::smart_refctd_ptr<irr::video::IGPURenderpassIndependentPipeline>;
+		using gpuPipeline = nbl::core::smart_refctd_ptr<nbl::video::IGPURenderpassIndependentPipeline>;
 
 		bool initializeApplication();
 		void fetchTestingImagePaths();
 		void performImageTest(std::string path);
-		void presentImageOnTheScreen(irr::core::smart_refctd_ptr<irr::video::IGPUImageView> gpuImageView, std::string currentHandledImageFileName, std::string currentHandledImageExtension);
+		void presentImageOnTheScreen(nbl::core::smart_refctd_ptr<nbl::video::IGPUImageView> gpuImageView, std::string currentHandledImageFileName, std::string currentHandledImageExtension);
 
 		bool status;
 
-		irr::core::smart_refctd_ptr<irr::IrrlichtDevice> device;
-		irr::video::IVideoDriver* driver;
+		nbl::core::smart_refctd_ptr<nbl::IrrlichtDevice> device;
+		nbl::video::IVideoDriver* driver;
 
-		irr::core::smart_refctd_ptr<irr::video::IGPUMeshBuffer> currentGpuMeshBuffer;
-		irr::core::smart_refctd_ptr<irr::video::IGPUDescriptorSetLayout> gpuDescriptorSetLayout3;
+		nbl::core::smart_refctd_ptr<nbl::video::IGPUMeshBuffer> currentGpuMeshBuffer;
+		nbl::core::smart_refctd_ptr<nbl::video::IGPUDescriptorSetLayout> gpuDescriptorSetLayout3;
 
 		gpuPipeline currentGpuPipelineFor2D;
 		gpuPipeline currentGpuPipelineFor2DArrays;
 		gpuPipeline currentGpuPipelineForCubemaps;
 
-		irr::video::IFrameBuffer* screenShotFrameBuffer;
-		irr::core::vector<std::string> imagePaths;
+		nbl::video::IFrameBuffer* screenShotFrameBuffer;
+		nbl::core::vector<std::string> imagePaths;
 };
 
 #endif // _APPLICATION_HANDLER_

examples_tests/10.AllocatorTest/main.cpp

@@ -3,7 +3,7 @@
 #include <random>
 #include <cmath>
 
-using namespace irr;
+using namespace nbl;
 using namespace core;
 
 #define kNumHardwareInstancesX 10
@@ -22,11 +22,11 @@ class MyEventReceiver : public IEventReceiver
 
 	bool OnEvent(const SEvent& event)
 	{
-		if (event.EventType == irr::EET_KEY_INPUT_EVENT && !event.KeyInput.PressedDown)
+		if (event.EventType == nbl::EET_KEY_INPUT_EVENT && !event.KeyInput.PressedDown)
 		{
 			switch (event.KeyInput.Key)
 			{
-			case irr::KEY_KEY_Q: // switch wire frame mode
+			case nbl::KEY_KEY_Q: // switch wire frame mode
 				exit(0);
 				return true;
 			default:
@@ -330,28 +330,28 @@ int main()
 	{
 		printf("SINGLE THREADED======================================================\n");
 		printf("Linear \n");
-		irr::core::address_allocator_traits<core::LinearAddressAllocatorST<uint32_t> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::LinearAddressAllocatorST<uint32_t> >::printDebugInfo();
 		printf("Stack \n");
-		irr::core::address_allocator_traits<core::StackAddressAllocatorST<uint32_t> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::StackAddressAllocatorST<uint32_t> >::printDebugInfo();
 		printf("Pool \n");
-		irr::core::address_allocator_traits<core::PoolAddressAllocatorST<uint32_t> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::PoolAddressAllocatorST<uint32_t> >::printDebugInfo();
 		printf("General \n");
-		irr::core::address_allocator_traits<core::GeneralpurposeAddressAllocatorST<uint32_t> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::GeneralpurposeAddressAllocatorST<uint32_t> >::printDebugInfo();
 
 		printf("MULTI THREADED=======================================================\n");
 		printf("Linear \n");
-		irr::core::address_allocator_traits<core::LinearAddressAllocatorMT<uint32_t, std::recursive_mutex> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::LinearAddressAllocatorMT<uint32_t, std::recursive_mutex> >::printDebugInfo();
 		printf("Pool \n");
-		irr::core::address_allocator_traits<core::PoolAddressAllocatorMT<uint32_t, std::recursive_mutex> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::PoolAddressAllocatorMT<uint32_t, std::recursive_mutex> >::printDebugInfo();
 		printf("General \n");
-		irr::core::address_allocator_traits<core::GeneralpurposeAddressAllocatorMT<uint32_t, std::recursive_mutex> >::printDebugInfo();
+		nbl::core::address_allocator_traits<core::GeneralpurposeAddressAllocatorMT<uint32_t, std::recursive_mutex> >::printDebugInfo();
 	}
 
 	// Alloc pref test
 	{
 		// create device with full flexibility over creation parameters
-		// you can add more parameters if desired, check irr::SIrrlichtCreationParameters
-		irr::SIrrlichtCreationParameters params;
+		// you can add more parameters if desired, check nbl::SIrrlichtCreationParameters
+		nbl::SIrrlichtCreationParameters params;
 		params.Bits = 24; //may have to set to 32bit for some platforms
 		params.ZBufferBits = 24; //we'd like 32bit here
 		params.DriverType = video::EDT_OPENGL; //! Only Well functioning driver, software renderer left for sake of 2D image drawing