move CCamera.hpp, InputSystem.hpp, SBasicViewParameters.hlsl and Simp…

…leWindowedApplication.hpp to `common/include`, remove `common/include/nbl/api/*` (let's just put all headers which are not libraries into top of the common include search directory). Turn 61_UI/include/nbl/this_example/callback.hpp into CEventCallback.hpp - also put into `common/include`. Update all `#include` references in all examples
Devsh-Graphics-Programming · Aug 24, 2024 · 0f67b74 · 0f67b74
1 parent 63ae37f
commit 0f67b74
Show file tree

Hide file tree

Showing 35 changed files with 42 additions and 42 deletions.
diff --git a/06_MeshLoaders/main.cpp b/06_MeshLoaders/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/08_HelloSwapchain/main.cpp b/08_HelloSwapchain/main.cpp
@@ -1,7 +1,7 @@
 // Copyright (C) 2018-2024 - 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
-#include "../common/SimpleWindowedApplication.hpp"
+#include "SimpleWindowedApplication.hpp"
 
 //
 #include "nbl/video/surface/CSurfaceVulkan.h"

diff --git a/09_DepthBufferAndCamera/main.cpp b/09_DepthBufferAndCamera/main.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
-#include "../common/SimpleWindowedApplication.hpp"
+#include "SimpleWindowedApplication.hpp"
 
 // TODO: move back to Nabla
 #include "CAssetConverter.h"

diff --git a/0_ImportanceSamplingEnvMaps/main.cpp b/0_ImportanceSamplingEnvMaps/main.cpp
@@ -6,7 +6,7 @@
 #include <nabla.h>
 #include "nbl/ext/FullScreenTriangle/FullScreenTriangle.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 using namespace nbl;

diff --git a/24_ColorSpaceTest/main.cpp b/24_ColorSpaceTest/main.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
-#include "../common/SimpleWindowedApplication.hpp"
+#include "SimpleWindowedApplication.hpp"
 
 #include "nbl/video/surface/CSurfaceVulkan.h"
 #include "nbl/ext/FullScreenTriangle/FullScreenTriangle.h"

diff --git a/27_PLYSTLDemo/main.cpp b/27_PLYSTLDemo/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/35_GeometryCreator/main.cpp b/35_GeometryCreator/main.cpp
@@ -6,11 +6,11 @@
 #include "nbl/asset/utils/CGeometryCreator.h"
 #include "nbl/video/utilities/CSimpleResizeSurface.h"
 
-#include "../common/SimpleWindowedApplication.hpp"
-#include "../common/InputSystem.hpp"
+#include "SimpleWindowedApplication.hpp"
+#include "InputSystem.hpp"
 
-#include "nbl/api/CCamera.hpp"
-#include "nbl/api/hlsl/SBasicViewParameters.hlsl"
+#include "CCamera.hpp"
+#include "SBasicViewParameters.hlsl"
 
 #include "geometry/creator/spirv/builtin/CArchive.h"
 #include "geometry/creator/spirv/builtin/builtinResources.h"

diff --git a/42_FragmentShaderPathTracer/main.cpp b/42_FragmentShaderPathTracer/main.cpp
@@ -6,7 +6,7 @@
 #include <nabla.h>
 
 #include "../common/CommonAPI.h"
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 #include "nbl/video/utilities/CDumbPresentationOracle.h"
 

diff --git a/45_BRDFEvalTest/main.cpp b/45_BRDFEvalTest/main.cpp
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #ifdef NBL_EMBED_BUILTIN_RESOURCES
 #include "example_data/builtin/CArchive.h"

diff --git a/53_ComputeShaders/main.cpp b/53_ComputeShaders/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/54_Transformations/main.cpp b/54_Transformations/main.cpp
@@ -5,7 +5,7 @@
 #define _NBL_STATIC_LIB_
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 using namespace nbl;

diff --git a/56_RayQuery/main.cpp b/56_RayQuery/main.cpp
@@ -7,7 +7,7 @@
 #include <nabla.h>
 
 #include "../common/CommonAPI.h"
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 #include "nbl/video/utilities/CDumbPresentationOracle.h"
 

diff --git a/61_UI/include/nbl/this_example/common.hpp b/61_UI/include/nbl/this_example/common.hpp
@@ -2,15 +2,14 @@
 #define __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
 
 #include <nabla.h>
-#include "nbl/api/CCamera.hpp"
 
-// TODO: should be in new common api
-#include "../common/SimpleWindowedApplication.hpp"
-#include "../common/InputSystem.hpp"
+// common api
+#include "CCamera.hpp"
+#include "SimpleWindowedApplication.hpp"
+#include "CEventCallback.hpp"
 
-#include "nbl/this_example/callback.hpp"
+// example's own headers
 #include "nbl/this_example/transform.hpp"
-
 #include "nbl/this_example/renderpass/scene.hpp"
 //#include "nbl/this_example/renderpass/ui.hpp"
 

diff --git a/61_UI/include/nbl/this_example/renderpass/scene.hpp b/61_UI/include/nbl/this_example/renderpass/scene.hpp
@@ -4,7 +4,7 @@
 #include <nabla.h>
 
 #include "nbl/asset/utils/CGeometryCreator.h"
-#include "nbl/api/hlsl/SBasicViewParameters.hlsl"
+#include "SBasicViewParameters.hlsl"
 #include "geometry/creator/spirv/builtin/CArchive.h"
 #include "geometry/creator/spirv/builtin/builtinResources.h"
 

diff --git a/62_CAD/main.cpp b/62_CAD/main.cpp
@@ -9,8 +9,8 @@ using namespace video;
 
 
 #include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
-#include "../common/SimpleWindowedApplication.hpp"
-#include "../common/InputSystem.hpp"
+#include "SimpleWindowedApplication.hpp"
+#include "InputSystem.hpp"
 #include "nbl/video/utilities/CSimpleResizeSurface.h"
 
 #include "nbl/ext/FullScreenTriangle/FullScreenTriangle.h"

diff --git a/62_SchusslerTest/main.cpp b/62_SchusslerTest/main.cpp
@@ -8,7 +8,7 @@
 #include <nabla.h>
 
 #include "nbl/asset/utils/CGeometryCreator.h"
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 using namespace nbl;

diff --git a/common/include/nbl/api/CCamera.hpp → common/include/CCamera.hpp b/common/include/nbl/api/CCamera.hpp → common/include/CCamera.hpp
diff --git a/61_UI/include/nbl/this_example/callback.hpp → common/include/CEventCallback.hpp b/61_UI/include/nbl/this_example/callback.hpp → common/include/CEventCallback.hpp
@@ -1,7 +1,8 @@
-#ifndef __NBL_THIS_EXAMPLE_CALLBACK_H_INCLUDED__
-#define __NBL_THIS_EXAMPLE_CALLBACK_H_INCLUDED__
+#ifndef __NBL_C_EVENT_CALLBACK_HPP_INCLUDED__
+#define __NBL_C_EVENT_CALLBACK_HPP_INCLUDED__
 
 #include "nbl/video/utilities/CSimpleResizeSurface.h"
+#include "InputSystem.hpp"
 
 class CEventCallback : public nbl::video::ISimpleManagedSurface::ICallback
 {
@@ -45,4 +46,4 @@ class CEventCallback : public nbl::video::ISimpleManagedSurface::ICallback
 	nbl::system::logger_opt_smart_ptr m_logger = nullptr;
 };
 
-#endif // __NBL_THIS_EXAMPLE_CALLBACK_H_INCLUDED__
+#endif // __NBL_C_EVENT_CALLBACK_HPP_INCLUDED__
diff --git a/common/InputSystem.hpp → common/include/InputSystem.hpp b/common/InputSystem.hpp → common/include/InputSystem.hpp
diff --git a/...de/nbl/api/hlsl/SBasicViewParameters.hlsl → common/include/SBasicViewParameters.hlsl b/...de/nbl/api/hlsl/SBasicViewParameters.hlsl → common/include/SBasicViewParameters.hlsl
diff --git a/common/SimpleWindowedApplication.hpp → common/include/SimpleWindowedApplication.hpp b/common/SimpleWindowedApplication.hpp → common/include/SimpleWindowedApplication.hpp
diff --git a/common/src/geometry/creator/shaders/template/gc.common.hlsl b/common/src/geometry/creator/shaders/template/gc.common.hlsl
@@ -9,7 +9,7 @@
 	};
 #endif // __HLSL_VERSION
 
