Skip to content

Commit

Permalink
[RaZ] Updated RaZ (commit f5ce32b)
Browse files Browse the repository at this point in the history
- Replicated RaZ's necessary CI changes

- Deactivated Tracy, as GPU profiling doesn't seem to work and makes the application crash after a few seconds
  • Loading branch information
Razakhel committed Jun 1, 2024
1 parent 8a32148 commit 85b538a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- Release

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Pulling RaZ
run: git submodule update --init --recursive
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
RaZor-linux-${{ matrix.compiler.c }}-${{ matrix.build_type }}-${{ github.run_id }}/
- name: Upload build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: RaZor-linux-${{ matrix.compiler.c }}-${{ matrix.build_type }}-${{ github.run_id }}
path: RaZor-linux-${{ matrix.compiler.c }}-${{ matrix.build_type }}-${{ github.run_id }}.tar
8 changes: 4 additions & 4 deletions .github/workflows/Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- Release

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Pulling RaZ
run: git submodule update --init --recursive

- name: Installing Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
host: windows
target: desktop
Expand All @@ -36,7 +36,7 @@ jobs:

# Caching OpenAL-Soft's installation; this avoids reinstalling it on every build
- name: OpenAL-Soft caching
uses: actions/cache@v3
uses: actions/cache@v4
id: openal-soft
with:
path: C:/OpenAL
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
rm C:/RaZor/lib -r
- name: Upload build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: RaZor-windows-${{ matrix.compiler.c }}-${{ matrix.build_type }}-${{ github.run_id }}
path: |
Expand Down
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,9 @@ else ()
set(RAZ_USE_WINDOW OFF CACHE BOOL "" FORCE)
set(RAZ_USE_IMGUI OFF CACHE BOOL "" FORCE)

# Tracy's GPU profiling doesn't seem to report anything and produces a crash (in GpuCtx::NextQueryId() from ~GpuCtxScope()) for yet unknown reasons
set(RAZ_USE_PROFILING OFF CACHE BOOL "" FORCE)

add_subdirectory("${RAZ_ROOT}")
else ()
message(FATAL_ERROR "Failed to find RaZ; the submodule must be downloaded")
Expand Down
2 changes: 1 addition & 1 deletion extern/RaZ
Submodule RaZ updated 603 files
4 changes: 2 additions & 2 deletions src/RaZor/Interface/AppWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ void AppWindow::mouseMoveEvent(QMouseEvent* event) {
void AppWindow::wheelEvent(QWheelEvent* event) {
// The offset is divided by 120, which is the most common angle; yOffset is then supposed to be either -1 or 1
// See: https://doc.qt.io/qt-5/qwheelevent.html#angleDelta
const auto yOffset = static_cast<float>(event->angleDelta().y()) / 120.f * m_application.getDeltaTime();
const auto yOffset = static_cast<float>(event->angleDelta().y()) / 120.f * m_application.getTimeInfo().deltaTime;
const float moveVal = -200.f * yOffset;

m_cameraTrans->move(Raz::Vec3f(0.f, 0.f, moveVal));
Expand Down Expand Up @@ -414,7 +414,7 @@ void AppWindow::loadCubemap(const Raz::FilePath& rightTexturePath, const Raz::Fi
}

void AppWindow::processActions() {
const float moveVal = 10.f * m_application.getDeltaTime();
const float moveVal = 10.f * m_application.getTimeInfo().deltaTime;

if (m_movingRight)
m_cameraTrans->move(Raz::Vec3f(moveVal, 0.f, 0.f));
Expand Down

0 comments on commit 85b538a

Please sign in to comment.