From 00831432682b273c8ea2531914932d700448acd1 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sun, 22 Feb 2026 13:48:22 +0100 Subject: [PATCH] cleanup flake --- .clangd | 1 - .gitignore | 2 + compile_commands.json | 2 +- flake.lock | 119 +-------- flake.nix | 545 +++++++++++++++++++++--------------------- src/main.cpp | 7 +- src/renderer.cpp | 5 +- 7 files changed, 287 insertions(+), 394 deletions(-) delete mode 120000 .clangd diff --git a/.clangd b/.clangd deleted file mode 120000 index 72fbebe..0000000 --- a/.clangd +++ /dev/null @@ -1 +0,0 @@ -./cmake-build-debug/.clangd \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1c89f29..6ace9b9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ cmake-build-debug cmake-build-release /platform +/result +/.gdb_history diff --git a/compile_commands.json b/compile_commands.json index 66636ac..fd9db9d 120000 --- a/compile_commands.json +++ b/compile_commands.json @@ -1 +1 @@ -./cmake-build-debug/compile_commands.json \ No newline at end of file +./cmake-build-release/compile_commands.json \ No newline at end of file diff --git a/flake.lock b/flake.lock index eccaaf5..5e3f45e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,66 +1,5 @@ { "nodes": { - "clj-nix": { - "inputs": { - "devshell": "devshell", - "nix-fetcher-data": "nix-fetcher-data", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770563144, - "narHash": "sha256-pddc5NHWPRYmQm723SLTjXVNDi4VnMOWqVbTOkfOE9k=", - "owner": "jlesquembre", - "repo": "clj-nix", - "rev": "b439ecd3eb92737f56330c4395c2d0eba0a4dbdd", - "type": "github" - }, - "original": { - "owner": "jlesquembre", - "repo": "clj-nix", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "clj-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768818222, - "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", - "owner": "numtide", - "repo": "devshell", - "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -79,28 +18,6 @@ "type": "github" } }, - "nix-fetcher-data": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "clj-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755022803, - "narHash": "sha256-/QtBdVfZlrRJW5enUoWlBE2wrLXJBMJ45X0rZh0jiaU=", - "owner": "jlesquembre", - "repo": "nix-fetcher-data", - "rev": "9da3926b1459d6ff15268072d1c51351b82811b9", - "type": "github" - }, - "original": { - "owner": "jlesquembre", - "repo": "nix-fetcher-data", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1770843696, @@ -115,44 +32,10 @@ "type": "indirect" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - } - }, "root": { "inputs": { - "clj-nix": "clj-nix", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770865833, - "narHash": "sha256-oiARqnlvaW6pVGheVi4ye6voqCwhg5hCcGish2ZvQzI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c8cfbe26238638e2f3a2c0ae7e8d240f5e4ded85", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs" } }, "systems": { diff --git a/flake.nix b/flake.nix index e456208..09557b6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,286 +4,297 @@ rec { inputs = { nixpkgs.url = "nixpkgs"; # Use nixpkgs from system registry flake-utils.url = "github:numtide/flake-utils"; - - rust-overlay.url = "github:oxalica/rust-overlay"; - rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; - - clj-nix.url = "github:jlesquembre/clj-nix"; - clj-nix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, flake-utils, - rust-overlay, - clj-nix, }: # Create a shell (and possibly package) for each possible system, not only x86_64-linux - flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - overlays = [ - rust-overlay.overlays.default - ]; - }; - inherit (pkgs) lib stdenv; + flake-utils.lib.eachDefaultSystem ( + system: let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + overlays = []; + }; + inherit (pkgs) lib stdenv; - # =========================================================================================== - # Define custom dependencies - # =========================================================================================== + # =========================================================================================== + # Define custom dependencies + # =========================================================================================== - # 64 bit C/C++ compilers that don't collide (use the same libc) - bintools = pkgs.wrapBintoolsWith { - bintools = pkgs.bintools.bintools; # Unwrapped bintools - libc = pkgs.glibc; - }; - gcc = lib.hiPrio (pkgs.wrapCCWith { - cc = pkgs.gcc.cc; # Unwrapped gcc - libc = pkgs.glibc; - bintools = bintools; - }); - clang = pkgs.wrapCCWith { - cc = pkgs.clang.cc; # Unwrapped clang - libc = pkgs.glibc; - bintools = bintools; - }; - - # Multilib C/C++ compilers that don't collide (use the same libc) - # bintools_multilib = pkgs.wrapBintoolsWith { - # bintools = pkgs.bintools.bintools; # Unwrapped bintools - # libc = pkgs.glibc_multi; - # }; - # gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith { - # cc = pkgs.gcc.cc; # Unwrapped gcc - # libc = pkgs.glibc_multi; - # bintools = bintools_multilib; - # }); - # clang_multilib = pkgs.wrapCCWith { - # cc = pkgs.clang.cc; # Unwrapped clang - # libc = pkgs.glibc_multi; - # bintools = bintools_multilib; - # }; - - # Raylib CPP wrapper - raylib-cpp = stdenv.mkDerivation { - pname = "raylib-cpp"; - version = "5.5.0-unstable-2025-11-12"; - - src = pkgs.fetchFromGitHub { - owner = "RobLoach"; - repo = "raylib-cpp"; - rev = "21b0d0f57a09a7f741d20b7157f440ae87f02c76"; - hash = "sha256-P9x6Zc5t648gR7oYXe38PEX/a4oh4PfuVCnjT0vC10k="; + # 64 bit C/C++ compilers that don't collide (use the same libc) + bintools = pkgs.wrapBintoolsWith { + bintools = pkgs.bintools.bintools; # Unwrapped bintools + libc = pkgs.glibc; + }; + gcc = lib.hiPrio (pkgs.wrapCCWith { + cc = pkgs.gcc.cc; # Unwrapped gcc + libc = pkgs.glibc; + bintools = bintools; + }); + clang = pkgs.wrapCCWith { + cc = pkgs.clang.cc; # Unwrapped clang + libc = pkgs.glibc; + bintools = bintools; }; - # autoPatchelfHook is needed for appendRunpaths - nativeBuildInputs = with pkgs; [ - cmake - # autoPatchelfHook - ]; + # Raylib CPP wrapper + raylib-cpp = stdenv.mkDerivation { + pname = "raylib-cpp"; + version = "5.5.0-unstable-2025-11-12"; - buildInputs = with pkgs; [ - raylib - glfw - SDL2 - ]; + src = pkgs.fetchFromGitHub { + owner = "RobLoach"; + repo = "raylib-cpp"; + rev = "21b0d0f57a09a7f741d20b7157f440ae87f02c76"; + hash = "sha256-P9x6Zc5t648gR7oYXe38PEX/a4oh4PfuVCnjT0vC10k="; + }; - propagatedBuildInputs = with pkgs; [ - libGLU - libx11 - ]; - - cmakeFlags = [ - "-DBUILD_RAYLIB_CPP_EXAMPLES=OFF" - "-DBUILD_TESTING=OFF" - # Point CMake to the nixpkgs raylib so it doesn't try to fetch its own - "-Draylib_DIR=${pkgs.raylib}/lib/cmake/raylib" - ]; - }; - - # =========================================================================================== - # Specify dependencies - # https://nixos.org/manual/nixpkgs/stable/#ssec-stdenv-dependencies-overview - # Just for a "nix develop" shell, buildInputs can be used for everything. - # =========================================================================================== - - # Add dependencies to nativeBuildInputs if they are executed during the build: - # - Those which are needed on $PATH during the build, for example cmake and pkg-config - # - Setup hooks, for example makeWrapper - # - Interpreters needed by patchShebangs for build scripts (with the --build flag), which can be the case for e.g. perl - nativeBuildInputs = with pkgs; [ - # Languages: - # bintools - gcc - # clang - # bintools_multilib - # gcc_multilib - # clang_multilib - - # C/C++: - gdb - valgrind - # gnumake - cmake - # pkg-config - # clang-tools - # compdb - # pprof - gprof2dot - kdePackages.kcachegrind - ]; - - # Add dependencies to buildInputs if they will end up copied or linked into the final output or otherwise used at runtime: - # - Libraries used by compilers, for example zlib - # - Interpreters needed by patchShebangs for scripts which are installed, which can be the case for e.g. perl - buildInputs = with pkgs; [ - # C/C++: - # boost - # sfml - raylib - llvmPackages.openmp - # raylib-cpp - # tinyobjloader - # gperftools - ]; - # =========================================================================================== - # Define buildable + installable packages - # =========================================================================================== - # package = stdenv.mkDerivation { - # inherit nativeBuildInputs buildInputs; - # pname = ""; - # version = "1.0.0"; - # src = ./.; - # - # installPhase = '' - # mkdir -p $out/bin - # mv ./BINARY $out/bin - # ''; - # }; - in rec { - # Provide package for "nix build" - # defaultPackage = package; - # defaultApp = flake-utils.lib.mkApp { - # drv = defaultPackage; - # }; - - # Provide environment for "nix develop" - devShell = pkgs.mkShell { - inherit nativeBuildInputs buildInputs; - name = description; - - # ========================================================================================= - # Define environment variables - # ========================================================================================= - - # Custom dynamic libraries: - # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [ - # # Rust Bevy GUI app: - # # "${pkgs.xorg.libX11}/lib" - # # "${pkgs.xorg.libXcursor}/lib" - # # "${pkgs.xorg.libXrandr}/lib" - # # "${pkgs.xorg.libXi}/lib" - # # "${pkgs.libGL}/lib" - # - # # JavaFX app: - # # "${pkgs.libGL}/lib" - # # "${pkgs.gtk3}/lib" - # # "${pkgs.glib.out}/lib" - # # "${pkgs.xorg.libXtst}/lib" - # ]; - - # Dynamic libraries from buildinputs: - LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs; - - # ========================================================================================= - # Define shell environment - # ========================================================================================= - - # Setup the shell when entering the "nix develop" environment (bash script). - shellHook = let - mkCmakeScript = type: let - typeLower = lib.toLower type; - in - pkgs.writers.writeFish "cmake-${typeLower}.fish" '' - cd $FLAKE_PROJECT_ROOT - - # set -g -x CC ${clang}/bin/clang - # set -g -x CXX ${clang}/bin/clang++ - - echo "Removing build directory ./cmake-build-${typeLower}/" - rm -rf ./cmake-build-${typeLower} - - echo "Creating build directory" - mkdir cmake-build-${typeLower} - cd cmake-build-${typeLower} - - echo "Running cmake" - cmake -G "Unix Makefiles" \ - -DCMAKE_BUILD_TYPE="${type}" \ - .. - - echo "Generating .clangd" - echo "CompileFlags:" >> .clangd - echo " Add:" >> .clangd - echo " - \"-I${pkgs.raylib}/include\"" >> .clangd - - echo "Linking compile_commands.json" - cd .. - ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json - - echo "Linking .clangd" - ln -sf ./cmake-build-${typeLower}/.clangd ./.clangd - ''; - - cmakeDebug = mkCmakeScript "Debug"; - cmakeRelease = mkCmakeScript "Release"; - - mkBuildScript = type: let - typeLower = lib.toLower type; - in - pkgs.writers.writeFish "cmake-build.fish" '' - cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower} - - echo "Running cmake" - cmake --build . -j$(nproc) - ''; - - buildDebug = mkBuildScript "Debug"; - buildRelease = mkBuildScript "Release"; - - # Use this to specify commands that should be ran after entering fish shell - initProjectShell = pkgs.writers.writeFish "init-shell.fish" '' - echo "Entering \"${description}\" environment..." - - # Determine the project root, used e.g. in cmake scripts - set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel) - - # Rust Bevy: - # abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc" - - # C/C++: - abbr -a cmake-debug "${cmakeDebug}" - abbr -a cmake-release "${cmakeRelease}" - abbr -a build-debug "${buildDebug}" - abbr -a build-release "${buildRelease}" - - # Clojure: - # abbr -a clojure-deps "deps-lock --lein" - - # Python: - # abbr -a run "python ./app/main.py" - # abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg" - # abbr -a ptop "py-spy top -- python ./app/main.py" - ''; - in - builtins.concatStringsSep "\n" [ - # Launch into pure fish shell - '' - exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'" - '' + # autoPatchelfHook is needed for appendRunpaths + nativeBuildInputs = with pkgs; [ + cmake + # autoPatchelfHook ]; - }; - }); + + buildInputs = with pkgs; [ + raylib + glfw + SDL2 + ]; + + propagatedBuildInputs = with pkgs; [ + libGLU + libx11 + ]; + + cmakeFlags = [ + "-DBUILD_RAYLIB_CPP_EXAMPLES=OFF" + "-DBUILD_TESTING=OFF" + # Point CMake to the nixpkgs raylib so it doesn't try to fetch its own + "-Draylib_DIR=${pkgs.raylib}/lib/cmake/raylib" + ]; + }; + + # =========================================================================================== + # Specify dependencies + # https://nixos.org/manual/nixpkgs/stable/#ssec-stdenv-dependencies-overview + # Just for a "nix develop" shell, buildInputs can be used for everything. + # =========================================================================================== + + # Add dependencies to nativeBuildInputs if they are executed during the build: + # - Those which are needed on $PATH during the build, for example cmake and pkg-config + # - Setup hooks, for example makeWrapper + # - Interpreters needed by patchShebangs for build scripts (with the --build flag), which can be the case for e.g. perl + nativeBuildInputs = with pkgs; [ + # Languages: + # bintools + gcc + # clang + # bintools_multilib + # gcc_multilib + # clang_multilib + + # C/C++: + gdb + valgrind + # gnumake + cmake + # pkg-config + # clang-tools + # compdb + # pprof + gprof2dot + kdePackages.kcachegrind + gdbgui + # renderdoc + ]; + + # Add dependencies to buildInputs if they will end up copied or linked into the final output or otherwise used at runtime: + # - Libraries used by compilers, for example zlib + # - Interpreters needed by patchShebangs for scripts which are installed, which can be the case for e.g. perl + buildInputs = with pkgs; [ + # C/C++: + # boost + # sfml + raylib + llvmPackages.openmp # not required for compilation but for clangd to find the headers + # raylib-cpp + # tinyobjloader + # gperftools + ]; + # =========================================================================================== + # Define buildable + installable packages + # =========================================================================================== + package = stdenv.mkDerivation rec { + inherit buildInputs; + pname = "masssprings"; + version = "0.0.1"; + src = ./.; + + nativeBuildInputs = with pkgs; [ + gcc + cmake + ]; + + installPhase = '' + mkdir -p $out/bin + mv ./${pname} $out/bin + ''; + }; + in rec { + # Provide package for "nix build" + defaultPackage = package; + defaultApp = flake-utils.lib.mkApp { + drv = defaultPackage; + }; + + # Provide environment for "nix develop" + devShells = { + default = pkgs.mkShell { + inherit nativeBuildInputs buildInputs; + name = description; + + # ========================================================================================= + # Define environment variables + # ========================================================================================= + + # Custom dynamic libraries: + # LD_LIBRARY_PATH = builtins.concatStringsSep ":" [ + # # Rust Bevy GUI app: + # # "${pkgs.xorg.libX11}/lib" + # # "${pkgs.xorg.libXcursor}/lib" + # # "${pkgs.xorg.libXrandr}/lib" + # # "${pkgs.xorg.libXi}/lib" + # # "${pkgs.libGL}/lib" + # + # # JavaFX app: + # # "${pkgs.libGL}/lib" + # # "${pkgs.gtk3}/lib" + # # "${pkgs.glib.out}/lib" + # # "${pkgs.xorg.libXtst}/lib" + # ]; + + # Dynamic libraries from buildinputs: + LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs; + + # ========================================================================================= + # Define shell environment + # ========================================================================================= + + # Setup the shell when entering the "nix develop" environment (bash script). + shellHook = let + mkCmakeScript = type: let + typeLower = lib.toLower type; + in + pkgs.writers.writeFish "cmake-${typeLower}.fish" '' + cd $FLAKE_PROJECT_ROOT + + # set -g -x CC ${clang}/bin/clang + # set -g -x CXX ${clang}/bin/clang++ + + echo "Removing build directory ./cmake-build-${typeLower}/" + rm -rf ./cmake-build-${typeLower} + + echo "Creating build directory" + mkdir cmake-build-${typeLower} + cd cmake-build-${typeLower} + + echo "Running cmake" + cmake -G "Unix Makefiles" \ + -DCMAKE_BUILD_TYPE="${type}" \ + .. + + echo "Linking compile_commands.json" + cd .. + ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json + ''; + + cmakeDebug = mkCmakeScript "Debug"; + cmakeRelease = mkCmakeScript "Release"; + + mkBuildScript = type: let + typeLower = lib.toLower type; + in + pkgs.writers.writeFish "cmake-build.fish" '' + cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower} + + echo "Running cmake" + cmake --build . -j$(nproc) + ''; + + buildDebug = mkBuildScript "Debug"; + buildRelease = mkBuildScript "Release"; + + # Use this to specify commands that should be ran after entering fish shell + initProjectShell = pkgs.writers.writeFish "init-shell.fish" '' + echo "Entering \"${description}\" environment..." + + # Determine the project root, used e.g. in cmake scripts + set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel) + + # C/C++: + abbr -a cmake-debug "${cmakeDebug}" + abbr -a cmake-release "${cmakeRelease}" + abbr -a build-debug "${buildDebug}" + abbr -a build-release "${buildRelease}" + abbr -a debug "${buildDebug} && ./cmake-build-debug/masssprings" + abbr -a release "${buildRelease} && ./cmake-build-release/masssprings" + ''; + in + builtins.concatStringsSep "\n" [ + # Launch into pure fish shell + '' + exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'" + '' + ]; + }; + + # TODO: Doesn't work + + # FHS environment for renderdoc. Access with "nix develop .#renderdoc". + # https://ryantm.github.io/nixpkgs/builders/special/fhs-environments + # renderdoc = + # (pkgs.buildFHSEnv { + # name = "renderdoc-env"; + # + # targetPkgs = pkgs: + # with pkgs; [ + # # RenderDoc + # renderdoc + # + # # Build tools + # gcc + # cmake + # + # # Raylib + # raylib + # libGL + # mesa + # + # # X11 + # libx11 + # libxcursor + # libxrandr + # libxinerama + # libxi + # libxext + # libxfixes + # + # # Wayland + # wayland + # wayland-protocols + # libxkbcommon + # ]; + # + # runScript = "fish"; + # + # profile = '' + # ''; + # }).env; + }; + } + ); } diff --git a/src/main.cpp b/src/main.cpp index bed3c72..d27022a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,11 +26,6 @@ // - Click states to display them in the board // - Find shortest path to any winning state and mark it in the graph // - Also mark the next move along the path on the board -// TODO: Don't tie the simulation step resolution to the FPS (frametime) -// - This breaks the simulation on slower systems -// - Add a modifiable speed setting? -// - Clamp the frametime? -// - Use a fixed step size and control how often it runs per frame? auto main(int argc, char *argv[]) -> int { // if (argc < 2) { @@ -43,7 +38,7 @@ auto main(int argc, char *argv[]) -> int { #endif // RayLib window setup - // SetTraceLogLevel(LOG_ERROR); + SetTraceLogLevel(LOG_ERROR); // SetConfigFlags(FLAG_VSYNC_HINT); SetConfigFlags(FLAG_MSAA_4X_HINT); SetConfigFlags(FLAG_WINDOW_RESIZABLE); diff --git a/src/renderer.cpp b/src/renderer.cpp index 361c482..828ef71 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -1,7 +1,6 @@ #include "renderer.hpp" #include -#include #include #include #include @@ -12,6 +11,10 @@ #include "klotski.hpp" #include "mass_springs.hpp" +#ifdef BATCHING +#include +#endif + auto OrbitCamera3D::Update(const Mass ¤t_mass) -> void { Vector2 mouse = GetMousePosition(); if (mouse.x >= GetScreenWidth() / 2.0 && mouse.y >= MENU_HEIGHT) {