better colors for the show

Now that there is no separate UI-specific wrapper, it belongs to the implementation rather than to the UI, probably

cherry-picked from: qt-wgpu-skel:9742916bd6932498e87b12d514ac209595ad216c

CMakeLists.txt

@@ -1,14 +1,17 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.18...4.2)
 
-project(photon_light VERSION 1.0.0 LANGUAGES CXX)
+project(photon-light VERSION 1.0.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt6 REQUIRED COMPONENTS Gui Widgets)
 find_program(CARGO cargo REQUIRED)
-set(CARGO_TARGET_DIR "${CMAKE_BINARY_DIR}/cargo")
+set(CARGO_TARGET_DIR "${CMAKE_SOURCE_DIR}/target" CACHE PATH "Path to the Cargo target directory")
+
+include(diplomat.cmake)
 
 qt_standard_project_setup()
 
+add_subdirectory(src)
 add_subdirectory(ui)

Cargo.lock

@@ -159,15 +159,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 
 [[package]]
 name = "bytemuck"
-version = "1.24.0"
+version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -180,14 +180,14 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 
 [[package]]
 name = "calloop"
@@ -217,9 +217,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.45"
+version = "1.2.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe"
+checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -354,6 +354,38 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
+[[package]]
+name = "diplomat"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a80510e6103d35c5cd031c0e3f21165b32742c301ee3dafdbb5904c6dca46a"
+dependencies = [
+ "diplomat_core",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.9",
+]
+
+[[package]]
+name = "diplomat-runtime"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9d981121ba76150987fda68185b37853c0b928a55dfdc28897348cd068440be"
+
+[[package]]
+name = "diplomat_core"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5c594efd1d097105255fc325c430a517c97b7b7c69f8727f653593e1ce726"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "smallvec",
+ "strck",
+ "syn 3.0.9",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -408,9 +440,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.4"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
 [[package]]
 name = "foldhash"
@@ -442,7 +474,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -451,13 +483,38 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "gethostname"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "windows-link",
 ]
 
@@ -486,9 +543,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.30.9"
+version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd47b05dddf0005d850e5644cae7f2b14ac3df487979dbfff3b56f20b1a6ae46"
+checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
 dependencies = [
  "approx",
  "bytemuck",
@@ -589,9 +646,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
  "foldhash 0.2.0",
 ]
@@ -610,12 +667,12 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
 name = "indexmap"
-version = "2.12.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.0",
+ "hashbrown 0.16.1",
 ]
 
 [[package]]
@@ -652,9 +709,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.82"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -679,9 +736,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "libc"
-version = "0.2.177"
+version = "0.2.180"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
 
 [[package]]
 name = "libloading"
@@ -695,19 +752,19 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
  "bitflags 2.10.0",
  "libc",
- "redox_syscall 0.5.18",
+ "redox_syscall 0.7.0",
 ]
 
 [[package]]
