File tree Expand file tree Collapse file tree 3 files changed +16
-7
lines changed Expand file tree Collapse file tree 3 files changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,14 @@ class CAPKResourcesArchive : public IFileArchive
63
63
64
64
if (filename != nullptr )
65
65
{
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
+ }
67
74
env->ReleaseStringUTFChars (jstr, filename);
68
75
}
69
76
Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ namespace nbl::ui
19
19
virtual SDisplayInfo getPrimaryDisplayInfo () const = 0;
20
20
private:
21
21
virtual void destroyWindow (IWindow* wnd) = 0;
22
-
23
22
protected:
24
23
virtual ~IWindowManager () = default ;
25
24
};
Original file line number Diff line number Diff line change @@ -124,6 +124,8 @@ namespace nbl::ui
124
124
EKC_VOLUME_MUTE,
125
125
EKC_VOLUME_UP,
126
126
EKC_VOLUME_DOWN,
127
+
128
+ EKC_COUNT,
127
129
};
128
130
129
131
inline char keyCodeToChar (E_KEY_CODE code)
@@ -188,10 +190,11 @@ namespace nbl::ui
188
190
189
191
enum E_MOUSE_BUTTON : uint8_t
190
192
{
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,
196
199
};
197
200
};
You can’t perform that action at this time.
0 commit comments