diff --git a/CMakeLists.txt b/CMakeLists.txt
index f30e705..a809abe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,11 +9,6 @@ find_package(Qt6 REQUIRED COMPONENTS Gui Widgets)
find_program(CARGO cargo REQUIRED)
set(CARGO_TARGET_DIR "${CMAKE_BINARY_DIR}/cargo")
-# KDE-specific
-find_package(ECM REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-find_package(KF6 REQUIRED COMPONENTS WidgetsAddons)
-
qt_standard_project_setup()
add_subdirectory(ui)
diff --git a/src/lib.rs b/src/lib.rs
index 08c51c1..68a6b75 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,10 +5,11 @@ use glam::{Mat4, UVec2, Vec3, Vec4, vec3, vec4};
mod camera;
mod render;
+const BACKGROUND: Vec4 = vec4(0.00, 0.39, 0.52, 1.00);
+
#[derive(Debug, Clone, Copy)]
#[repr(C)]
pub struct RedrawArgs {
- pub background: Vec4,
pub cam_yaw: f32,
pub cam_pitch: f32,
pub cam_distance: f32,
@@ -18,7 +19,6 @@ pub struct RedrawArgs {
impl Default for RedrawArgs {
fn default() -> Self {
Self {
- background: vec4(0.25, 0.49, 0.93, 1.00),
cam_yaw: 3. * std::f32::consts::FRAC_PI_4,
cam_pitch: std::f32::consts::FRAC_PI_6,
cam_distance: 3.,
@@ -158,7 +158,7 @@ impl Core {
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
- load: wgpu::LoadOp::Clear(color_to_wgpu(srgba_to_linear(args.background))),
+ load: wgpu::LoadOp::Clear(color_to_wgpu(srgba_to_linear(BACKGROUND))),
store: wgpu::StoreOp::Store,
},
})],
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 5c3f9f3..a9313c9 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -9,6 +9,5 @@ qt_add_executable(PROJECT-NAME
)
target_link_libraries(PROJECT-NAME PRIVATE Qt6::Gui Qt6::Widgets)
-target_link_libraries(PROJECT-NAME PRIVATE KF6::WidgetsAddons)
target_link_libraries(PROJECT-NAME PRIVATE PROJECT_NAME_impl)
target_include_directories(PROJECT-NAME PRIVATE src)
diff --git a/ui/src/api.hxx b/ui/src/api.hxx
index c4cd232..82d9880 100644
--- a/ui/src/api.hxx
+++ b/ui/src/api.hxx
@@ -12,7 +12,6 @@ namespace ffi {
struct Core;
struct RedrawArgs {
- Vec4 background;
float cam_yaw;
float cam_pitch;
float cam_distance;
diff --git a/ui/src/main_window.cxx b/ui/src/main_window.cxx
index 5e6f71f..f328606 100644
--- a/ui/src/main_window.cxx
+++ b/ui/src/main_window.cxx
@@ -12,9 +12,7 @@ PROJECTNAME::PROJECTNAME(QWidget* parent)
PROJECTNAME::~PROJECTNAME() = default;
void PROJECTNAME::updateView() {
- const auto color = m_ui->inBackground->color();
RedrawArgs args{
- .background = { color.redF(), color.greenF(), color.blueF(), 1.00 },
.cam_yaw = qDegreesToRadians((float)m_ui->camYaw->value()),
.cam_pitch = qDegreesToRadians((float)m_ui->camPitch->value()),
.cam_distance = (float)m_ui->camDistance->value(),
diff --git a/ui/src/main_window.ui b/ui/src/main_window.ui
index f6cdd02..2bb9f1e 100644
--- a/ui/src/main_window.ui
+++ b/ui/src/main_window.ui
@@ -156,24 +156,6 @@
- -
-
-
- Background color
-
-
-
- -
-
-
-
- 0
- 99
- 133
-
-
-
-
-
@@ -192,11 +174,6 @@
-
- KColorCombo
- QComboBox
-
-
Viewport
QWidget
@@ -206,22 +183,6 @@
-
- inBackground
- highlighted(QColor)
- MainWindow
- updateView()
-
-
- 1531
- 115
-
-
- 799
- 599
-
-
-
camYaw
valueChanged(double)