From 2be964acdaa6a4948696fd7ce032d036bcdbf16c Mon Sep 17 00:00:00 2001 From: maelstrom Date: Mon, 7 Apr 2025 18:08:35 +0200 Subject: [PATCH] feat(editor): sound :) --- .gitignore | 5 ++++- editor/CMakeLists.txt | 6 +++--- editor/mainglwidget.cpp | 7 ++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eee2496..3e9b0c8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,7 @@ /.cache # Gdb -/.gdb_history \ No newline at end of file +/.gdb_history + +# Excluded assets +/assets/excluded \ No newline at end of file diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index a77f706..0df4337 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets LinguistTools) -find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools) +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets Multimedia LinguistTools) +find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets Multimedia LinguistTools) set(TS_FILES editor_en_US.ts) @@ -64,7 +64,7 @@ else() endif() target_include_directories(editor PUBLIC "../core/src" "../include") -target_link_libraries(editor PRIVATE openblocks Qt${QT_VERSION_MAJOR}::Widgets) +target_link_libraries(editor PRIVATE openblocks Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Multimedia) # Qt6 does not include QOpenGLWidgets as part of Widgets base anymore, so # we have to include it manually diff --git a/editor/mainglwidget.cpp b/editor/mainglwidget.cpp index 4528d2d..450355d 100644 --- a/editor/mainglwidget.cpp +++ b/editor/mainglwidget.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include "datatypes/cframe.h" #include "datatypes/vector.h" @@ -370,8 +371,12 @@ void MainGLWidget::mousePressEvent(QMouseEvent* evt) { case Left: part->leftSurface = surface; break; case Bottom: part->bottomSurface = surface; break; case Front: part->frontSurface = surface; break; - default: break; + default: return; } + + if (QFile::exists("./assets/excluded/electronicpingshort.wav")) + QSound::play("./assets/excluded/electronicpingshort.wav"); + return; }