Skip to content

Commit 846d2fd

Browse files
author
devsh
committed
prep UI example for further work
1 parent 9aa7483 commit 846d2fd

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

61_UI/include/common.hpp

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
1-
#ifndef __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
2-
#define __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
1+
#ifndef _NBL_THIS_EXAMPLE_COMMON_H_INCLUDED_
2+
#define _NBL_THIS_EXAMPLE_COMMON_H_INCLUDED_
33

4-
#include <nabla.h>
54

6-
// common api
7-
#include "CCamera.hpp"
8-
#include "SimpleWindowedApplication.hpp"
9-
#include "CEventCallback.hpp"
5+
#include "nbl/examples/examples.hpp"
106

117
// the example's headers
128
#include "transform.hpp"
13-
#include "CGeomtryCreatorScene.hpp"
149

1510
using namespace nbl;
16-
using namespace core;
17-
using namespace hlsl;
18-
using namespace system;
19-
using namespace asset;
20-
using namespace ui;
21-
using namespace video;
22-
using namespace scene;
23-
using namespace geometrycreator;
11+
using namespace nbl::core;
12+
using namespace nbl::hlsl;
13+
using namespace nbl::system;
14+
using namespace nbl::asset;
15+
using namespace nbl::ui;
16+
using namespace nbl::video;
17+
using namespace nbl::examples;
2418

25-
#endif // __NBL_THIS_EXAMPLE_COMMON_H_INCLUDED__
19+
#endif // _NBL_THIS_EXAMPLE_COMMON_H_INCLUDED_

61_UI/main.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
handle scene's object translations.
1515
*/
1616

17-
class UISampleApp final : public examples::SimpleWindowedApplication
17+
class UISampleApp final : public SimpleWindowedApplication
1818
{
19-
using device_base_t = examples::SimpleWindowedApplication;
20-
using clock_t = std::chrono::steady_clock;
19+
using device_base_t = SimpleWindowedApplication;
2120

22-
_NBL_STATIC_INLINE_CONSTEXPR uint32_t WIN_W = 1280, WIN_H = 720;
23-
24-
constexpr static inline clock_t::duration DisplayImageDuration = std::chrono::milliseconds(900);
21+
_NBL_STATIC_INLINE_CONSTEXPR uint32_t WIN_W = 1280, WIN_H = 720;
2522

2623
public:
2724
inline UISampleApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
@@ -63,7 +60,6 @@ class UISampleApp final : public examples::SimpleWindowedApplication
6360
return false;
6461

6562
m_assetManager = make_smart_refctd_ptr<nbl::asset::IAssetManager>(smart_refctd_ptr(m_system));
66-
auto* geometry = m_assetManager->getGeometryCreator();
6763

6864
m_semaphore = m_device->createSemaphore(m_realFrameIx);
6965
if (!m_semaphore)

0 commit comments

Comments
 (0)