Skip to content

Commit c7c5f96

Browse files
Erfan-AhmadiErfan-Ahmadi
committed
moved application bases to include/application_templates
1 parent 1a502ba commit c7c5f96

File tree

19 files changed

+56
-739
lines changed

19 files changed

+56
-739
lines changed

‎02_HelloCompute/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "../common/MonoSystemMonoLoggerApplication.hpp"
7+
#include "nbl/application_templates/MonoSystemMonoLoggerApplication.hpp"
88

99
using namespace nbl;
1010
using namespace core;
@@ -14,9 +14,9 @@ using namespace video;
1414

1515

1616
// this time instead of defining our own `int main()` we derive from `nbl::system::IApplicationFramework` to play "nice" wil all platforms
17-
class HelloComputeApp final : public nbl::examples::MonoSystemMonoLoggerApplication
17+
class HelloComputeApp final : public nbl::application_templates::MonoSystemMonoLoggerApplication
1818
{
19-
using base_t = examples::MonoSystemMonoLoggerApplication;
19+
using base_t = application_templates::MonoSystemMonoLoggerApplication;
2020
public:
2121
// Generally speaking because certain platforms delay initialization from main object construction you should just forward and not do anything in the ctor
2222
using base_t::base_t;

‎03_DeviceSelectionAndSharedSources/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "../common/MonoDeviceApplication.hpp"
8-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
7+
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
99

1010
using namespace nbl;
1111
using namespace core;
@@ -19,10 +19,10 @@ using namespace video;
1919

2020

2121
// This time we create the device in the base class and also use a base class to give us an Asset Manager and an already mounted built-in resource archive
22-
class DeviceSelectionAndSharedSourcesApp final : public examples::MonoDeviceApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
22+
class DeviceSelectionAndSharedSourcesApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
2323
{
24-
using device_base_t = examples::MonoDeviceApplication;
25-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
24+
using device_base_t = application_templates::MonoDeviceApplication;
25+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
2626
public:
2727
// Yay thanks to multiple inheritance we cannot forward ctors anymore
2828
DeviceSelectionAndSharedSourcesApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD) :

‎04_HelloUI/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

55
// always include nabla first before std:: headers
6-
#include "../common/MonoSystemMonoLoggerApplication.hpp"
6+
#include "nbl/application_templates/MonoSystemMonoLoggerApplication.hpp"
77

88
#include "nbl/ui/ICursorControl.h"
99

@@ -16,9 +16,9 @@ using namespace ui;
1616
class WindowEventDemoCallback;
1717

1818
// This example is Desktop only, because just how the system creation gets weird on other platforms the window creation is similar
19-
class HelloUIApp final : public examples::MonoSystemMonoLoggerApplication
19+
class HelloUIApp final : public application_templates::MonoSystemMonoLoggerApplication
2020
{
21-
using base_t = examples::MonoSystemMonoLoggerApplication;
21+
using base_t = application_templates::MonoSystemMonoLoggerApplication;
2222
using clock_t = std::chrono::steady_clock;
2323

2424
public:

‎05_StreamingAndBufferDeviceAddressApp/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "../common/MonoDeviceApplication.hpp"
8-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
7+
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
99

1010

1111
using namespace nbl;
@@ -20,10 +20,10 @@ using namespace video;
2020

2121

2222
// In this application we'll cover buffer streaming, Buffer Device Address (BDA) and push constants
23-
class StreamingAndBufferDeviceAddressApp final : public examples::MonoDeviceApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
23+
class StreamingAndBufferDeviceAddressApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
2424
{
25-
using device_base_t = examples::MonoDeviceApplication;
26-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
25+
using device_base_t = application_templates::MonoDeviceApplication;
26+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
2727

2828
// This is the first example that submits multiple workloads in-flight.
2929
// What the shader does is it computes the minimum distance of each point against K other random input points.

‎06_HelloGraphicsQueue/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "../common/MonoDeviceApplication.hpp"
8-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
7+
#include "nbl/application_templates/MonoDeviceApplication.hpp"
8+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
99

1010
#include "nbl/ext/ScreenShot/ScreenShot.h"
1111

@@ -26,10 +26,10 @@ using namespace video;
2626
// - save the smallImg to disk
2727
//
2828
// all without using IUtilities.
29-
class HelloGraphicsQueueApp final : public examples::MonoDeviceApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
29+
class HelloGraphicsQueueApp final : public application_templates::MonoDeviceApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
3030
{
31-
using device_base_t = examples::MonoDeviceApplication;
32-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
31+
using device_base_t = application_templates::MonoDeviceApplication;
32+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
3333

3434
public:
3535
// Yay thanks to multiple inheritance we cannot forward ctors anymore.

‎07_StagingAndMultipleQueues/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "../common/BasicMultiQueueApplication.hpp"
8-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
7+
#include "nbl/application_templates/BasicMultiQueueApplication.hpp"
8+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
99

1010
using namespace nbl;
1111
using namespace core;
@@ -18,10 +18,10 @@ using namespace video;
1818

1919

2020
// This time we let the new base class score and pick queue families, as well as initialize `nbl::video::IUtilities` for us
21-
class StagingAndMultipleQueuesApp final : public examples::BasicMultiQueueApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
21+
class StagingAndMultipleQueuesApp final : public application_templates::BasicMultiQueueApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
2222
{
23-
using device_base_t = examples::BasicMultiQueueApplication;
24-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
23+
using device_base_t = application_templates::BasicMultiQueueApplication;
24+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
2525

2626
public:
2727
// Yay thanks to multiple inheritance we cannot forward ctors anymore

‎20_AllocatorTest/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (C) 2018-2023 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4-
#include "../common/MonoSystemMonoLoggerApplication.hpp"
4+
#include "nbl/application_templates/MonoSystemMonoLoggerApplication.hpp"
55

66
using namespace nbl;
77
using namespace core;
@@ -296,9 +296,9 @@ void AllocatorHandler<core::LinearAddressAllocator<uint32_t>>::randFreeAllocated
296296
}
297297

298298

299-
class AllocatorTestApp final : public nbl::examples::MonoSystemMonoLoggerApplication
299+
class AllocatorTestApp final : public nbl::application_templates::MonoSystemMonoLoggerApplication
300300
{
301-
using base_t = examples::MonoSystemMonoLoggerApplication;
301+
using base_t = application_templates::MonoSystemMonoLoggerApplication;
302302
public:
303303
using base_t::base_t;
304304

‎21_LRUCacheUnitTest/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
// I've moved out a tiny part of this example into a shared header for reuse, please open and read it.
7-
#include "../common/MonoSystemMonoLoggerApplication.hpp"
7+
#include "nbl/application_templates/MonoSystemMonoLoggerApplication.hpp"
88

99
using namespace nbl;
1010
using namespace core;
@@ -13,9 +13,9 @@ using namespace asset;
1313
using namespace video;
1414

1515

16-
class LRUCacheTestApp final : public nbl::examples::MonoSystemMonoLoggerApplication
16+
class LRUCacheTestApp final : public nbl::application_templates::MonoSystemMonoLoggerApplication
1717
{
18-
using base_t = examples::MonoSystemMonoLoggerApplication;
18+
using base_t = application_templates::MonoSystemMonoLoggerApplication;
1919
public:
2020
using base_t::base_t;
2121

‎22_CppCompat/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ using namespace glm;
2929

3030
#include <nbl/builtin/hlsl/limits.hlsl>
3131

32-
#include "../common/MonoDeviceApplication.hpp"
33-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
32+
#include "nbl/application_templates/MonoDeviceApplication.hpp"
33+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
3434

3535

3636
using namespace nbl;
@@ -60,10 +60,10 @@ struct T
6060
float32_t4 h;
6161
};
6262

63-
class CompatibilityTest final : public nbl::examples::MonoDeviceApplication, public nbl::examples::MonoAssetManagerAndBuiltinResourceApplication
63+
class CompatibilityTest final : public nbl::application_templates::MonoDeviceApplication, public nbl::application_templates::MonoAssetManagerAndBuiltinResourceApplication
6464
{
65-
using device_base_t = examples::MonoDeviceApplication;
66-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
65+
using device_base_t = application_templates::MonoDeviceApplication;
66+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
6767
public:
6868
CompatibilityTest(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD) :
6969
system::IApplicationFramework(_localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}

‎23_ArithmeticUnitTest/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include "../common/BasicMultiQueueApplication.hpp"
2-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
1+
#include "nbl/application_templates/BasicMultiQueueApplication.hpp"
2+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
33
#include "app_resources/common.hlsl"
44

55
using namespace nbl;
@@ -45,10 +45,10 @@ struct emulatedScanExclusive
4545
static inline constexpr const char* name = "exclusive_scan";
4646
};
4747

48-
class ArithmeticUnitTestApp final : public examples::BasicMultiQueueApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
48+
class ArithmeticUnitTestApp final : public application_templates::BasicMultiQueueApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
4949
{
50-
using device_base_t = examples::BasicMultiQueueApplication;
51-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
50+
using device_base_t = application_templates::BasicMultiQueueApplication;
51+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
5252

5353
public:
5454
ArithmeticUnitTestApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD) :

‎24_ColorSpaceTest/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (C) 2018-2024 - DevSH Graphics Programming Sp. z O.O.
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
4-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
4+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
55
#include "../common/SimpleWindowedApplication.hpp"
66

77
//
@@ -17,10 +17,10 @@ using namespace ui;
1717
using namespace video;
1818

1919

20-
class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
20+
class ColorSpaceTestSampleApp final : public examples::SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
2121
{
2222
using device_base_t = examples::SimpleWindowedApplication;
23-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
23+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
2424
using clock_t = std::chrono::steady_clock;
2525

2626
constexpr static inline clock_t::duration DisplayImageDuration = std::chrono::milliseconds(900);

‎25_FilterTest/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

5-
#include "../common/MonoDeviceApplication.hpp"
5+
#include "nbl/application_templates/MonoDeviceApplication.hpp"
66

77
// TODO: these should come from <nabla.h> and nbl/asset/asset.h find out why they don't
88
#include "nbl/asset/filters/CRegionBlockFunctorFilter.h"
@@ -51,9 +51,9 @@ static inline video::IGPUImageView::E_TYPE getImageViewTypeFromImageType_GPU(con
5151
}
5252

5353
// TODO: inherit from BasicMultiQueue app
54-
class BlitFilterTestApp final : public virtual examples::MonoDeviceApplication
54+
class BlitFilterTestApp final : public virtual application_templates::MonoDeviceApplication
5555
{
56-
using base_t = nbl::examples::MonoDeviceApplication;
56+
using base_t = nbl::application_templates::MonoDeviceApplication;
5757

5858
constexpr static uint32_t SC_IMG_COUNT = 3u;
5959

‎38_EXRSplit/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
// This file is part of the "Nabla Engine".
33
// For conditions of distribution and use, see copyright notice in nabla.h
44

5-
#include "../common/MonoSystemMonoLoggerApplication.hpp"
5+
#include "nbl/application_templates/MonoSystemMonoLoggerApplication.hpp"
66

77
using namespace nbl;
88
using namespace core;
99
using namespace asset;
1010
using namespace system;
1111

1212
// instead of defining our own `int main()` we derive from `nbl::system::IApplicationFramework` to play "nice" wil all platofmrs
13-
class HelloComputeApp final : public nbl::examples::MonoSystemMonoLoggerApplication
13+
class HelloComputeApp final : public nbl::application_templates::MonoSystemMonoLoggerApplication
1414
{
15-
using base_t = examples::MonoSystemMonoLoggerApplication;
15+
using base_t = application_templates::MonoSystemMonoLoggerApplication;
1616
public:
1717
using base_t::base_t;
1818

‎62_CAD/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
#include "../common/MonoAssetManagerAndBuiltinResourceApplication.hpp"
3+
#include "nbl/application_templates/MonoAssetManagerAndBuiltinResourceApplication.hpp"
44
#include "../common/SimpleWindowedApplication.hpp"
55
#include "../common/InputSystem.hpp"
66
#include "nbl/video/utilities/CSimpleResizeSurface.h"
@@ -245,10 +245,10 @@ class CSwapchainResources : public ISimpleManagedSurface::ISwapchainResources
245245
std::array<core::smart_refctd_ptr<IGPUFramebuffer>,ISwapchain::MaxImages> m_framebuffers;
246246
};
247247

248-
class ComputerAidedDesign final : public examples::SimpleWindowedApplication, public examples::MonoAssetManagerAndBuiltinResourceApplication
248+
class ComputerAidedDesign final : public examples::SimpleWindowedApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
249249
{
250250
using device_base_t = examples::SimpleWindowedApplication;
251-
using asset_base_t = examples::MonoAssetManagerAndBuiltinResourceApplication;
251+
using asset_base_t = application_templates::MonoAssetManagerAndBuiltinResourceApplication;
252252
using clock_t = std::chrono::steady_clock;
253253

254254
constexpr static uint32_t WindowWidthRequest = 1600u;

0 commit comments

Comments
 (0)