ENSEEIHT/projet-probleme-inverse-3D
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixify

Browse source
This commit is contained in:
Laureηt 2024-10-13 19:10:31 +02:00
parent deeb49dafc
commit 086d4b65d1
Signed by: Laurent
SSH key fingerprint: SHA256:pb5NrYg80So5z9hmqQFPmp//sgr+DFeJkKhmGyU2NLk
5 changed files with 3790 additions and 6692 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10327
docs/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

6
docs/package.json
View file

@ -1,10 +1,10 @@
{ {
"dependencies": { "dependencies": {
"@slidev/cli": "^0.38.5", "@slidev/cli": "^0.42.9",
"@slidev/theme-default": "^0.21.2", "@slidev/theme-default": "^0.21.2",
"slidev-theme-academic": "^1.1.3" "slidev-theme-academic": "^1.1.3"
}, },
"devDependencies": { "scripts": {
"playwright-chromium": "^1.30.0" "build": "slidev build slides.md --base /projet-probleme-inverse-3D/"
} }
} }

36
docs/slides.md
View file

@ -234,10 +234,10 @@ nuage de voxel. si nuage de points -> conversion en mesh possible grace aux marc
### Lancer de rayon (Fast Voxel Intersect) ### Lancer de rayon (Fast Voxel Intersect)
<div class="grid grid-cols-2 col-auto w-110 m-auto"> <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_1.png" class="m-auto h-55"/>
<img src="figs/fvi_example_2.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_3.png" class="m-auto h-55"/>
<img src="figs/fvi_example_4.png" class="m-auto h-55"/> <img src="/figs/fvi_example_4.png" class="m-auto h-55"/>
</div> </div>
<!-- <!--
@ -255,7 +255,7 @@ nuage de voxel. si nuage de points -> conversion en mesh possible grace aux marc
## Résultats ## Résultats
### L'environnement ### 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> </style>
<div class="flex items-center"> <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"> <div class="flex-col inline-flex gap-5">
<img src="figs/peanut_proj_1.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_mask_1.png" class="w-100 shadowy"/>
<img src="figs/peanut_proj_2.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_mask_2.png" class="w-100 shadowy"/>
<img src="figs/peanut_proj_3.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_mask_3.png" class="w-100 shadowy"/>
</div> </div>
</div> </div>
@ -285,14 +285,14 @@ img.shadowy {
## Résultats ## Résultats
### L'initialisation (Shape from Silhouette) ### 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 ## Résultats
### Bordures ### 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 ### Visibilité des voxels
<div class="h-100 flex items-center"> <div class="h-100 flex items-center">
<img src="figs/ray.png" class="h-105 -ml-15 -mr-15"> <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/selected.png" class="h-105 -ml-15">
</div> </div>
--- ---
@ -309,8 +309,8 @@ img.shadowy {
### Évolution du level set ### Évolution du level set
<div class="h-100 flex items-center"> <div class="h-100 flex items-center">
<img src="figs/evol7bis.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"> <img src="/figs/shape7bis.gif" class="m-auto h-105">
</div> </div>
--- ---

47
flake.lock
View file

@ -1,27 +1,32 @@
{ {
"nodes": { "nodes": {
"flake-utils": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1727826117,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673796341, "lastModified": 1728492678,
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,8 +38,24 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "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
View file

@ -3,27 +3,49 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; 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 }: outputs = {flake-parts, ...} @ inputs:
flake-utils.lib.eachDefaultSystem (system: flake-parts.lib.mkFlake {inherit inputs;} {
let pkgs = nixpkgs.legacyPackages.${system}; systems = import inputs.systems;
in {
devShell = pkgs.mkShell { perSystem = {
buildInputs = with pkgs; [ pkgs,
poetry system,
python3 ...
python310Packages.numpy }: rec {
tk devShells.default = pkgs.mkShell {
python310Packages.matplotlib packages = packages.slides.nativeBuildInputs;
(python310Packages.opencv4.override { };
enableGtk2 = true;
gtk2 = pkgs.gtk2; packages.slides = pkgs.stdenvNoCC.mkDerivation rec {
}) name = "slides";
blender
nodejs 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
'';
};
};
}; };
});
} }