Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
ea06b39
Merge pull request #1 from adam-ce/next
joerg-christian Jul 26, 2024
9e4b651
Merge branch 'AlpineMapsOrg:main' into main
joerg-christian Nov 4, 2024
e2f4d7a
Fixed eaws functions
joerg-christian Nov 20, 2024
47ef3b7
Implemented eaws region texture layer
joerg-christian Nov 21, 2024
1b7eaa6
EawsTextureScheduler inherits from TextureScheduler
joerg-christian Nov 29, 2024
de3efac
Merge branch 'avalancheWarningLayerV2'
joerg-christian Nov 29, 2024
dcbe7d8
Vectorlayer
LucasDworschak Nov 22, 2024
6723eaf
Vector Layer - Rasterizer
LucasDworschak Nov 25, 2024
1c990ad
Vector layer - Rasterizer:
LucasDworschak Nov 26, 2024
23920c9
Vector Layer - Rasterizer
LucasDworschak Nov 27, 2024
6b28b89
Vector layer - rasterizer
LucasDworschak Nov 27, 2024
bfc15e6
Vector layer - rasterizer
LucasDworschak Nov 27, 2024
928975d
Vector layer - rasterizer:
LucasDworschak Nov 28, 2024
48b4f39
Vector layer - Rasterizer
LucasDworschak Dec 2, 2024
ae62485
Vector layer - rasterizer
LucasDworschak Dec 2, 2024
74b151c
Vector layer - rasterizer
LucasDworschak Dec 2, 2024
6088e1d
Vector layer - rasterizer
LucasDworschak Dec 2, 2024
752095d
Vector layer - rasterizer
LucasDworschak Dec 3, 2024
b0d70d3
Revert "Vector layer - rasterizer"
LucasDworschak Dec 3, 2024
76881fd
reenabled ordering test in rasterizer.cpp
LucasDworschak Dec 3, 2024
1d9ff4c
added specific versions to deploy.yml to try and fix android builds
LucasDworschak Dec 3, 2024
9571a23
Revert "added specific versions to deploy.yml to try and fix android …
LucasDworschak Dec 3, 2024
46ee282
git deploy without android
LucasDworschak Dec 3, 2024
99d2db2
second attempt to exclude android builds
LucasDworschak Dec 3, 2024
bb7eece
Revert "second attempt to exclude android builds"
LucasDworschak Dec 4, 2024
b5e6cc7
Revert "git deploy without android"
LucasDworschak Dec 4, 2024
8f0df0a
Merge branch 'main' into rasterizer
LucasDworschak Dec 5, 2024
de38952
improved rasterizer
LucasDworschak Dec 5, 2024
320188a
added rasterizer benchmarks
LucasDworschak Dec 5, 2024
3cacfce
Merge branch 'rasterizer'
LucasDworschak Dec 5, 2024
e2ac775
added rasterizer benchmarks with increased distance
LucasDworschak Dec 5, 2024
0509330
Merge branch 'main' into rasterizer
LucasDworschak Dec 5, 2024
a0580ba
Merge pull request #141 from LucasDworschak/main
adam-ce Dec 5, 2024
1081cb4
rasterizer - added possibility to remove duplicate vertices
LucasDworschak Dec 13, 2024
c34e73c
Merge remote-tracking branch 'upstream/next'
LucasDworschak Dec 13, 2024
9a98dbe
Merge branch 'rasterizer'
LucasDworschak Dec 13, 2024
95371b1
Merge pull request #142 from LucasDworschak/main
adam-ce Dec 13, 2024
8f88387
Rasterizer - extracted edge generation to separate function
LucasDworschak Dec 19, 2024
a650f29
Rasterizer - Bugfix for specific triangles + small fixes
LucasDworschak Dec 22, 2024
34b0da6
Merge remote-tracking branch 'upstream/main' into rasterizer
LucasDworschak Dec 22, 2024
5c6841a
Merge branch 'rasterizer'
LucasDworschak Dec 22, 2024
c1c9d15
Rasterizer - renamed rasterizer debug image macro and commented it out
LucasDworschak Dec 22, 2024
b94c273
Merge branch 'rasterizer'
LucasDworschak Dec 22, 2024
e7982c5
Rasterizer - removed macros as they likely cause github tests to fail
LucasDworschak Dec 22, 2024
8283211
Merge remote-tracking branch 'upstream/main'
LucasDworschak Dec 22, 2024
1871a67
eaws report loader (not working)
joerg-christian Dec 22, 2024
397dfcb
fixed circular dependency nucleus <> gl_engine
joerg-christian Dec 22, 2024
c6d52cf
Rasterizer Bugfix - wrong fill_direction due to int rounding
LucasDworschak Dec 23, 2024
c3bb761
Merge remote-tracking branch 'upstream/main'
LucasDworschak Dec 23, 2024
27ee99e
Revert "Rasterizer - removed macros as they likely cause github tests…
LucasDworschak Dec 23, 2024
4d5a2cd
Merge branch 'main' into rasterizer
LucasDworschak Dec 23, 2024
5c545d0
Merge branch 'rasterizer'
LucasDworschak Dec 23, 2024
131e5ee
moved uint_id_manager to RenderingContext
joerg-christian Dec 23, 2024
8cd204f
tile.frag shows danger Rating High
joerg-christian Dec 25, 2024
e861f11
Merge pull request #143 from AlpineMapsOrg/main
adam-ce Dec 26, 2024
3e42145
Merge branch 'main' into next
adam-ce Dec 26, 2024
ea6e418
Merge remote-tracking branch 'upstream/main'
LucasDworschak Dec 27, 2024
f48673a
bugfix: eaws uint id manager
joerg-christian Dec 27, 2024
86d7564
updated eaws report
joerg-christian Dec 31, 2024
23d9549
bugfix uint id manager: Avoid asserts
joerg-christian Dec 31, 2024
95d863c
updated ReportLoadService
joerg-christian Dec 31, 2024
ce5ba43
cosmetic modification
joerg-christian Dec 31, 2024
7587795
update eaws region and reports
joerg-christian Dec 31, 2024
ca7f76e
only draw regions matching current eaws report date
joerg-christian Dec 31, 2024
a7b8967
Merge branch 'upstream_main' into new_next
adam-ce Jan 5, 2025
ff847a3
Rasterizer - removed randomness from test to be the same on all compi…
LucasDworschak Jan 14, 2025
918b173
Merge remote-tracking branch 'upstream/main'
LucasDworschak Jan 14, 2025
4a4f8e5
Added support for RGB32UI textures + RG32UI and RGB32UI array textures
LucasDworschak Jan 14, 2025
6b47ca4
added R32UI array test and texture upload; changed clang format Alway…
LucasDworschak Jan 14, 2025
e26430d
Merge pull request #149 from AlpineMapsOrg/main
adam-ce Jan 15, 2025
531f818
Merge branch 'next' into main
LucasDworschak Jan 15, 2025
f4b505b
Merge pull request #150 from LucasDworschak/main
adam-ce Jan 15, 2025
7d01c20
eaws reports render correctly
joerg-christian Jan 18, 2025
a4b47fa
separate frag shader for eaws layer
joerg-christian Jan 20, 2025
6a5ce00
ortho_layer has its old shader back
joerg-christian Jan 20, 2025
7a631b4
color blending in eaws frag shader
joerg-christian Jan 20, 2025
2701d45
Merge pull request #164 from AlpineMapsOrg/main
adam-ce Feb 8, 2025
72e9cba
fixed tile.frag
joerg-christian Feb 14, 2025
6360555
eaws color has own color buffer
joerg-christian Feb 14, 2025
0dcdfe7
Merge pull request #172 from AlpineMapsOrg/main
adam-ce Feb 15, 2025
8486d28
eaws color: small optimization in compose shader
joerg-christian Feb 17, 2025
7b5ae37
read unfavorable position from report
joerg-christian Mar 30, 2025
da3f7b6
Merge branch 'upstream_main' into next
adam-ce Mar 30, 2025
d6b4ad7
added unittest with server request, not working
joerg-christian Apr 6, 2025
fa5665f
updated eaws report manager, test not working
joerg-christian Apr 7, 2025
a6f2264
Updated unittest
joerg-christian Apr 7, 2025
5914eda
fix shader for linux/amd gpu
adam-ce Jun 10, 2025
1c8de1b
avalanche layers work, gets regions from file
joerg-christian Jun 28, 2025
bac92e6
Merge branch 'main' of https://github.com/joerg-christian/alpineMapsR…
joerg-christian Jun 28, 2025
8e95519
added copyrighta
joerg-christian Jun 28, 2025
3b648e1
Get EAWS Regions from server
joerg-christian Jun 29, 2025
6c71e36
added comment about region id problem
joerg-christian Jun 29, 2025
9148638
bugfix:
joerg-christian Jun 29, 2025
10d54f7
removed superfluous function
joerg-christian Jun 29, 2025
a1c7f85
uintIdManager.getDate used for report loading
joerg-christian Jun 30, 2025
3f06310
Merge pull request #213 from AlpineMapsOrg/main
adam-ce Jul 1, 2025
7ac5459
switch backround layer for surface shading
joerg-christian Jul 1, 2025
2ec5fad
WIP Merge branch 'next' into jc_main, doesn't compile. search for //…
adam-ce Jul 1, 2025
dbae793
moved AvalancheReportManager to Context
joerg-christian Jul 1, 2025
4125e6b
avalanche scheduler emits tiles
joerg-christian Jul 1, 2025
a2d606c
Merge branch 'main' into jc_main
adam-ce Jul 2, 2025
472b009
fix some issues
adam-ce Jul 2, 2025
3ee169b
merge fix gpu_quads_updated
joerg-christian Jul 2, 2025
939b355
remove connect to avalanche::scheduler
joerg-christian Jul 2, 2025
92456ec
Revert "remove connect to avalanche::scheduler"
adam-ce Jul 2, 2025
f6b8cfe
compiles now
adam-ce Jul 2, 2025
b10f23c
starts now (black rendering)
adam-ce Jul 2, 2025
0dd99c1
some qml fixes
adam-ce Jul 2, 2025
8a8c49e
don't leak
adam-ce Jul 2, 2025
3adf7fb
lost changes
adam-ce Jul 2, 2025
18ae610
fix black window (avalanche ubo was bound to the same location as the…
adam-ce Jul 2, 2025
fb0a9d4
don't leak the reply
adam-ce Jul 2, 2025
69c4657
clean up
adam-ce Jul 2, 2025
f971c35
AvalancheWarningLayer uses 512px resolution
joerg-christian Jul 3, 2025
03d4a7f
Merge pull request #216 from AlpineMapsOrg/main
adam-ce Jul 3, 2025
0903ac0
Merge remote-tracking branch 'upstream/next' into jc_main
adam-ce Jul 3, 2025
90020f3
Update eaws.frag
joerg-christian Jul 3, 2025
2ab3489
show eaws stats
adam-ce Jul 3, 2025
3e32e25
depth test >= produces artefacts (float inaccuracy)
adam-ce Jul 3, 2025
477696f
clean up
adam-ce Jul 3, 2025
bddfda1
forgotten parts of the scheduler
adam-ce Jul 3, 2025
6406867
debug output
adam-ce Jul 3, 2025
2e38ec6
this is the actual fix for not rendering regions
adam-ce Jul 3, 2025
9247e10
Debuging merge request: eaws reports ubo
joerg-christian Jul 8, 2025
f1eb0f6
still debuging merge request
joerg-christian Jul 14, 2025
ea4ed45
Remove unused UIntIdManager code
joerg-christian Jul 25, 2025
8ebcdc6
UintIdManager loads file
joerg-christian Jul 25, 2025
68c0e26
Remove uIntManager where unneccessary
joerg-christian Jul 26, 2025
877bb2e
Remove Avalanche Report Manager from gl_engine
joerg-christian Jul 26, 2025
018feec
eaws date picker added to gui
joerg-christian Jul 27, 2025
5208797
eaws date picker sends date to terrainRederItem
joerg-christian Jul 27, 2025
216a113
eaws: ubo works with date picker
joerg-christian Jul 29, 2025
fa6e65f
eaws region ids same as on report server
joerg-christian Jul 30, 2025
61bf879
eaws report display works again
joerg-christian Jul 30, 2025
892f442
eaws: comp shader: Remove greay overlay where no color
joerg-christian Jul 30, 2025
2b140b2
eaws: better grey where no report
joerg-christian Jul 30, 2025
b96543e
eaws: use new report server
joerg-christian Jul 30, 2025
69ebad7
eaws: Remove debug comment
joerg-christian Jul 30, 2025
930c663
eaws: added link to report website
joerg-christian Jul 30, 2025
f6da90a
eaws fix: immidiate update of color map
joerg-christian Jul 31, 2025
c45a1dc
eaws: date pick with text field
joerg-christian Jul 31, 2025
fa5bc8d
eaws: gui visual improvements
joerg-christian Jul 31, 2025
c1bfab1
eaws: removed 1px output from rasterize_regions
joerg-christian Aug 4, 2025
c4b37e5
eaws: added unit test for eaws report loading
joerg-christian Aug 4, 2025
bf53563
eaws: added unit test for eaws report ubo
joerg-christian Aug 5, 2025
c07e68e
eaws: added unittest nucleus/avalanche/Scheduler
joerg-christian Aug 11, 2025
10b965e
eaws bugfix in unit tests
joerg-christian Aug 18, 2025
57e61b7
eaws: UIntIdManager: using QCoreApplication::applicationDirPath()
joerg-christian Aug 19, 2025
25134df
eaws: removed unnecessary files
joerg-christian Aug 20, 2025
202c06a
eaws: load geojson from resource file
joerg-christian Aug 20, 2025
f1e33e9
eaws: reverted loading resources inside if (ALP_ENABLE_AVLANCHE_WARN…
joerg-christian Aug 20, 2025
f5d1098
Merge branch 'AlpineMapsOrg:main' into main
adam-ce Oct 6, 2025
e2b239f
fix ci tests: some builds are without asserts, as a result there was …
adam-ce Oct 6, 2025
9f2c1e6
Merge branch 'main' of git@github.com:joerg-christian/alpineMapsRende…
adam-ce Oct 6, 2025
72cfbe1
clean up / code style
adam-ce Oct 6, 2025
2ecb8ee
use ortho layer when avalanches are not active, and surface shading w…
adam-ce Oct 6, 2025
6bff332
quick fix bad state handling
adam-ce Oct 6, 2025
c7221a7
fix copyright in 3 places
adam-ce Oct 6, 2025
b8c5340
eaws: update gui
joerg-christian Oct 6, 2025
3a4c123
eaws: added warning disclaimer in UI
joerg-christian Oct 7, 2025
769f9cb
eaws: gui with bold warning and link to thesis
joerg-christian Oct 8, 2025
1628c35
fixed float precision in eaws shader
joerg-christian Oct 8, 2025
08fab8d
eaws: fix float notation in shader
joerg-christian Oct 8, 2025
2d87e7c
eaws: fix int-float multiplication in shader
joerg-christian Oct 8, 2025
8458a5d
eaws: use treeline
joerg-christian Oct 9, 2025
da2bd01
eaws: always draw eaws layer
joerg-christian Oct 9, 2025
ebac476
eaws: update warning text
joerg-christian Oct 9, 2025
e25fef3
eaws: no separate eaws buffer
joerg-christian Oct 9, 2025
25ed2ca
eaws: fix eaws.frag
joerg-christian Oct 12, 2025
ff4fe98
eaws: UIntIdManager without loading geojson files
joerg-christian Oct 12, 2025
1cc5420
eaws: remove geojsons from cmake file
joerg-christian Oct 12, 2025
d658eea
eaws: fix wrong altitude
joerg-christian Oct 13, 2025
9787e8d
eaws: calculate and pass altitude in vertex shader
joerg-christian Oct 13, 2025
cc60773
eaws: intensify overlay colors
joerg-christian Oct 13, 2025
2f5abd5
eaws: always show STOP above 45deg
joerg-christian Oct 14, 2025
8ad98f1
eaws: update gray overlay
joerg-christian Oct 15, 2025
1d9b6df
fix compiliation on android
adam-ce Oct 18, 2025
335227a
improve layout
adam-ce Oct 18, 2025
18a4932
eaws: show reports with unfavorable == 0
joerg-christian Oct 18, 2025
e1e58f9
Merge branch 'main' of https://github.com/joerg-christian/alpineMapsR…
joerg-christian Oct 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .cppQuickFix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[CppEditor.QuickFix]
GettersOutsideClassFrom=-1
ResetNameTemplateV2=\"reset_\" + name
SetterNameTemplateV2=\"set_\" + name
SetterParameterNameV2=\"new_\" + name
SettersOutsideClassFrom=-1
SignalNameTemplateV2=name + \"_changed\"
SignalWithNewValue=true
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fetch-depth: 0
fetch-tags: true

- name: Install Qt native version (the one provided by aqt doesn't seem to work)
- name: Install Qt native version (the one provided by aqt does not seem to work)
uses: jurplel/install-qt-action@v4
with:
aqtversion: '==3.1.*'
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@ jobs:
modules: 'qtcharts qtpositioning'
cache: true

- name: Debug output
shell: bash
run: |
echo "${{github.workspace}}/qt/Qt/6.8.1":
ls ${{github.workspace}}/qt/Qt/6.8.1
echo "==="
echo "${QT_ROOT_DIR}/lib/cmake/Qt6Linguist:"
ls ${QT_ROOT_DIR}/lib/cmake/Qt6Linguist
echo "==="

- name: Configure
env:
CC: ${{ matrix.CC }}
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@
/doc/*
/doc
/build/*
app/icons/eaws/eaws_menu_closed.png
app/icons/eaws/eaws_report_active.png
app/icons/eaws/eaws_report_inactive.png
app/icons/eaws/risk_level_active.png
app/icons/eaws/risk_level_inactive.png
app/icons/eaws/slope_angle_active.png
app/icons/eaws/slope_angle_inactive.png
app/icons/eaws/stop_or_go_active.png
app/icons/eaws/stop_or_go_inactive.png
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ option(ALP_ENABLE_TRACK_OBJECT_LIFECYCLE "enables debug cmd printout of construc
option(ALP_ENABLE_APP_SHUTDOWN_AFTER_60S "Shuts down the app after 60S, used for CI testing with asan." OFF)
option(ALP_ENABLE_LTO "Enable link time optimisation." OFF)
option(ALP_ENABLE_GL_ENGINE "Enable OpenGL/WebGL engine" ON)
option(ALP_ENABLE_AVLANCHE_WARNING_LAYER "Enables avalanche warning layer (requires Qt Gui in nucleus)" OFF)
option(ALP_ENABLE_AVLANCHE_WARNING_LAYER "Enables avalanche warning layer (requires Qt Gui in nucleus)" ON)
option(ALP_ENABLE_LABELS "Enables label rendering" ON)

set(ALP_EXTERN_DIR "extern" CACHE STRING "name of the directory to store external libraries, fonts etc..")
Expand Down
2 changes: 1 addition & 1 deletion app/About.qml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ it is licensed under the Open Data Commons Open Database License (ODbL) by the O
<br>

<h2>Authors:</h2>
Adam Celarek, Lucas Dworschak, Gerald Kimmersdorfer, Jakob Lindner, Patrick Komon, Jakob Maier, Markus Rampp
Adam Celarek, Lucas Dworschak, Gerald Kimmersdorfer, Jakob Lindner, Joerg-Christian Reiher, Patrick Komon, Jakob Maier, Markus Rampp
<br>

<h2>Impressum:</h2>
Expand Down
12 changes: 11 additions & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ qt_add_qml_module(alpineapp
icons/menu.png
icons/search.png
icons/icon.png
icons/eaws/eaws_menu.png
icons/eaws/eaws_report.png
icons/eaws/risk_level.png
icons/eaws/slope_angle.png
icons/eaws/stop_or_go.png
icons/material/monitoring.png
icons/material/3d_rotation.png
icons/material/map.png
Expand All @@ -65,6 +70,10 @@ qt_add_qml_module(alpineapp
icons/logo_type_horizontal.png
icons/logo_type_vertical.png
icons/logo_type_horizontal_short.png
eaws/banner_eaws_report.png
eaws/banner_risk_level.png
eaws/banner_slope_angle.png
eaws/banner_stop_or_go.png
QML_FILES
Main.qml
About.qml
Expand Down Expand Up @@ -102,7 +111,8 @@ qt_add_qml_module(alpineapp
picker/Default.qml
picker/PoiAlpineHut.qml
picker/PoiSettlement.qml
SOURCES TileStatistics.h TileStatistics.cpp
SOURCES
TileStatistics.h TileStatistics.cpp
)

qt_add_resources(alpineapp "fonts"
Expand Down
Loading