-#include "nbl/api/hlsl/SBasicViewParameters.hlsl"
+#include "SBasicViewParameters.hlsl"
 
 #endif // _THIS_EXAMPLE_GC_COMMON_HLSL_
 

diff --git a/common/src/geometry/creator/shaders/template/grid.common.hlsl b/common/src/geometry/creator/shaders/template/grid.common.hlsl
@@ -31,7 +31,7 @@
     }
 #endif // __HLSL_VERSION
 
-#include "nbl/api/hlsl/SBasicViewParameters.hlsl"
+#include "SBasicViewParameters.hlsl"
 
 #endif // _THIS_EXAMPLE_GRID_COMMON_HLSL_
 

diff --git a/old_to_refactor/03_GPU_Mesh/main.cpp b/old_to_refactor/03_GPU_Mesh/main.cpp
@@ -1,5 +1,5 @@
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 
 
 #include "nbl/nblpack.h"

diff --git a/old_to_refactor/05_NablaTutorialExample/main.cpp b/old_to_refactor/05_NablaTutorialExample/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 /*

diff --git a/old_to_refactor/07.SubpassBaking/main.cpp b/old_to_refactor/07.SubpassBaking/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/old_to_refactor/07_SubpassBaking/main.cpp b/old_to_refactor/07_SubpassBaking/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/old_to_refactor/11_LoDSystem/main.cpp b/old_to_refactor/11_LoDSystem/main.cpp
@@ -5,7 +5,7 @@
 #define _NBL_STATIC_LIB_
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/old_to_refactor/12_glTF/main.cpp b/old_to_refactor/12_glTF/main.cpp
@@ -9,7 +9,7 @@
 #include <cstdio>
 #include <random>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 

diff --git a/old_to_refactor/16_OrderIndependentTransparency/main.cpp b/old_to_refactor/16_OrderIndependentTransparency/main.cpp
@@ -7,7 +7,7 @@
 #include <cstdio>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 #include "nbl/ext/OIT/OIT.h"

diff --git a/old_to_refactor/17_SimpleBulletIntegration/main.cpp b/old_to_refactor/17_SimpleBulletIntegration/main.cpp
@@ -6,7 +6,7 @@
 #include <nabla.h>
 
 #include "../common/CommonAPI.h"
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 
 #include <btBulletDynamicsCommon.h>
 #include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"

diff --git a/old_to_refactor/18_MitsubaLoader/main.cpp b/old_to_refactor/18_MitsubaLoader/main.cpp
@@ -7,7 +7,7 @@
 
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 #include "../3rdparty/portable-file-dialogs/portable-file-dialogs.h"

diff --git a/old_to_refactor/20_Megatexture/main.cpp b/old_to_refactor/20_Megatexture/main.cpp
@@ -8,7 +8,7 @@
 #include <nbl/video/utilities/IGPUVirtualTexture.h>
 #include <nabla.h>
 
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 using namespace nbl;

diff --git a/old_to_refactor/21_DynamicTextureIndexing/main.cpp b/old_to_refactor/21_DynamicTextureIndexing/main.cpp
@@ -6,7 +6,7 @@
 #include <nabla.h>
 
 //! I advise to check out this file, its a basic input handler
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "../common/CommonAPI.h"
 
 #include "nbl/asset/utils/CCPUMeshPackerV1.h"

diff --git a/old_to_refactor/60.ClusteredRendering/main.cpp b/old_to_refactor/60.ClusteredRendering/main.cpp
@@ -2,7 +2,7 @@
 #include <nabla.h>
 
 #include "../common/CommonAPI.h"
-#include "nbl/api/CCamera.hpp"
+#include "CCamera.hpp"
 #include "nbl/ext/ScreenShot/ScreenShot.h"
 #include "nbl/ui/ICursorControl.h"