nixify
This commit is contained in:
parent
deeb49dafc
commit
086d4b65d1
SSH key fingerprint:
SHA256:pb5NrYg80So5z9hmqQFPmp//sgr+DFeJkKhmGyU2NLk
10331
docs/package-lock.json
generated
10331
docs/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"@slidev/cli": "^0.38.5",
|
||||
"@slidev/cli": "^0.42.9",
|
||||
"@slidev/theme-default": "^0.21.2",
|
||||
"slidev-theme-academic": "^1.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"playwright-chromium": "^1.30.0"
|
||||
"scripts": {
|
||||
"build": "slidev build slides.md --base /projet-probleme-inverse-3D/"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -234,10 +234,10 @@ nuage de voxel. si nuage de points -> conversion en mesh possible grace aux marc
|
|||
### Lancer de rayon (Fast Voxel Intersect)
|
||||
|
||||
<div class="grid grid-cols-2 col-auto w-110 m-auto">
|
||||
<img src="figs/fvi_example_1.png" class="m-auto h-55"/>
|
||||
<img src="figs/fvi_example_2.png" class="m-auto h-55"/>
|
||||
<img src="figs/fvi_example_3.png" class="m-auto h-55"/>
|
||||
<img src="figs/fvi_example_4.png" class="m-auto h-55"/>
|
||||
<img src="/figs/fvi_example_1.png" class="m-auto h-55"/>
|
||||
<img src="/figs/fvi_example_2.png" class="m-auto h-55"/>
|
||||
<img src="/figs/fvi_example_3.png" class="m-auto h-55"/>
|
||||
<img src="/figs/fvi_example_4.png" class="m-auto h-55"/>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
|
|
@ -255,7 +255,7 @@ nuage de voxel. si nuage de points -> conversion en mesh possible grace aux marc
|
|||
## Résultats
|
||||
### L'environnement
|
||||
|
||||
<img src="figs/environment.png" class="m-auto h-110"/>
|
||||
<img src="/figs/environment.png" class="m-auto h-110"/>
|
||||
|
||||
---
|
||||
|
||||
|
|
@ -269,14 +269,14 @@ img.shadowy {
|
|||
</style>
|
||||
|
||||
<div class="flex items-center">
|
||||
<img src="figs/peanut_cams.png" class="h-90"/>
|
||||
<img src="/figs/peanut_cams.png" class="h-90"/>
|
||||
<div class="flex-col inline-flex gap-5">
|
||||
<img src="figs/peanut_proj_1.png" class="w-100 shadowy"/>
|
||||
<img src="figs/peanut_mask_1.png" class="w-100 shadowy"/>
|
||||
<img src="figs/peanut_proj_2.png" class="w-100 shadowy"/>
|
||||
<img src="figs/peanut_mask_2.png" class="w-100 shadowy"/>
|
||||
<img src="figs/peanut_proj_3.png" class="w-100 shadowy"/>
|
||||
<img src="figs/peanut_mask_3.png" class="w-100 shadowy"/>
|
||||
<img src="/figs/peanut_proj_1.png" class="w-100 shadowy"/>
|
||||
<img src="/figs/peanut_mask_1.png" class="w-100 shadowy"/>
|
||||
<img src="/figs/peanut_proj_2.png" class="w-100 shadowy"/>
|
||||
<img src="/figs/peanut_mask_2.png" class="w-100 shadowy"/>
|
||||
<img src="/figs/peanut_proj_3.png" class="w-100 shadowy"/>
|
||||
<img src="/figs/peanut_mask_3.png" class="w-100 shadowy"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -285,14 +285,14 @@ img.shadowy {
|
|||
## Résultats
|
||||
### L'initialisation (Shape from Silhouette)
|
||||
|
||||
<img src="figs/shape_from_silhouette.png" class="m-auto h-110">
|
||||
<img src="/figs/shape_from_silhouette.png" class="m-auto h-110">
|
||||
|
||||
---
|
||||
|
||||
## Résultats
|
||||
### Bordures
|
||||
|
||||
<img src="figs/border.png" class="m-auto h-110">
|
||||
<img src="/figs/border.png" class="m-auto h-110">
|
||||
|
||||
---
|
||||
|
||||
|
|
@ -300,8 +300,8 @@ img.shadowy {
|
|||
### Visibilité des voxels
|
||||
|
||||
<div class="h-100 flex items-center">
|
||||
<img src="figs/ray.png" class="h-105 -ml-15 -mr-15">
|
||||
<img src="figs/selected.png" class="h-105 -ml-15">
|
||||
<img src="/figs/ray.png" class="h-105 -ml-15 -mr-15">
|
||||
<img src="/figs/selected.png" class="h-105 -ml-15">
|
||||
</div>
|
||||
---
|
||||
|
||||
|
|
@ -309,8 +309,8 @@ img.shadowy {
|
|||
### Évolution du level set
|
||||
|
||||
<div class="h-100 flex items-center">
|
||||
<img src="figs/evol7bis.gif" class="m-auto h-105">
|
||||
<img src="figs/shape7bis.gif" class="m-auto h-105">
|
||||
<img src="/figs/evol7bis.gif" class="m-auto h-105">
|
||||
<img src="/figs/shape7bis.gif" class="m-auto h-105">
|
||||
</div>
|
||||
|
||||
---
|
||||
|
|
|
|||
47
flake.lock
47
flake.lock
|
|
@ -1,27 +1,32 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1673796341,
|
||||
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -33,8 +38,24 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
62
flake.nix
62
flake.nix
|
|
@ -3,27 +3,49 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
};
|
||||
systems.url = "github:nix-systems/default";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
devShell = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
poetry
|
||||
python3
|
||||
python310Packages.numpy
|
||||
tk
|
||||
python310Packages.matplotlib
|
||||
(python310Packages.opencv4.override {
|
||||
enableGtk2 = true;
|
||||
gtk2 = pkgs.gtk2;
|
||||
})
|
||||
blender
|
||||
nodejs
|
||||
];
|
||||
outputs = {flake-parts, ...} @ inputs:
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
systems = import inputs.systems;
|
||||
|
||||
perSystem = {
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}: rec {
|
||||
devShells.default = pkgs.mkShell {
|
||||
packages = packages.slides.nativeBuildInputs;
|
||||
};
|
||||
});
|
||||
|
||||
packages.slides = pkgs.stdenvNoCC.mkDerivation rec {
|
||||
name = "slides";
|
||||
|
||||
src = ./docs;
|
||||
|
||||
npmDeps = pkgs.fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-3vE+KdetU4KmXJTJqpP09afvGNQhgzCobKkWwLazHKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgs.npmHooks.npmConfigHook
|
||||
pkgs.nodejs
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
npm run build
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mv dist $out
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue