Skip to content

Commit abc0374

Browse files
Erfan-AhmadiErfan-Ahmadi
committed
Merge branch 'danylo_system' into erfan_vulkan_as
# Conflicts: # examples_tests/common/Camera.hpp
2 parents 3e6b598 + c6c3f42 commit abc0374

File tree

2 files changed

+93
-84
lines changed

2 files changed

+93
-84
lines changed

‎examples_tests/common/Camera.hpp

Lines changed: 88 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,15 @@
1111
#include <fstream>
1212
#include <chrono>
1313

14-
using namespace nbl;
15-
using namespace core;
16-
using namespace ui;
17-
1814
class Camera {
1915
public:
20-
Camera() = default;
21-
22-
Camera( const core::vectorSIMDf& position,
23-
const core::vectorSIMDf& lookat,
24-
const core::matrix4SIMD& projection,
16+
Camera(const nbl::core::vectorSIMDf& position,
17+
const nbl::core::vectorSIMDf& lookat,
18+
const nbl::core::matrix4SIMD& projection,
2519
float moveSpeed = 1.0f,
2620
float rotateSpeed = 1.0f,
27-
const core::vectorSIMDf& upVec = core::vectorSIMDf(0.0f, 1.0f, 0.0f),
28-
const core::vectorSIMDf& backupUpVec = core::vectorSIMDf(0.5f, 1.0f, 0.0f)
21+
const nbl::core::vectorSIMDf& upVec = nbl::core::vectorSIMDf(0.0f, 1.0f, 0.0f),
22+
const nbl::core::vectorSIMDf& backupUpVec = nbl::core::vectorSIMDf(0.5f, 1.0f, 0.0f)
2923
)
3024
: position(position)
3125
, target(lookat)
@@ -44,90 +38,102 @@ class Camera {
4438

4539
public:
4640

47-
inline const core::matrix4SIMD& getProjectionMatrix() const { return projMatrix; }
48-
inline const core::matrix3x4SIMD & getViewMatrix() const { return viewMatrix; }
49-
inline const core::matrix4SIMD & getConcatenatedMatrix() const { return concatMatrix; }
41+
inline const nbl::core::matrix4SIMD& getProjectionMatrix() const { return projMatrix; }
42+
inline const nbl::core::matrix3x4SIMD & getViewMatrix() const { return viewMatrix; }
43+
inline const nbl::core::matrix4SIMD & getConcatenatedMatrix() const { return concatMatrix; }
5044

51-
inline void setProjectionMatrix(const core::matrix4SIMD& projection) {
45+
inline void setProjectionMatrix(const nbl::core::matrix4SIMD& projection) {
5246
projMatrix = projection;
53-
leftHanded = core::determinant(projMatrix) < 0.f;
54-
concatMatrix = core::matrix4SIMD::concatenateBFollowedByAPrecisely(projMatrix, core::matrix4SIMD(viewMatrix));
47+
leftHanded = nbl::core::determinant(projMatrix) < 0.f;
48+
concatMatrix = nbl::core::matrix4SIMD::concatenateBFollowedByAPrecisely(projMatrix, nbl::core::matrix4SIMD(viewMatrix));
5549
}
5650

57-
inline void setPosition(const core::vectorSIMDf& pos) {
51+
inline void setPosition(const nbl::core::vectorSIMDf& pos) {
5852
position.set(pos);
5953
recomputeViewMatrix();
6054
}
6155

62-
inline const core::vectorSIMDf& getPosition() const { return position; }
56+
inline const nbl::core::vectorSIMDf& getPosition() const { return position; }
6357

64-
inline void setTarget(const core::vectorSIMDf& pos) {
58+
inline void setTarget(const nbl::core::vectorSIMDf& pos) {
6559
target.set(pos);
6660
recomputeViewMatrix();
6761
}
6862

69-
inline const core::vectorSIMDf& getTarget() const { return target; }
63+
inline const nbl::core::vectorSIMDf& getTarget() const { return target; }
7064

71-
inline void setUpVector(const core::vectorSIMDf& up) {
65+
inline void setUpVector(const nbl::core::vectorSIMDf& up) {
7266
upVector = up;
7367
}
7468

75-
inline void setBackupUpVector(const core::vectorSIMDf& up) {
69+
inline void setBackupUpVector(const nbl::core::vectorSIMDf& up) {
7670
backupUpVector = up;
7771
}
7872

79-
inline const core::vectorSIMDf& getUpVector() const { return upVector; }
73+
inline const nbl::core::vectorSIMDf& getUpVector() const { return upVector; }
8074

81-
inline const core::vectorSIMDf& getBackupUpVector() const { return backupUpVector; }
75+
inline const nbl::core::vectorSIMDf& getBackupUpVector() const { return backupUpVector; }
76+
77+
inline const float getMoveSpeed() const { return moveSpeed; }
78+
79+
inline void setMoveSpeed(const float _moveSpeed) {
80+
moveSpeed = _moveSpeed;
81+
}
82+
83+
inline const float getRotateSpeed() const { return rotateSpeed; }
84+
85+
inline void setRotateSpeed(const float _rotateSpeed) {
86+
rotateSpeed = _rotateSpeed;
87+
}
8288

8389
inline void recomputeViewMatrix() {
84-
core::vectorSIMDf pos = position;
85-
core::vectorSIMDf localTarget = core::normalize(target - pos);
90+
nbl::core::vectorSIMDf pos = position;
91+
nbl::core::vectorSIMDf localTarget = nbl::core::normalize(target - pos);
8692

8793
// if upvector and vector to the target are the same, we have a
8894
// problem. so solve this problem:
89-
core::vectorSIMDf up = core::normalize(upVector);
90-
core::vectorSIMDf cross = core::cross(localTarget, up);
91-
bool upVectorNeedsChange = core::lengthsquared(cross)[0] == 0;
95+
nbl::core::vectorSIMDf up = nbl::core::normalize(upVector);
96+
nbl::core::vectorSIMDf cross = nbl::core::cross(localTarget, up);
97+
bool upVectorNeedsChange = nbl::core::lengthsquared(cross)[0] == 0;
9298
if (upVectorNeedsChange)
9399
{
94-
up = core::normalize(backupUpVector);
100+
up = nbl::core::normalize(backupUpVector);
95101
}
96102

97103
if (leftHanded)
98-
viewMatrix = core::matrix3x4SIMD::buildCameraLookAtMatrixLH(pos, target, up);
104+
viewMatrix = nbl::core::matrix3x4SIMD::buildCameraLookAtMatrixLH(pos, target, up);
99105
else
100-
viewMatrix = core::matrix3x4SIMD::buildCameraLookAtMatrixRH(pos, target, up);
101-
concatMatrix = core::matrix4SIMD::concatenateBFollowedByAPrecisely(projMatrix, core::matrix4SIMD(viewMatrix));
106+
viewMatrix = nbl::core::matrix3x4SIMD::buildCameraLookAtMatrixRH(pos, target, up);
107+
concatMatrix = nbl::core::matrix4SIMD::concatenateBFollowedByAPrecisely(projMatrix, nbl::core::matrix4SIMD(viewMatrix));
102108
}
103109

104110
inline bool getLeftHanded() const { return leftHanded; }
105111

106112
public:
107113

108-
void mouseProcess(const IMouseEventChannel::range_t& events)
114+
void mouseProcess(const nbl::ui::IMouseEventChannel::range_t& events)
109115
{
110116
for (auto eventIt=events.begin(); eventIt!=events.end(); eventIt++)
111117
{
112118
auto ev = *eventIt;
113119

114-
if(ev.type == ui::SMouseEvent::EET_CLICK && ev.clickEvent.mouseButton == ui::EMB_LEFT_BUTTON) {
115-
if(ev.clickEvent.action == ui::SMouseEvent::SClickEvent::EA_PRESSED) {
120+
if(ev.type == nbl::ui::SMouseEvent::EET_CLICK && ev.clickEvent.mouseButton == nbl::ui::EMB_LEFT_BUTTON) {
121+
if(ev.clickEvent.action == nbl::ui::SMouseEvent::SClickEvent::EA_PRESSED) {
116122
mouseDown = true;
117-
} else if (ev.clickEvent.action == ui::SMouseEvent::SClickEvent::EA_RELEASED) {
123+
} else if (ev.clickEvent.action == nbl::ui::SMouseEvent::SClickEvent::EA_RELEASED) {
118124
mouseDown = false;
119125
}
120126
}
121127

122-
if(ev.type == ui::SMouseEvent::EET_MOVEMENT && mouseDown) {
123-
core::vectorSIMDf pos = getPosition();
124-
core::vectorSIMDf localTarget = getTarget() - pos;
128+
if(ev.type == nbl::ui::SMouseEvent::EET_MOVEMENT && mouseDown) {
129+
nbl::core::vectorSIMDf pos = getPosition();
130+
nbl::core::vectorSIMDf localTarget = getTarget() - pos;
125131

126132
// Get Relative Rotation for localTarget in Radians
127133
float relativeRotationX, relativeRotationY;
128134
relativeRotationY = atan2(localTarget.X, localTarget.Z);
129-
const double z1 = core::sqrt(localTarget.X*localTarget.X + localTarget.Z*localTarget.Z);
130-
relativeRotationX = atan2(z1, localTarget.Y) - core::PI<float>()/2;
135+
const double z1 = nbl::core::sqrt(localTarget.X*localTarget.X + localTarget.Z*localTarget.Z);
136+
relativeRotationX = atan2(z1, localTarget.Y) - nbl::core::PI<float>()/2;
131137

132138
constexpr float RotateSpeedScale = 0.003f;
133139
relativeRotationX -= ev.movementEvent.relativeMovementY * rotateSpeed * RotateSpeedScale * -1.0f;
@@ -137,24 +143,24 @@ class Camera {
137143
else
138144
relativeRotationY += tmpYRot;
139145

140-
const double MaxVerticalAngle = core::radians<float>(88.0f);
146+
const double MaxVerticalAngle = nbl::core::radians<float>(88.0f);
141147
if (relativeRotationX > MaxVerticalAngle*2 &&
142-
relativeRotationX < 2*core::PI<float>()-MaxVerticalAngle)
148+
relativeRotationX < 2 * nbl::core::PI<float>()-MaxVerticalAngle)
143149
{
144-
relativeRotationX = 2*core::PI<float>()-MaxVerticalAngle;
150+
relativeRotationX = 2 * nbl::core::PI<float>()-MaxVerticalAngle;
145151
}
146152
else
147153
if (relativeRotationX > MaxVerticalAngle &&
148-
relativeRotationX < 2*core::PI<float>()-MaxVerticalAngle)
154+
relativeRotationX < 2 * nbl::core::PI<float>()-MaxVerticalAngle)
149155
{
150156
relativeRotationX = MaxVerticalAngle;
151157
}
152158

153-
localTarget.set(0,0, core::max(1.f, core::length(pos)[0]), 1.f);
159+
localTarget.set(0,0, nbl::core::max(1.f, nbl::core::length(pos)[0]), 1.f);
154160

155-
core::matrix3x4SIMD mat;
161+
nbl::core::matrix3x4SIMD mat;
156162
{
157-
mat.setRotation(core::quaternion(relativeRotationX, relativeRotationY, 0));
163+
mat.setRotation(nbl::core::quaternion(relativeRotationX, relativeRotationY, 0));
158164
}
159165
mat.transformVect(localTarget);
160166

@@ -163,7 +169,7 @@ class Camera {
163169
}
164170
}
165171

166-
void keyboardProcess(const IKeyboardEventChannel::range_t& events)
172+
void keyboardProcess(const nbl::ui::IKeyboardEventChannel::range_t& events)
167173
{
168174
for(uint32_t k = 0; k < Keys::EKA_COUNT; ++k) {
169175
perActionDt[k] = 0.0;
@@ -190,41 +196,41 @@ class Camera {
190196
auto timeDiff = std::chrono::duration_cast<std::chrono::milliseconds>(nextPresentationTimeStamp - ev.timeStamp).count();
191197
assert(timeDiff >= 0);
192198

193-
if(ev.keyCode == ui::EKC_UP_ARROW || ev.keyCode == ui::EKC_W) {
194-
if(ev.action == ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_FORWARD] == false) {
199+
if(ev.keyCode == nbl::ui::EKC_UP_ARROW || ev.keyCode == nbl::ui::EKC_W) {
200+
if(ev.action == nbl::ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_FORWARD] == false) {
195201
perActionDt[Keys::EKA_MOVE_FORWARD] += timeDiff;
196202
keysDown[Keys::EKA_MOVE_FORWARD] = true;
197-
} else if(ev.action == ui::SKeyboardEvent::ECA_RELEASED) {
203+
} else if(ev.action == nbl::ui::SKeyboardEvent::ECA_RELEASED) {
198204
// perActionDt[Keys::EKA_MOVE_FORWARD] -= timeDiff;
199205
keysDown[Keys::EKA_MOVE_FORWARD] = false;
200206
}
201207
}
202208

203-
if(ev.keyCode == ui::EKC_DOWN_ARROW || ev.keyCode == ui::EKC_S) {
204-
if(ev.action == ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_BACKWARD] == false) {
209+
if(ev.keyCode == nbl::ui::EKC_DOWN_ARROW || ev.keyCode == nbl::ui::EKC_S) {
210+
if(ev.action == nbl::ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_BACKWARD] == false) {
205211
perActionDt[Keys::EKA_MOVE_BACKWARD] += timeDiff;
206212
keysDown[Keys::EKA_MOVE_BACKWARD] = true;
207-
} else if(ev.action == ui::SKeyboardEvent::ECA_RELEASED) {
213+
} else if(ev.action == nbl::ui::SKeyboardEvent::ECA_RELEASED) {
208214
// perActionDt[Keys::EKA_MOVE_BACKWARD] -= timeDiff;
209215
keysDown[Keys::EKA_MOVE_BACKWARD] = false;
210216
}
211217
}
212218

213-
if(ev.keyCode == ui::EKC_LEFT_ARROW || ev.keyCode == ui::EKC_A) {
214-
if(ev.action == ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_LEFT] == false) {
219+
if(ev.keyCode == nbl::ui::EKC_LEFT_ARROW || ev.keyCode == nbl::ui::EKC_A) {
220+
if(ev.action == nbl::ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_LEFT] == false) {
215221
perActionDt[Keys::EKA_MOVE_LEFT] += timeDiff;
216222
keysDown[Keys::EKA_MOVE_LEFT] = true;
217-
} else if(ev.action == ui::SKeyboardEvent::ECA_RELEASED) {
223+
} else if(ev.action == nbl::ui::SKeyboardEvent::ECA_RELEASED) {
218224
// perActionDt[Keys::EKA_MOVE_LEFT] -= timeDiff;
219225
keysDown[Keys::EKA_MOVE_LEFT] = false;
220226
}
221227
}
222228

223-
if(ev.keyCode == ui::EKC_RIGHT_ARROW || ev.keyCode == ui::EKC_D) {
224-
if(ev.action == ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_RIGHT] == false) {
229+
if(ev.keyCode == nbl::ui::EKC_RIGHT_ARROW || ev.keyCode == nbl::ui::EKC_D) {
230+
if(ev.action == nbl::ui::SKeyboardEvent::ECA_PRESSED && keysDown[Keys::EKA_MOVE_RIGHT] == false) {
225231
perActionDt[Keys::EKA_MOVE_RIGHT] += timeDiff;
226232
keysDown[Keys::EKA_MOVE_RIGHT] = true;
227-
} else if(ev.action == ui::SKeyboardEvent::ECA_RELEASED) {
233+
} else if(ev.action == nbl::ui::SKeyboardEvent::ECA_RELEASED) {
228234
// perActionDt[Keys::EKA_MOVE_RIGHT] -= timeDiff;
229235
keysDown[Keys::EKA_MOVE_RIGHT] = false;
230236
}
@@ -245,12 +251,12 @@ class Camera {
245251
}
246252

247253
void endInputProcessing(std::chrono::microseconds _nextPresentationTimeStamp) {
248-
core::vectorSIMDf pos = getPosition();
249-
core::vectorSIMDf localTarget = getTarget() - pos;
254+
nbl::core::vectorSIMDf pos = getPosition();
255+
nbl::core::vectorSIMDf localTarget = getTarget() - pos;
250256

251-
core::vectorSIMDf movedir = localTarget;
257+
nbl::core::vectorSIMDf movedir = localTarget;
252258
movedir.makeSafe3D();
253-
movedir = core::normalize(movedir);
259+
movedir = nbl::core::normalize(movedir);
254260

255261
constexpr float MoveSpeedScale = 0.02f;
256262

@@ -262,21 +268,21 @@ class Camera {
262268

263269
// if upvector and vector to the target are the same, we have a
264270
// problem. so solve this problem:
265-
core::vectorSIMDf up = core::normalize(upVector);
266-
core::vectorSIMDf cross = core::cross(localTarget, up);
267-
bool upVectorNeedsChange = core::lengthsquared(cross)[0] == 0;
271+
nbl::core::vectorSIMDf up = nbl::core::normalize(upVector);
272+
nbl::core::vectorSIMDf cross = nbl::core::cross(localTarget, up);
273+
bool upVectorNeedsChange = nbl::core::lengthsquared(cross)[0] == 0;
268274
if (upVectorNeedsChange)
269275
{
270-
up = core::normalize(backupUpVector);
276+
up = nbl::core::normalize(backupUpVector);
271277
}
272278

273-
core::vectorSIMDf strafevect = localTarget;
279+
nbl::core::vectorSIMDf strafevect = localTarget;
274280
if (leftHanded)
275-
strafevect = core::cross(strafevect, up);
281+
strafevect = nbl::core::cross(strafevect, up);
276282
else
277-
strafevect = core::cross(up, strafevect);
283+
strafevect = nbl::core::cross(up, strafevect);
278284

279-
strafevect = core::normalize(strafevect);
285+
strafevect = nbl::core::normalize(strafevect);
280286

281287
pos += strafevect * perActionDt[Keys::EKA_MOVE_LEFT] * moveSpeed * MoveSpeedScale;
282288

@@ -299,16 +305,16 @@ class Camera {
299305
}
300306

301307
private:
302-
core::vectorSIMDf position;
303-
core::vectorSIMDf target;
304-
core::vectorSIMDf upVector;
305-
core::vectorSIMDf backupUpVector;
308+
nbl::core::vectorSIMDf position;
309+
nbl::core::vectorSIMDf target;
310+
nbl::core::vectorSIMDf upVector;
311+
nbl::core::vectorSIMDf backupUpVector;
306312

307-
core::matrix3x4SIMD viewMatrix;
308-
core::matrix4SIMD concatMatrix;
313+
nbl::core::matrix3x4SIMD viewMatrix;
314+
nbl::core::matrix4SIMD concatMatrix;
309315

310316
// actual projection matrix used
311-
core::matrix4SIMD projMatrix;
317+
nbl::core::matrix4SIMD projMatrix;
312318

313319
bool leftHanded;
314320

‎include/nbl/system/ISystem.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ class ISystem : public core::IReferenceCounted
335335

336336
void mount(core::smart_refctd_ptr<IFileArchive>&& archive, const system::path& pathAlias = "")
337337
{
338-
auto path = std::filesystem::absolute(archive->asFile()->getFileName()).generic_string();
338+
auto path = archive->asFile()->getFileName();
339339
m_cachedArchiveFiles.insert(path, std::move(archive));
340340
if (!pathAlias.empty())
341341
{
@@ -371,7 +371,10 @@ class ISystem : public core::IReferenceCounted
371371

372372
bool deleteDirectory(const system::path& p)
373373
{
374-
return std::filesystem::remove(p);
374+
if (std::filesystem::exists(p))
375+
return std::filesystem::remove(p);
376+
else
377+
return false;
375378
}
376379

377380
bool moveFileOrDirectory(const system::path oldPath, const system::path newPath)

0 commit comments

Comments
 (0)