@@ -739,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "malloc_buf"
@@ -795,7 +852,7 @@ dependencies = [
  "cfg_aliases",
  "codespan-reporting",
  "half",
- "hashbrown 0.16.0",
+ "hashbrown 0.16.1",
  "hexf-parse",
  "indexmap",
  "libm",
@@ -804,7 +861,7 @@ dependencies = [
  "once_cell",
  "rustc-hash",
  "spirv",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "unicode-ident",
 ]
 
@@ -867,7 +924,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1090,10 +1147,11 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.49"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827"
+checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
 dependencies = [
+ "libc",
  "libredox",
 ]
 
@@ -1156,6 +1214,8 @@ version = "0.1.0"
 dependencies = [
  "approx",
  "bytemuck",
+ "diplomat",
+ "diplomat-runtime",
  "glam",
  "pollster",
  "rand",
@@ -1165,17 +1225,6 @@ dependencies = [
  "winit",
 ]
 
-[[package]]
-name = "photon-light-impl"
-version = "0.1.0"
-dependencies = [
- "glam",
- "photon-light",
- "pollster",
- "raw-window-handle",
- "wgpu",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.10"
@@ -1193,7 +1242,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1202,6 +1251,12 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
@@ -1218,7 +1273,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "windows-sys 0.61.2",
 ]
 
@@ -1230,9 +1285,9 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
 
 [[package]]
 name = "portable-atomic-util"
@@ -1269,9 +1324,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -1284,18 +1339,18 @@ checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
 name = "quick-xml"
-version = "0.37.5"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.42"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
@@ -1308,9 +1363,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -1328,9 +1383,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
  "getrandom",
 ]
@@ -1384,6 +1439,15 @@ dependencies = [
  "bitflags 2.10.0",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
 [[package]]
 name = "renderdoc-sys"
 version = "1.1.0"
@@ -1411,9 +1475,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
  "bitflags 2.10.0",
  "errno",
@@ -1489,7 +1553,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1506,9 +1570,9 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slotmap"
-version = "1.0.7"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
 dependencies = [
  "version_check",
 ]
@@ -1568,6 +1632,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "strck"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42316e70da376f3d113a68d138a60d8a9883c604fe97942721ec2068dab13a9f"
+dependencies = [
+ "unicode-ident",
+]
+
 [[package]]
 name = "strict-num"
 version = "0.1.1"
@@ -1576,9 +1649,20 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
 [[package]]
 name = "syn"
-version = "2.0.110"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1605,11 +1689,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -1620,18 +1704,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1661,18 +1745,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.3"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.23.7"
+version = "0.23.10+spec-1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1682,18 +1766,18 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-core",
@@ -1701,9 +1785,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 
 [[package]]
 name = "ttf-parser"
@@ -1747,18 +1831,18 @@ dependencies = [
 
 [[package]]
 name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.105"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -1769,11 +1853,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.55"
+version = "0.4.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
 dependencies = [
  "cfg-if",
+ "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -1782,9 +1867,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.105"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1792,35 +1877,35 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.105"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.105"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "wayland-backend"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -1828,12 +1913,12 @@ dependencies = [
 
 [[package]]
 name = "wayland-client"
-version = "0.31.11"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
+checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
 dependencies = [
  "bitflags 2.10.0",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -1851,20 +1936,20 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.31.11"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29"
+checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078"
 dependencies = [
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "wayland-client",
  "xcursor",
 ]
 
 [[package]]
 name = "wayland-protocols"
-version = "0.32.9"
+version = "0.32.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
+checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -1874,9 +1959,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
+checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -1887,9 +1972,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
 dependencies = [
  "bitflags 2.10.0",
  "wayland-backend",
@@ -1900,9 +1985,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
+checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
 dependencies = [
  "proc-macro2",
  "quick-xml",
@@ -1911,9 +1996,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
 dependencies = [
  "dlib",
  "log",
@@ -1923,9 +2008,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.82"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1952,7 +2037,7 @@ dependencies = [
  "cfg-if",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.16.0",
+ "hashbrown 0.16.1",
  "js-sys",
  "log",
  "naga",
@@ -1983,7 +2068,7 @@ dependencies = [
  "bytemuck",
  "cfg_aliases",
  "document-features",
- "hashbrown 0.16.0",
+ "hashbrown 0.16.1",
  "indexmap",
  "log",
  "naga",
@@ -1994,7 +2079,7 @@ dependencies = [
  "raw-window-handle",
  "rustc-hash",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "wgpu-core-deps-apple",
  "wgpu-core-deps-emscripten",
  "wgpu-core-deps-windows-linux-android",
@@ -2050,7 +2135,7 @@ dependencies = [
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hashbrown 0.16.0",
+ "hashbrown 0.16.1",
  "js-sys",
  "khronos-egl",
  "libc",
@@ -2070,7 +2155,7 @@ dependencies = [
  "raw-window-handle",
  "renderdoc-sys",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "wasm-bindgen",
  "web-sys",
  "wgpu-types",
@@ -2088,7 +2173,7 @@ dependencies = [
  "bytemuck",
  "js-sys",
  "log",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "web-sys",
 ]
 
@@ -2132,7 +2217,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2143,7 +2228,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2382,18 +2467,18 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "wit-bindgen"
-version = "0.46.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
 [[package]]
 name = "x11-dl"
@@ -2417,7 +2502,7 @@ dependencies = [
  "libc",
  "libloading",
  "once_cell",
- "rustix 1.1.2",
+ "rustix 1.1.3",
  "x11rb-protocol",
 ]
 
@@ -2460,20 +2545,20 @@ checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.27"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.114",
 ]

Cargo.toml

@@ -1,22 +1,24 @@
-[workspace]
-members = ["ui"]
-
 [package]
 name = "photon-light"
 version = "0.1.0"
 edition = "2024"
 
+[lib]
+crate-type = ["lib", "staticlib"]
+
 [profile.dev]
 panic = 'abort'
 
 [profile.dev.package."*"]
+debug = false
 opt-level = 3
 
 [profile.test.package."*"]
+debug = false
 opt-level = 3
 
 [dependencies]
-bytemuck = "1.24.0"
+bytemuck = "1.25.2"
 glam = { version = "0.30.9", features = ["bytemuck", "approx"] }
 pollster = "0.4.0"
 rand = "0.9.2"
@@ -24,6 +26,8 @@ rand_distr = "0.5.1"
 rand_pcg = "0.9.0"
 wgpu = "27.0.1"
 winit = "0.30.12"
+diplomat = "0.17.0"
+diplomat-runtime = "0.16.1"
 
 [dev-dependencies]
 approx = "0.5.1"

README.md

@@ -0,0 +1 @@
+# Photon Light

diplomat.cmake

@@ -0,0 +1,8 @@
+set(crates "${CMAKE_BINARY_DIR}/crates")
+set(diplomat "${crates}/bin/diplomat-tool")
+
+if(NOT IS_EXECUTABLE "${diplomat}")
+	message(CONFIGURE_LOG "Downloading Diplomat...")
+	file(MAKE_DIRECTORY "${crates}")
+	execute_process(COMMAND ${CARGO} install --root "${crates}" diplomat-tool@0.17.0)
+endif()

format.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+find src/ ui/ \
+	\( \
+		-name '*.cxx' -o \
+		-name '*.hxx' -o \
+		-name '*.c' -o \
+		-name '*.h' \
+	\) \
+	-print \
+	-exec 'clang-format' '-i' '{}' \;

src/CMakeLists.txt

@@ -0,0 +1,63 @@
+# build the Rust side as a static library
+set(impl_basename "${CARGO_TARGET_DIR}/release/libphoton_light")
+
+set(cargo_cmake_args)
+set(diplomat_cmake_args)
+
+if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.27")
+	list(APPEND cargo_cmake_args DEPENDS_EXPLICIT_ONLY)
+	list(APPEND diplomat_cmake_args DEPENDS_EXPLICIT_ONLY)
+endif()
+
+if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.28")
+	list(APPEND cargo_cmake_args JOB_SERVER_AWARE TRUE)
+endif()
+
+if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.31")
+	list(APPEND diplomat_cmake_args CODEGEN)
+endif()
+
+add_custom_command(
+	OUTPUT "${impl_basename}.a"
+	COMMAND env "CARGO_TARGET_DIR=${CARGO_TARGET_DIR}" ${CARGO} build --release --package photon-light
+	WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+	DEPFILE "${impl_basename}.d"
+	USES_TERMINAL
+	VERBATIM
+	${cargo_cmake_args}
+)
+
+# HACK ensure CMake *actually adds* the command above
+add_custom_target(build_impl
+	DEPENDS "${impl_basename}.a"
+)
+
+add_library(photon_light_impl STATIC IMPORTED GLOBAL)
+
+set_target_properties(photon_light_impl PROPERTIES
+	IMPORTED_LOCATION "${impl_basename}.a"
+)
+
+# generate the bindings
+set(bindings_dir "${CMAKE_CURRENT_BINARY_DIR}/include")
+file(MAKE_DIRECTORY "${bindings_dir}")
+set(bindings
+	"${bindings_dir}/Core.hpp"
+)
+
+add_custom_command(
+	OUTPUT ${bindings}
+	COMMAND ${diplomat} cpp "${bindings_dir}"
+	MAIN_DEPENDENCY "lib.rs"
+	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+	VERBATIM
+	${diplomat_cmake_args}
+)
+
+# HACK ensure CMake *actually adds* the command above
+add_custom_target(codegen_impl
+	DEPENDS ${bindings}
+)
+
+target_sources(photon_light_impl INTERFACE ${bindings})
+target_include_directories(photon_light_impl INTERFACE "${bindings_dir}")

src/camera.rs

@@ -37,7 +37,8 @@ impl OrbitalCamera {
 				[-1., 0., 0., 0.],
 				[0., 1., 0., 0.],
 				[0., 0., 0., 1.],
-			]) * Mat4::from_euler(
+			])
+			* Mat4::from_euler(
 				glam::EulerRot::ZYZ,
 				0.,
 				self.position_pitch,

src/iter.rs

@@ -0,0 +1,22 @@
+use std::convert::identity;
+
+pub(crate) fn loop_list<T: Clone>(iter: impl IntoIterator<Item = T>) -> impl Iterator<Item = T> {
+	loop_list_ex(iter, identity, identity)
+}
+
+pub(crate) fn loop_list_ex<T: Clone, U>(
+	iter: impl IntoIterator<Item = T>,
+	mut fa: impl FnMut(T) -> U,
+	mut fb: impl FnMut(T) -> U,
+) -> impl Iterator<Item = U> {
+	gen move {
+		let mut iter = iter.into_iter();
+		let Some(first) = iter.next() else { return };
+		yield fa(first.clone());
+		for item in iter {
+			yield fb(item.clone());
+			yield fa(item);
+		}
+		yield fb(first);
+	}
+}

src/lib.rs

@@ -1,12 +1,14 @@
 #![feature(gen_blocks)]
 
-use std::{convert::identity, error::Error, f32::consts::PI};
+use std::{error::Error, f32::consts::PI};
 
 use glam::{Mat4, UVec2, Vec2, Vec3, vec3};
 use rand_distr::Distribution as _;
+use wgpu::rwh::{RawDisplayHandle, RawWindowHandle};
 
 use crate::{
 	camera::OrbitalCamera,
+	iter::loop_list,
 	ray::Ray,
 	render::{
 		DEPTH_FORMAT, OUTPUT_FORMAT,
@@ -15,29 +17,36 @@ use crate::{
 	trace::{Hit, Lambertian, Reflector, Scene, Source, Sphere},
 };
 
+pub use crate::ffi::{RedrawArgs, SphericalPosition, UseNormal};
+
 mod camera;
+mod iter;
 mod ray;
 mod render;
 mod shape;
 mod trace;
 
+#[diplomat::bridge]
+mod ffi {
+	use std::{f32::consts::PI, num::NonZero, ptr::NonNull};
+
+	use glam::uvec2;
+	use wgpu::rwh::{XcbDisplayHandle, XcbWindowHandle};
+
 	#[derive(Debug, Clone, Copy, PartialEq)]
-#[repr(C)]
 	pub struct SphericalPosition {
 		pub yaw: f32,
 		pub pitch: f32,
 		pub distance: f32,
 	}
 
-#[derive(Debug, Clone, Copy)]
+	#[derive(Debug)]
-#[repr(u8)]
 	pub enum UseNormal {
 		Light,
 		Camera,
 	}
 
 	#[derive(Debug, Clone, Copy)]
-#[repr(C)]
 	pub struct RedrawArgs {
 		pub camera_position: SphericalPosition,
 		pub light_position: SphericalPosition,
@@ -56,12 +65,82 @@ pub struct RedrawArgs {
 		pub show_light: bool,
 	}
 
+	impl Default for RedrawArgs {
+		fn default() -> Self {
+			Self {
+				camera_position: SphericalPosition {
+					yaw: PI / 4.,
+					pitch: 0.5f32.sqrt().atan(),
+					distance: 3.0,
+				},
+				light_position: SphericalPosition {
+					yaw: 0.0,
+					pitch: PI / 3.,
+					distance: 1.0,
+				},
+				light_radius: 0.125,
+				light_spread: 0.125,
+				accum_sigma: 0.025,
+				accum_scale: 0.01,
+				reflections: 2,
+				use_normal: UseNormal::Light,
+				show_axes: true,
+				show_shapes: true,
+				show_hit_emission: false,
+				show_miss_emission: false,
+				show_direct_hit: false,
+				show_indirect_hit: false,
+				show_light: true,
+			}
+		}
+	}
+
+	#[diplomat::opaque_mut]
+	pub struct Core(crate::Core);
+
+	impl Core {
+		pub fn from_xcb(connection: usize, window: u32, width: u32, height: u32) -> Box<Core> {
+			let display =
+				XcbDisplayHandle::new(Some(NonNull::new(connection as *mut _).unwrap()), 0);
+			let window = XcbWindowHandle::new(NonZero::new(window).unwrap());
+			let gpu = unsafe { crate::Gpu::new_raw(display, window) };
+			let size = uvec2(width, height);
+			Box::new(Self(crate::Core::new(gpu, size)))
+		}
+
+		pub fn configure(&mut self, width: u32, height: u32) {
+			self.0.configure(uvec2(width, height));
+		}
+
+		pub fn redraw(&mut self, args: &RedrawArgs) {
+			self.0.redraw(args);
+		}
+	}
+}
+
 pub struct Gpu {
 	device: wgpu::Device,
 	queue: wgpu::Queue,
 	surface: wgpu::Surface<'static>,
 }
 
+impl Gpu {
+	unsafe fn new_raw(
+		display: impl Into<RawDisplayHandle>,
+		window: impl Into<RawWindowHandle>,
+	) -> Self {
+		let target = wgpu::SurfaceTargetUnsafe::RawHandle {
+			raw_display_handle: display.into(),
+			raw_window_handle: window.into(),
+		};
+		let gpu = pollster::block_on(init_gpu_inner(|instance| unsafe {
+			instance.create_surface_unsafe(target)
+		}))
+		.unwrap();
+		gpu
+	}
+}
+
 pub struct Core {
 	device: wgpu::Device,
 	queue: wgpu::Queue,
@@ -88,27 +167,6 @@ pub fn new_tripod(device: &wgpu::Device) -> Mesh {
 	)
 }
 
-fn loop_list<T: Clone>(iter: impl IntoIterator<Item = T>) -> impl Iterator<Item = T> {
-	loop_list_ex(iter, identity, identity)
-}
-
-fn loop_list_ex<T: Clone, U>(
-	iter: impl IntoIterator<Item = T>,
-	mut fa: impl FnMut(T) -> U,
-	mut fb: impl FnMut(T) -> U,
-) -> impl Iterator<Item = U> {
-	gen move {
-		let mut iter = iter.into_iter();
-		let Some(first) = iter.next() else { return };
-		yield fa(first.clone());
-		for item in iter {
-			yield fb(item.clone());
-			yield fa(item);
-		}
-		yield fb(first);
-	}
-}
-
 impl OrbitalCamera {
 	fn make_ray(&self, rng: &mut impl rand::Rng) -> Ray {
 		let off: f32 = rand_distr::StandardUniform.sample(rng);

src/main.rs

@@ -1,7 +1,6 @@
-use std::{f32::consts::PI, sync::Arc};
+use std::sync::Arc;
 
 use glam::uvec2;
-use photon_light::{Core, RedrawArgs, SphericalPosition, UseNormal, init_gpu_inner};
 use winit::{
 	application::ApplicationHandler,
 	event::WindowEvent,
@@ -9,7 +8,9 @@ use winit::{
 	window::Window,
 };
 
-const TITLE: &str = "WGPU example";
+use photon_light::{Core, RedrawArgs, init_gpu_inner};
+
+const TITLE: &str = "Photon Light";
 
 struct MainWindow {
 	window: Arc<Window>,
@@ -36,31 +37,7 @@ impl MainWindow {
 			WindowEvent::Resized(physical_size) => self
 				.core
 				.configure(uvec2(physical_size.width, physical_size.height)),
-			WindowEvent::RedrawRequested => self.core.redraw(&RedrawArgs {
+			WindowEvent::RedrawRequested => self.core.redraw(&RedrawArgs::default()),
-				camera_position: SphericalPosition {
-					yaw: PI / 4.,
-					pitch: 0.5f32.sqrt().atan(),
-					distance: 3.0,
-				},
-				light_position: SphericalPosition {
-					yaw: 0.0,
-					pitch: PI / 3.,
-					distance: 1.0,
-				},
-				light_radius: 0.125,
-				light_spread: 0.125,
-				accum_sigma: 0.025,
-				accum_scale: 0.01,
-				reflections: 2,
-				use_normal: UseNormal::Light,
-				show_axes: true,
-				show_shapes: true,
-				show_hit_emission: false,
-				show_miss_emission: false,
-				show_direct_hit: false,
-				show_indirect_hit: false,
-				show_light: true,
-			}),
 			_ => {}
 		}
 	}

ui/CMakeLists.txt

@@ -1,13 +1,10 @@
-include(impl.cmake)
+qt_add_executable(photon-light
-
-qt_add_executable(photon_light
-	src/api.cxx
 	src/main.cxx
 	src/main_window.cxx
 	src/main_window.ui
 	src/viewport.cxx
 )
 
-target_link_libraries(photon_light PRIVATE Qt6::Gui Qt6::Widgets)
+target_link_libraries(photon-light PRIVATE Qt6::Gui Qt6::Widgets)
-target_link_libraries(photon_light PRIVATE photon_light_impl)
+target_link_libraries(photon-light PRIVATE photon_light_impl)
-target_include_directories(photon_light PRIVATE src)
+target_include_directories(photon-light PRIVATE src)

ui/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "photon-light-impl"
-version = "0.1.0"
-edition = "2024"
-
-[lib]
-crate-type = ["staticlib"]
-
-[dependencies]
-photon-light = {path = "../"}
-
-glam = { version = "0.30" }
-pollster = "0.4.0"
-raw-window-handle = "0.6.2"
-wgpu = "27.0.1"

ui/impl.cmake

@@ -1,22 +0,0 @@
-set(impl_basename "${CARGO_TARGET_DIR}/release/libphoton_light_impl")
-
-add_custom_command(
-	OUTPUT ${impl_basename}.a
-	COMMAND env CARGO_TARGET_DIR=${CARGO_TARGET_DIR} ${CARGO} build --release --package photon-light-impl
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	DEPFILE ${impl_basename}.d
-	USES_TERMINAL
-	JOB_SERVER_AWARE
-	DEPENDS_EXPLICIT_ONLY
-)
-
-# HACK ensure CMake *actually adds* the command above
-add_custom_target(build_impl
-	DEPENDS ${impl_basename}.a
-)
-
-add_library(photon_light_impl STATIC IMPORTED)
-
-set_target_properties(photon_light_impl PROPERTIES
-	IMPORTED_LOCATION ${impl_basename}.a
-)

ui/src/api.cxx

@@ -1,57 +0,0 @@
-#include "api.hxx"
-
-#include <stdexcept>
-#include <utility>
-
-namespace ffi {
-extern "C" Core* rt4_viewport_create(xcb_connection_t* connection, std::uint32_t window, std::uint32_t width, std::uint32_t height);
-extern "C" void rt4_viewport_destroy(Core* viewport);
-extern "C" void rt4_viewport_configure(Core* viewport, std::uint32_t width, std::uint32_t height);
-extern "C" void rt4_viewport_redraw(Core* viewport, const RedrawArgs* args);
-} // namespace ffi
-
-BoxCore::BoxCore(BoxCore&& b)
-	: ptr(std::exchange(b.ptr, {})) {
-}
-
-BoxCore::~BoxCore() {
-	reset();
-}
-
-BoxCore& BoxCore::operator=(BoxCore&& b) {
-	if (&b == this)
-		return *this;
-	std::swap(ptr, b.ptr);
-	b.reset();
-	return *this;
-}
-
-BoxCore BoxCore::from_xcb(xcb_connection_t* connection, std::uint32_t window, std::uint32_t width, std::uint32_t height) {
-	if (!connection)
-		throw std::logic_error("attempt to use a null connection");
-	if (!window)
-		throw std::logic_error("attempt to use a null window");
-	BoxCore out;
-	out.ptr.ptr = ffi::rt4_viewport_create(connection, window, width, height);
-	return out;
-}
-
-void BoxCore::reset() {
-	auto viewport = std::exchange(ptr, {});
-	if (viewport)
-		ffi::rt4_viewport_destroy(viewport.use());
-}
-
-ffi::Core* MutCore::use() const {
-	if (!ptr)
-		throw std::logic_error("attempt to use a null Core");
-	return ptr;
-}
-
-void MutCore::configure(std::uint32_t width, std::uint32_t height) const {
-	rt4_viewport_configure(use(), width, height);
-}
-
-void MutCore::redraw(const RedrawArgs& args) const {
-	rt4_viewport_redraw(use(), &args);
-}

ui/src/api.hxx

@@ -1,76 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-struct xcb_connection_t;
-
-namespace ffi {
-struct Core;
-
-struct SphericalPosition {
-	float yaw = 0.;
-	float pitch = 0.;
-	float distance = 1.;
-};
-
-enum class UseNormal: std::uint8_t {
-	Light,
-	Camera,
-};
-
-struct RedrawArgs {
-	SphericalPosition camera_position;
-	SphericalPosition light_position;
-	float light_radius = 1.;
-	float light_spread = 0.;
-	float accum_sigma = 1.;
-	float accum_scale = 1.;
-	std::uint8_t reflections = 0;
-	UseNormal use_normal = UseNormal::Light;
-	bool show_axes = true;
-	bool show_shapes = true;
-	bool show_hit_emission = true;
-	bool show_miss_emission = true;
-	bool show_direct_hit = true;
-	bool show_indirect_hit = true;
-	bool show_light = true;
-};
-} // namespace ffi
-
-using ffi::UseNormal;
-using ffi::RedrawArgs;
-using ffi::SphericalPosition;
-
-class MutCore {
-	friend class BoxCore;
-
-public:
-	explicit operator bool() const { return ptr; }
-
-	void configure(std::uint32_t width, std::uint32_t height) const;
-	void redraw(const RedrawArgs& args) const;
-
-private:
-	ffi::Core* ptr = nullptr;
-	ffi::Core* use() const;
-};
-
-class BoxCore {
-public:
-	BoxCore() = default;
-	BoxCore(const BoxCore&) = delete;
-	BoxCore(BoxCore&&);
-	BoxCore& operator=(const BoxCore&) = delete;
-	BoxCore& operator=(BoxCore&&);
-	~BoxCore();
-
-	explicit operator bool() const { return !!ptr; }
-	const MutCore* operator->() const { return &ptr; }
-
-	void reset();
-
-	static BoxCore from_xcb(xcb_connection_t* connection, std::uint32_t window, std::uint32_t width, std::uint32_t height);
-
-private:
-	MutCore ptr;
-};

ui/src/lib.rs

@@ -1,48 +0,0 @@
-use std::{ffi::c_void, num::NonZero, ptr::NonNull};
-
-use glam::{UVec2, uvec2};
-use photon_light::{Core, RedrawArgs, init_gpu_inner};
-use raw_window_handle::{RawDisplayHandle, RawWindowHandle, XcbDisplayHandle, XcbWindowHandle};
-
-unsafe fn create_viewport(
-	display: impl Into<RawDisplayHandle>,
-	window: impl Into<RawWindowHandle>,
-	size: UVec2,
-) -> Box<Core> {
-	let target = wgpu::SurfaceTargetUnsafe::RawHandle {
-		raw_display_handle: display.into(),
-		raw_window_handle: window.into(),
-	};
-	let gpu = pollster::block_on(init_gpu_inner(|instance| unsafe {
-		instance.create_surface_unsafe(target)
-	}))
-	.unwrap();
-	Box::new(Core::new(gpu, size))
-}
-
-#[unsafe(no_mangle)]
-unsafe extern "C" fn rt4_viewport_create(
-	connection: NonNull<c_void>,
-	window: NonZero<u32>,
-	width: u32,
-	height: u32,
-) -> Box<Core> {
-	let display = XcbDisplayHandle::new(Some(connection), 0);
-	let window = XcbWindowHandle::new(window);
-	unsafe { create_viewport(display, window, uvec2(width, height)) }
-}
-
-#[unsafe(no_mangle)]
-unsafe extern "C" fn rt4_viewport_destroy(viewport: Box<Core>) {
-	drop(viewport);
-}
-
-#[unsafe(no_mangle)]
-unsafe extern "C" fn rt4_viewport_configure(viewport: &mut Core, width: u32, height: u32) {
-	viewport.configure(uvec2(width, height));
-}
-
-#[unsafe(no_mangle)]
-unsafe extern "C" fn rt4_viewport_redraw(viewport: &mut Core, args: &RedrawArgs) {
-	viewport.redraw(args);
-}

ui/src/main.cxx

@@ -3,6 +3,9 @@
 #include <QApplication>
 
 int main(int argc, char* argv[]) {
+	// only X11 is supported so, use XCB unless overriden
+	setenv("QT_QPA_PLATFORM", "xcb", 0);
+
 	QApplication app(argc, argv);
 
 	auto w = new PhotonLight;

ui/src/viewport.cxx

@@ -63,7 +63,7 @@ void Viewport::recreate() try {
 
 	const QSize device_size = size() * devicePixelRatio();
 	core.reset();
-	core = BoxCore::from_xcb(xcb_connection, x11_window, device_size.width(), device_size.height());
+	core = Core::from_xcb((std::uintptr_t)xcb_connection, x11_window, device_size.width(), device_size.height());
 } catch (const std::exception& e) {
 	fprintf(stderr, "failed to recreate the viewport: %s", e.what());
 }

ui/src/viewport.hxx

@@ -2,7 +2,7 @@
 
 #include <QWidget>
 
-#include "api.hxx"
+#include "Core.hpp"
 
 class Viewport : public QWidget {
 	Q_OBJECT
@@ -20,7 +20,7 @@ protected:
 	void resizeEvent(QResizeEvent* event) override;
 
 private:
-	BoxCore core;
+	std::unique_ptr<Core> core;
 	RedrawArgs args = {};
 
 	void recreate();