Skip to content

Commit 9b860cf

Browse files
committed
minor fixes
1 parent feccec6 commit 9b860cf

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

include/nbl/system/CAPKResourcesArchive.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,14 @@ class CAPKResourcesArchive : public IFileArchive
6363

6464
if (filename != nullptr)
6565
{
66-
result.push_back(filename);
66+
if (std::string(asset_path) = "")
67+
{
68+
result.push_back(filename);
69+
}
70+
else
71+
{
72+
result.push_back((std::filesystem::path(asset_path) / filename).generic_string());
73+
}
6774
env->ReleaseStringUTFChars(jstr, filename);
6875
}
6976

include/nbl/ui/IWindowManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ namespace nbl::ui
1919
virtual SDisplayInfo getPrimaryDisplayInfo() const = 0;
2020
private:
2121
virtual void destroyWindow(IWindow* wnd) = 0;
22-
2322
protected:
2423
virtual ~IWindowManager() = default;
2524
};

include/nbl/ui/KeyCodes.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ namespace nbl::ui
124124
EKC_VOLUME_MUTE,
125125
EKC_VOLUME_UP,
126126
EKC_VOLUME_DOWN,
127+
128+
EKC_COUNT,
127129
};
128130

129131
inline char keyCodeToChar(E_KEY_CODE code)
@@ -188,10 +190,11 @@ namespace nbl::ui
188190

189191
enum E_MOUSE_BUTTON : uint8_t
190192
{
191-
EMB_LEFT_BUTTON = 1,
192-
EMB_RIGHT_BUTTON = 2,
193-
EMB_MIDDLE_BUTTON = 4,
194-
EMB_BUTTON_4 = 8,
195-
EMB_BUTTON_5 = 16
193+
EMB_LEFT_BUTTON,
194+
EMB_RIGHT_BUTTON,
195+
EMB_MIDDLE_BUTTON,
196+
EMB_BUTTON_4,
197+
EMB_BUTTON_5,
198+
EMB_COUNT,
196199
};
197200
};

0 commit comments

Comments
 (0)