diff --git a/.gitignore b/.gitignore index ab20bb0..ac6e4e6 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,8 @@ id_ed25519* /external/glfw-src/ /external/glm-src/ /external/tinyobjloader-src/ + +# Journaux de build et de lancement +*.log +build_log.txt +build-*/ diff --git a/README.md b/README.md index c49f479..2a3638e 100644 --- a/README.md +++ b/README.md @@ -86,3 +86,10 @@ memoire GPU exacte, allocations Vulkan, pool de geometrie). shaders/ GLSL compiles en SPIR-V par CMake tools/ build, tests, harnais Vulkan, preparation des donnees tests/ tests headless de la logique de jeu + +## Donnees et licence + +- Relief et sol : **IGN - Programme LiDAR HD** (Licence Ouverte Etalab 2.0). + La texture du sol (`assets/terrain/vercora_zone_ortho.vcto`) est derivee de donnees IGN sous la meme licence. +- Le placement des gisements dans le jeu est une approximation de gameplay, pas une carte geologique. +- Code : aucune licence libre pour le moment, tous droits reserves (Theo Gastinel). Le depot est public pour etre lu, pas reutilise. diff --git a/build_log.txt b/build_log.txt deleted file mode 100644 index efd5647..0000000 --- a/build_log.txt +++ /dev/null @@ -1,45 +0,0 @@ -Vulkan SDK : C:\VulkanSDK\1.4.357.0 --- Including Win32 support -.\tools\build.bat : CMake Warning (deprecated) at external/glm-src/CMakeLists.txt:1 (cmake_minimum_required): -Au caractère Ligne:1 : 348 -+ ... theog\Documents\_CODE\_Vercora"; .\tools\build.bat Debug 2>&1 | Tee-O ... -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - + CategoryInfo : NotSpecified: (CMake Warning (...imum_required)::String) [], RemoteException - + FullyQualifiedErrorId : NativeCommandError - - Compatibility with CMake < 3.10 will be removed from a future version of - CMake. - - Update the VERSION argument value. Or, use the ... syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier. -This warning is for project developers. Use -Wno-author or -Wno-deprecated -to suppress it. - -CMake Warning (deprecated) at external/glm-src/CMakeLists.txt:2 (cmake_policy): - Compatibility with CMake < 3.10 will be removed from a future version of - CMake. - - Update the VERSION argument value. Or, use the ... syntax - to tell CMake that the project requires at least but has been updated - to work with policies introduced by or earlier. -This warning is for project developers. Use -Wno-author or -Wno-deprecated -to suppress it. - --- GLM: Version 1.0.1 --- GLM: Build with C++ features auto detection --- Configuring done (0.5s) --- Generating done (0.1s) --- Build files have been written to: C:/Users/theog/Documents/_CODE/_Vercora/build -[1/4] Building CXX object CMakeFiles\vercora.dir\src\renderer\Pipeline.cpp.obj -[2/4] Building CXX object CMakeFiles\vercora.dir\src\core\Paths.cpp.obj -[3/4] Building CXX object CMakeFiles\vercora.dir\src\main.cpp.obj -[4/4] Linking CXX executable vercora.exe -FAILED: [code=4294967295] vercora.exe -C:\WINDOWS\system32\cmd.exe /C "cd . && "C:\Program Files\CMake\bin\cmake.exe" -E vs_link_exe --msvc-ver=1951 --intdir=CMakeFiles\vercora.dir --rc="C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\rc.exe" --mt="C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\mt.exe" --manifests -- "C:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.51.36231\bin\Hostx64\x64\link.exe" /nologo CMakeFiles\vercora.dir\src\main.cpp.obj CMakeFiles\vercora.dir\src\core\Window.cpp.obj CMakeFiles\vercora.dir\src\core\Camera.cpp.obj CMakeFiles\vercora.dir\src\core\Paths.cpp.obj CMakeFiles\vercora.dir\src\assets\ObjLoader.cpp.obj CMakeFiles\vercora.dir\src\assets\Heightmap.cpp.obj CMakeFiles\vercora.dir\src\assets\TerrainFile.cpp.obj CMakeFiles\vercora.dir\src\assets\TextureFile.cpp.obj CMakeFiles\vercora.dir\src\world\TreeMesh.cpp.obj CMakeFiles\vercora.dir\src\world\StoneMesh.cpp.obj CMakeFiles\vercora.dir\src\world\Tree.cpp.obj CMakeFiles\vercora.dir\src\world\Ground.cpp.obj CMakeFiles\vercora.dir\src\world\Knapping.cpp.obj CMakeFiles\vercora.dir\src\world\Forest.cpp.obj CMakeFiles\vercora.dir\src\world\Habitat.cpp.obj CMakeFiles\vercora.dir\src\world\Wildlife.cpp.obj CMakeFiles\vercora.dir\src\world\AnimalMesh.cpp.obj CMakeFiles\vercora.dir\src\world\Vegetation.cpp.obj CMakeFiles\vercora.dir\src\world\GrassMesh.cpp.obj CMakeFiles\vercora.dir\src\world\Paraglider.cpp.obj CMakeFiles\vercora.dir\src\world\Bike.cpp.obj CMakeFiles\vercora.dir\src\world\Climber.cpp.obj CMakeFiles\vercora.dir\src\world\Needs.cpp.obj CMakeFiles\vercora.dir\src\world\WaterSource.cpp.obj CMakeFiles\vercora.dir\src\world\TerrainQuadtree.cpp.obj CMakeFiles\vercora.dir\src\editor\EditorAssets.cpp.obj CMakeFiles\vercora.dir\src\editor\AssetCatalog.cpp.obj CMakeFiles\vercora.dir\src\editor\EditorScene.cpp.obj CMakeFiles\vercora.dir\src\editor\EditorController.cpp.obj CMakeFiles\vercora.dir\src\editor\SceneFile.cpp.obj CMakeFiles\vercora.dir\src\renderer\VulkanContext.cpp.obj CMakeFiles\vercora.dir\src\renderer\VulkanBuffer.cpp.obj CMakeFiles\vercora.dir\src\renderer\Mesh.cpp.obj CMakeFiles\vercora.dir\src\renderer\TerrainMesh.cpp.obj CMakeFiles\vercora.dir\src\renderer\TerrainNodeMesh.cpp.obj CMakeFiles\vercora.dir\src\renderer\TerrainStreamer.cpp.obj CMakeFiles\vercora.dir\src\renderer\SwapChain.cpp.obj CMakeFiles\vercora.dir\src\renderer\Pipeline.cpp.obj CMakeFiles\vercora.dir\src\renderer\Renderer.cpp.obj CMakeFiles\vercora.dir\src\renderer\Texture.cpp.obj /out:vercora.exe /implib:vercora.lib /pdb:vercora.pdb /version:0.0 /machine:x64 /debug /INCREMENTAL /subsystem:console C:\VulkanSDK\1.4.357.0\Lib\vulkan-1.lib C:\Users\theog\Documents\_CODE\_Vercora\external\glfw-build\src\glfw3.lib C:\Users\theog\Documents\_CODE\_Vercora\external\glm-build\glm\glm.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib && cd ." -LINK Pass 1: command "C:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.51.36231\bin\Hostx64\x64\link.exe /nologo CMakeFiles\vercora.dir\src\main.cpp.obj CMakeFiles\vercora.dir\src\core\Window.cpp.obj CMakeFiles\vercora.dir\src\core\Camera.cpp.obj CMakeFiles\vercora.dir\src\core\Paths.cpp.obj CMakeFiles\vercora.dir\src\assets\ObjLoader.cpp.obj CMakeFiles\vercora.dir\src\assets\Heightmap.cpp.obj CMakeFiles\vercora.dir\src\assets\TerrainFile.cpp.obj CMakeFiles\vercora.dir\src\assets\TextureFile.cpp.obj CMakeFiles\vercora.dir\src\world\TreeMesh.cpp.obj CMakeFiles\vercora.dir\src\world\StoneMesh.cpp.obj CMakeFiles\vercora.dir\src\world\Tree.cpp.obj CMakeFiles\vercora.dir\src\world\Ground.cpp.obj CMakeFiles\vercora.dir\src\world\Knapping.cpp.obj CMakeFiles\vercora.dir\src\world\Forest.cpp.obj CMakeFiles\vercora.dir\src\world\Habitat.cpp.obj CMakeFiles\vercora.dir\src\world\Wildlife.cpp.obj CMakeFiles\vercora.dir\src\world\AnimalMesh.cpp.obj CMakeFiles\vercora.dir\src\world\Vegetation.cpp.obj CMakeFiles\vercora.dir\src\world\GrassMesh.cpp.obj CMakeFiles\vercora.dir\src\world\Paraglider.cpp.obj CMakeFiles\vercora.dir\src\world\Bike.cpp.obj CMakeFiles\vercora.dir\src\world\Climber.cpp.obj CMakeFiles\vercora.dir\src\world\Needs.cpp.obj CMakeFiles\vercora.dir\src\world\WaterSource.cpp.obj CMakeFiles\vercora.dir\src\world\TerrainQuadtree.cpp.obj CMakeFiles\vercora.dir\src\editor\EditorAssets.cpp.obj CMakeFiles\vercora.dir\src\editor\AssetCatalog.cpp.obj CMakeFiles\vercora.dir\src\editor\EditorScene.cpp.obj CMakeFiles\vercora.dir\src\editor\EditorController.cpp.obj CMakeFiles\vercora.dir\src\editor\SceneFile.cpp.obj CMakeFiles\vercora.dir\src\renderer\VulkanContext.cpp.obj CMakeFiles\vercora.dir\src\renderer\VulkanBuffer.cpp.obj CMakeFiles\vercora.dir\src\renderer\Mesh.cpp.obj CMakeFiles\vercora.dir\src\renderer\TerrainMesh.cpp.obj CMakeFiles\vercora.dir\src\renderer\TerrainNodeMesh.cpp.obj CMakeFiles\vercora.dir\src\renderer\TerrainStreamer.cpp.obj CMakeFiles\vercora.dir\src\renderer\SwapChain.cpp.obj CMakeFiles\vercora.dir\src\renderer\Pipeline.cpp.obj CMakeFiles\vercora.dir\src\renderer\Renderer.cpp.obj CMakeFiles\vercora.dir\src\renderer\Texture.cpp.obj /out:vercora.exe /implib:vercora.lib /pdb:vercora.pdb /version:0.0 /machine:x64 /debug /INCREMENTAL /subsystem:console C:\VulkanSDK\1.4.357.0\Lib\vulkan-1.lib C:\Users\theog\Documents\_CODE\_Vercora\external\glfw-build\src\glfw3.lib C:\Users\theog\Documents\_CODE\_Vercora\external\glm-build\glm\glm.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:CMakeFiles\vercora.dir/intermediate.manifest CMakeFiles\vercora.dir/manifest.res" failed (exit code 1168) with the following output: -LINK : fatal error LNK1168: impossible d'ouvrir vercora.exe pour écrire - -ninja: build stopped: subcommand failed. - -[OK] Build Debug termine : C:\Users\theog\Documents\_CODE\_Vercora\tools\..\build\vercora.exe diff --git a/tools/bench_runner.ps1 b/tools/bench_runner.ps1 index bd311f5..c4f7c5a 100644 --- a/tools/bench_runner.ps1 +++ b/tools/bench_runner.ps1 @@ -4,7 +4,7 @@ param( [string]$TargetDesktop = "Bench Vercora" ) -$root = "C:\Users\theog\Documents\_CODE\4-vercors\vercora" +$root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path $exe = Join-Path $root "build\vercora.exe" $vd = Join-Path $root "tools\VirtualDesktop.exe" $logPath = Join-Path $root $LogFile diff --git a/tools/deploy_beta_to_desktop.ps1 b/tools/deploy_beta_to_desktop.ps1 index 87071a0..957d5c3 100644 --- a/tools/deploy_beta_to_desktop.ps1 +++ b/tools/deploy_beta_to_desktop.ps1 @@ -1,4 +1,4 @@ -$dest = "C:\Users\theog\Desktop\Vercora.Beta" +$dest = Join-Path ([Environment]::GetFolderPath("Desktop")) "Vercora.Beta" if (-not (Test-Path $dest)) { New-Item -ItemType Directory -Path $dest -Force | Out-Null } diff --git a/tools/launch_interactive.ps1 b/tools/launch_interactive.ps1 index dff38c7..6b36f54 100644 --- a/tools/launch_interactive.ps1 +++ b/tools/launch_interactive.ps1 @@ -86,7 +86,7 @@ public class DesktopLauncher { Add-Type -TypeDefinition $code -$root = "C:\Users\theog\Documents\_CODE\4-vercors\vercora" +$root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path $exe = Join-Path $root "build\vercora.exe" $cmd = "`"$exe`" $GameArgs" diff --git a/tools/run_all_benchmarks.ps1 b/tools/run_all_benchmarks.ps1 index 90cd211..538c41f 100644 --- a/tools/run_all_benchmarks.ps1 +++ b/tools/run_all_benchmarks.ps1 @@ -1,4 +1,4 @@ -$root = "C:\Users\theog\Documents\_CODE\4-vercors\vercora" +$root = (Resolve-Path (Join-Path $PSScriptRoot "..")).Path $runner = Join-Path $root "tools\bench_runner.ps1" $scenarios = @(