Skip to content
Open

Dev #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
a49e89d
Add radix prefix
Martin-cg Apr 11, 2025
0e9133e
Enforce C++20
Martin-cg Apr 14, 2025
6c6e56f
Add radix prefix
Martin-cg Apr 14, 2025
6c6cca4
Fix missing #include <string>
Martin-cg Apr 14, 2025
3baa137
Initial commit.
polskus Apr 22, 2025
1119c18
Add OpenGL Shader handling.
polskus May 1, 2025
a29c7a6
Add OpenGL ShaderProgram and Uniform handling.
polskus May 1, 2025
fbb3bd4
Add Shader files to resources.
polskus May 1, 2025
361c30c
Add missing cpp files to CMake.
polskus May 1, 2025
f36ce06
Add Buffer
polskus May 2, 2025
3b02fb1
Commit current WIP state.
polskus May 2, 2025
8723049
Add octree based mesh generation (WIP)
Martin-cg May 2, 2025
1fbd1f9
Add octree based mesh generation (WIP)
Martin-cg May 2, 2025
2a95efc
Merge branch 'structura-fundamentalis' of github.com:AlpineMapsOrg/te…
Martin-cg May 2, 2025
e8e2ee4
work on updated cmake setup (compiles with custom gdal version)
adam-ce May 4, 2025
dd46587
disable unnecessary executable targets, and many gdal features.
adam-ce May 4, 2025
bb1068c
compiles and tests run
adam-ce May 5, 2025
27514c4
clean up / remove FetchContent
adam-ce May 5, 2025
f228c84
clean away tntn
adam-ce May 5, 2025
c524262
further clean up
adam-ce May 5, 2025
3af29b7
include cgal from the repo
adam-ce May 5, 2025
acdcc76
build gdal and proj in the config step
adam-ce May 5, 2025
1f9175c
i'm confused about the quoting. chatgpt and gemini tell to quote, but…
adam-ce May 5, 2025
b90b0de
update cmake scripts
adam-ce May 5, 2025
3425896
create alp_setup_cmake_project and use it for gdal, cgal, boost and o…
adam-ce May 6, 2025
e01efae
Remove out of bounds node access
Martin-cg May 7, 2025
6b23850
Merge remote-tracking branch 'origin/structura-fundamentalis' into st…
Martin-cg May 7, 2025
5bac07d
Make child and children return std::optional
Martin-cg May 7, 2025
3d19a29
Add WIP octree. Needs refactoring.
polskus May 7, 2025
dcaf9f4
add cmake params to the cache version
adam-ce May 7, 2025
543c666
thin down opencv
adam-ce May 7, 2025
eded55f
Fix holes between node meshes
Martin-cg May 7, 2025
ad87ed1
Fix octree id tests
Martin-cg May 7, 2025
1208dc4
Minor refactoring
Martin-cg May 7, 2025
18d18b6
Fix mesh io tests
Martin-cg May 7, 2025
71640af
Merge branch 'dev' into structura-fundamentalis
Martin-cg May 7, 2025
12534a8
update cmake scripts
adam-ce May 8, 2025
2dcacd0
fix opencv linking
adam-ce May 8, 2025
0e711c4
code style for cgal header
adam-ce May 8, 2025
690f826
try fix gdal for martin
adam-ce May 8, 2025
a3e7b36
Merge branch 'dev' into structura-fundamentalis
Martin-cg May 8, 2025
15dca6a
fix opencv setup (build with jpeg and png)
adam-ce May 8, 2025
414a468
build in parallel even with make (hopefully)
adam-ce May 8, 2025
dd7f3ed
Add batch building
Martin-cg May 9, 2025
2dcc556
Handle Window resize.
polskus May 9, 2025
a2f0acf
Add imgui. Add Camera Settings Window.
polskus May 9, 2025
6125e08
Merge branch 'dev' into structura-fundamentalis
Martin-cg May 11, 2025
43ffa4b
Refactoring
Martin-cg May 12, 2025
16d5194
Move octree classes to terrainlib
Martin-cg May 13, 2025
1c1a129
Use short nested namespaces
Martin-cg May 13, 2025
15cdb05
Move project into subfolder in preparation for integration into monor…
polskus May 21, 2025
4e2fb4b
Finish octree storage; Refactoring
Martin-cg May 23, 2025
c5b57e0
Merge remote-tracking branch 'alpenite-browser-single-repo/main' into…
polskus May 21, 2025
cce3037
Fix path to string conversion on windows.
polskus May 23, 2025
5637fba
Integrate browser into monorepo CMake.
polskus May 23, 2025
925e4bf
Remove unneeded submodule.
polskus May 23, 2025
5cef3e3
Merge branch 'dev' into browser
polskus May 23, 2025
3a05b3f
Merge branch 'structura-fundamentalis' of github.com:AlpineMapsOrg/te…
polskus May 23, 2025
c05a901
Fix string related error in string_utils.h
polskus May 23, 2025
7f8e362
Make transform_points_inplace into a single function
Martin-cg May 24, 2025
29d12ed
Minor fixes and refactoring
Martin-cg May 24, 2025
b7004e7
Bring back tilebuilder
Martin-cg May 29, 2025
a561630
Fix terrainmerger tests
Martin-cg May 29, 2025
351b68f
Fix terrainconvert
Martin-cg May 29, 2025
129baee
Correctly handle empty storage folder
Martin-cg May 29, 2025
e5231a3
Fix tile_downloader
Martin-cg May 29, 2025
f37f725
Remove old batch scripts
Martin-cg May 29, 2025
273a2d2
Update index in storage ops
Martin-cg May 29, 2025
8356c24
Rename terrainmerger
Martin-cg May 29, 2025
8a0cd84
Move terrainlib tests to correct location
Martin-cg May 29, 2025
9a1fddb
Split IndexMap and Space into .h and .cpp
Martin-cg May 29, 2025
f0edc02
Add index accessor on Storage
Martin-cg May 29, 2025
d7ecba5
Fix tests
Martin-cg May 29, 2025
26bd671
Fix octree traverse and add tests
Martin-cg May 29, 2025
6ef2d64
Fix build of terrainsimplify
Martin-cg May 30, 2025
bb76799
Add ensure_indexed on Storage
Martin-cg May 30, 2025
135e998
Fix constness warning in terrainbuilder
Martin-cg May 30, 2025
635406d
Add status to traversal visit
Martin-cg May 30, 2025
c1b9340
Create output dir in terrainbuilder
Martin-cg May 30, 2025
c00ec9f
Move mesh clipping and reindexing into terrainlib
Martin-cg May 30, 2025
5c6369f
Require exact height bounds and compute if needed
Martin-cg May 30, 2025
ac69e5b
Fix comparison of NodeStatus in edge cases
Martin-cg May 30, 2025
9003a3d
Fix build of browser on windows
Martin-cg Jun 3, 2025
bb10eee
Initial version of terrainmerger
Martin-cg Jun 4, 2025
c1e4b6d
Rework Dataset a bit
Martin-cg Jun 4, 2025
d021ec1
Move cgal defs to terrainlib
Martin-cg Jun 4, 2025
4a5e3f0
Fix: Add cgal as terrainlib dep
Martin-cg Jun 7, 2025
f82b02b
Fix: warning in terrainlib unittest
Martin-cg Jun 7, 2025
564fa44
Fix: terrainlib unittests and impl
Martin-cg Jun 7, 2025
4d340bb
Fix unittests
Martin-cg Jun 7, 2025
9ee12ef
Update Catch2 to 3.8.1
Martin-cg Jun 7, 2025
84a365d
Move mat_equals to helper header
Martin-cg Jun 13, 2025
205fe3f
Speed up and fix mesh clipping
Martin-cg Jun 13, 2025
a43a402
WIP terrainmerger
Martin-cg Jul 3, 2025
747bba1
Remove IStorage
Martin-cg Jul 3, 2025
ea8c3a0
Fix bug with degenerate triangles in clip_on_bounds
Martin-cg Jul 3, 2025
590a9f7
Create hardlinks when copying nodes
Martin-cg Jul 3, 2025
d852f16
Add --threads to terrainbuilder
Martin-cg Jul 4, 2025
239303d
Fix some unused warnings on release
Martin-cg Jul 4, 2025
2338128
Fix SphereProjector, add tests and move to new file
Martin-cg Jul 4, 2025
6b787a9
Add cut subcommand
Martin-cg Jul 4, 2025
c55f0df
Minor fixes
Martin-cg Jul 4, 2025
1eff2e9
Add index browser
Martin-cg Jul 5, 2025
19aae31
Rewrite terrainmerger
Martin-cg Aug 6, 2025
1085121
Prepare for new mesh merging
Martin-cg Aug 6, 2025
f7785b1
Rewrite mesh merging
Martin-cg Aug 7, 2025
14786fd
Merger rewrite done (but slow)
Martin-cg Aug 12, 2025
3c3afd6
Fix terrainbuilder
Martin-cg Aug 12, 2025
eb12ac4
Fix index building
Martin-cg Aug 12, 2025
23e7eab
Support showing mesh metadata in index_browser
Martin-cg Aug 12, 2025
44d42e9
Mostly fix merger, fix clipper
Martin-cg Aug 14, 2025
b3d79d3
Add mesh merger utility
Martin-cg Aug 15, 2025
85626ae
Finish terrainmerger (mostly)
Martin-cg Aug 15, 2025
c30c842
Ignore vertical distance during merging
Martin-cg Aug 15, 2025
b369655
Remove tntn docs
Martin-cg Aug 15, 2025
269fb4d
Only consider the boundary for merging
Martin-cg Aug 15, 2025
cb3b7d3
Finish terrainmerger (except textures on merged meshes)
Martin-cg Aug 21, 2025
f62645c
Only consider boundary when merging
Martin-cg Aug 21, 2025
1421ef1
Refactoring and fixes
Martin-cg Aug 21, 2025
db31f90
Refactor merging api
Martin-cg Aug 21, 2025
7bcb6cc
Fix mesh textures (breaks hole filling)
Martin-cg Sep 2, 2025
f9593d3
Fix tests
Martin-cg Sep 25, 2025
2db9294
Various fixes
Martin-cg Sep 25, 2025
87ba767
Fix hole filling between merged meshes
Martin-cg Sep 26, 2025
940b227
Cleanup
Martin-cg Sep 26, 2025
0ac7383
Cleanup
Martin-cg Sep 26, 2025
bcbd52c
Alternative merging; trim textures
Martin-cg Oct 2, 2025
68182b0
Merge branch 'structura-fundamentalis' of github.com:AlpineMapsOrg/te…
Martin-cg Oct 2, 2025
67bbd60
Rename targets
Martin-cg Oct 9, 2025
31998c1
Minor fix
Martin-cg Oct 9, 2025
4acd32d
Fix oom bug with large intermediate textures
Martin-cg Oct 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
*.tif
*.tif.aux.xml
*.terrain
/CMakeLists.txt.user
/3rdparty/*
build/
.vscode
unittest_tiles
/unittests/output
.vs
/extern/*
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.21)
project(alpine-terrain-builder)
option(ALP_UNITTESTS "include unit test targets in the buildsystem" ON)

include(cmake/AddRepo.cmake)
include(cmake/SetupCMakeProject.cmake)


add_subdirectory(src)
if (ALP_UNITTESTS)
add_subdirectory(unittests)
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,5 @@ In order to build, you need to install:
- FreeImage
- tbb (intel threading building blocks)

sudo apt-get install libfmt-dev libglm-dev libgdal-dev catch2 libfreeimage-dev libtbb-dev
sudo apt-get install libcgal-dev libopencv-dev libfmt-dev libglm-dev libgdal-dev catch2 libfreeimage-dev libtbb-dev libcurl4-openssl-dev
(libgmp-dev libmpfr-dev libsqlite3-dev)
68 changes: 0 additions & 68 deletions batch-builder.py

This file was deleted.

45 changes: 0 additions & 45 deletions batch-converter.py

This file was deleted.

135 changes: 0 additions & 135 deletions batch-merger.py

This file was deleted.

Loading
Loading