Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve classic tree models (+ shadows) & "floating features" issues #3679

Merged
merged 6 commits into from
Mar 27, 2024
Merged

Improve classic tree models (+ shadows) & "floating features" issues #3679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
350517d
renderFeature: Enable shadow-casting for trees
past-due Mar 9, 2024
b5c470c
Improve classic tree models
past-due Mar 9, 2024
af7f3fe
Improve classic tree models - increase variations
past-due Mar 17, 2024
3a8f53d
Improve issue with features sometimes floating significantly above te…
past-due Mar 17, 2024
6b6f391
Adjust tree features width/breadth
past-due Mar 17, 2024
c706d8c
renderFeature: Stretch tree foundation if needed
past-due Mar 17, 2024
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
1,313 changes: 1,188 additions & 125 deletions data/base/features/mistree1.pie
View file
Open in desktop

Large diffs are not rendered by default.

1,031 changes: 930 additions & 101 deletions data/base/features/mistree2.pie
View file
Open in desktop

Large diffs are not rendered by default.

287 changes: 259 additions & 28 deletions data/base/features/mistree3.pie
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,262 @@
PIE 2
PIE 3
TYPE 200
TEXTURE 0 page-30-features-rockies.png 256 256
TEXTURE 0 page-30-features-rockies.png 0 0
LEVELS 1
LEVEL 1
POINTS 12
37 10 30
-29 10 36
-35 10 -29
31 10 -34
-41 0 3
38 0 -3
38 102 -3
-41 102 3
-4 0 -40
2 0 39
2 102 39
-4 102 -40
POLYGONS 12
200 3 0 1 2 0 105 46 105 46 53
200 3 0 2 3 0 105 46 53 0 53
200 3 3 2 1 0 53 46 53 46 105
200 3 3 1 0 0 53 46 105 0 105
200 3 4 5 6 99 72 147 72 147 0
200 3 4 6 7 99 72 147 0 99 0
200 3 7 6 5 99 0 147 0 147 72
200 3 7 5 4 99 0 147 72 99 72
200 3 8 9 10 99 72 147 72 147 0
200 3 8 10 11 99 72 147 0 99 0
200 3 11 10 9 99 0 147 0 147 72
200 3 11 9 8 99 0 147 72 99 72
POINTS 91
2.90364 -1.99701 -0.772132
-2.15228 -2.00299 -2.09643
0.760145 -2 -2.9021
-0.760145 -2 2.9021
-2.88302 -1.99701 0.813222
2.11416 -2.00299 2.12213
-0.411667 100 0.209242
0.0211561 100 0.496791
-0.461716 100 -0.292696
-0.0211576 100 -0.496792
0.413501 100 -0.20765
0.458996 100 0.29447
-8.51682 10.014 33.9438
-1.89872e-06 25 -4.29452e-07
-24.3395 11.1975 25.266
-33.6261 11.5785 9.76441
-33.9841 7.56615 -8.55049
-25.2357 11.6573 -24.2361
-9.67352 11.4773 -33.6332
8.51682 10.0139 -33.9438
24.4095 8.53164 -25.1915
33.6615 8.33185 -9.62475
34.0411 12.4135 8.3328
25.1355 8.41077 24.3438
9.57486 8.81153 33.6681
29.2472 22.8734 6.73792
-4.37363e-06 40 -8.21908e-07
18.1914 27.67 16.7238
8.75451 25.1446 28.6077
-5.61266 25.0246 24.0464
-20.5125 24.8723 21.9845
-23.6496 22.3096 7.21778
-29.2889 27.0885 -6.57879
-18.0682 22.3378 -16.8631
-8.75145 25.053 -28.6089
5.61551 25.0246 -24.0573
20.5104 24.9639 -21.9868
23.6079 27.6422 -7.38949
-18.7975 43.4745 -16.5242
-7.71977e-06 55 -1.16543e-06
-6.42882 41.5595 -19.483
5.23099 40.0271 -24.4021
13.8338 38.4597 -15.3378
23.7799 36.5023 -7.74893
20.2114 41.7562 4.12127
18.6316 36.4958 16.6991
6.35934 38.5633 19.503
-5.23098 40.0271 24.4021
-13.7798 41.4562 15.377
-23.7152 43.4816 7.9602
-20.1842 38.2008 -4.22516
-19.7267 56.417 -3.61925
-1.18949e-05 70 -1.37002e-06
-12.5423 51.1134 -10.7626
-6.63736 55.4505 -18.7705
3.114 55.0241 -16.1301
13.1059 54.567 -15.162
15.504 58.8662 -5.57087
19.7074 53.5443 3.69299
12.6722 58.8394 10.6198
6.61661 54.6146 18.7796
-3.11113 55.024 16.1191
-13.0909 55.403 15.1751
-15.5535 51.1395 5.4069
-13.969 73.6612 5.35404
-1.68735e-05 85 -1.35738e-06
-12.2433 68.9002 -2.02811
-11.8192 73.6287 -9.42847
-4.33721 66.5658 -11.5284
2.47226 70.0175 -14.7118
7.82178 73.4473 -9.56931
14.0202 66.3556 -5.22313
12.2553 71.0713 1.98224
11.703 66.3236 9.54632
4.45371 73.4591 11.4674
-2.47225 70.0175 14.7118
-7.90254 66.5535 9.49393
-6.11951 84.6798 7.84469
-2.34669e-05 102 -9.91315e-07
-7.58876 82.1621 3.03986
-9.97193 85.7196 -1.39517
-6.62229 82.1359 -5.0984
-3.8579 84.6749 -9.21572
1.10455 85.0097 -8.10093
6.11224 85.3322 -7.84942
7.56585 87.8554 -3.10655
9.96682 84.2643 1.41449
6.67937 87.8289 5.03462
3.86752 85.3273 9.2115
-1.10168 85.0097 8.09001
-4.73216e-07 10 -1.01826e-06
POLYGONS 164
200 3 0 1 2 0.0783653 0.291587 0.0783653 0.350448 0.0613737 0.321017
200 3 1 3 4 0.0783653 0.350448 0.12934 0.321017 0.112349 0.350448
200 3 0 3 1 0.0783653 0.291587 0.12934 0.321017 0.0783653 0.350448
200 3 5 3 0 0.112349 0.291587 0.12934 0.321017 0.0783653 0.291587
200 3 3 6 4 0.479049 0.285563 0.470084 0.0303091 0.470137 0.285563
200 3 6 3 7 0.470084 0.0303091 0.479049 0.285563 0.474094 0.0303091
200 3 4 8 1 0.470137 0.285563 0.474094 0.0303091 0.479049 0.285563
200 3 8 4 6 0.474094 0.0303091 0.470137 0.285563 0.470084 0.0303091
200 3 1 9 2 0.479049 0.285563 0.470084 0.0303091 0.470137 0.285563
200 3 9 1 8 0.470084 0.0303091 0.479049 0.285563 0.474094 0.0303091
200 3 2 10 0 0.470137 0.285563 0.474094 0.0303091 0.479049 0.285563
200 3 10 2 9 0.474094 0.0303091 0.470137 0.285563 0.470084 0.0303091
200 3 0 11 5 0.479049 0.285563 0.470084 0.0303091 0.470137 0.285563
200 3 11 0 10 0.470084 0.0303091 0.479049 0.285563 0.474094 0.0303091
200 3 5 7 3 0.470137 0.285563 0.474094 0.0303091 0.479049 0.285563
200 3 7 5 11 0.474094 0.0303091 0.470137 0.285563 0.470084 0.0303091
200 3 7 8 6 0.11132 0.320933 0.086818 0.306787 0.103153 0.306787
200 3 8 10 9 0.086818 0.306787 0.086818 0.335079 0.0786506 0.320933
200 3 7 10 8 0.11132 0.320933 0.086818 0.335079 0.086818 0.306787
200 3 11 10 7 0.103153 0.335079 0.086818 0.335079 0.11132 0.320933
200 3 12 13 14 0.560303 0.21959 0.480027 0.21959 0.549548 0.179452
200 3 14 13 15 0.549548 0.179452 0.480027 0.21959 0.520165 0.15007
200 3 15 13 16 0.520165 0.15007 0.480027 0.21959 0.480027 0.139315
200 3 16 13 17 0.480027 0.139315 0.480027 0.21959 0.43989 0.15007
200 3 17 13 18 0.43989 0.15007 0.480027 0.21959 0.410507 0.179452
200 3 18 13 19 0.410507 0.179452 0.480027 0.21959 0.399752 0.21959
200 3 19 13 20 0.399752 0.21959 0.480027 0.21959 0.410507 0.179452
200 3 20 13 21 0.410507 0.179452 0.480027 0.21959 0.439889 0.15007
200 3 21 13 22 0.439889 0.15007 0.480027 0.21959 0.480027 0.139315
200 3 22 13 23 0.480027 0.139315 0.480027 0.21959 0.520165 0.15007
200 3 23 13 24 0.520165 0.15007 0.480027 0.21959 0.549548 0.179452
200 3 24 13 12 0.549548 0.179452 0.480027 0.21959 0.560303 0.21959
200 3 25 26 27 0.560981 0.181957 0.480027 0.181957 0.550135 0.13665
200 3 27 26 28 0.550135 0.13665 0.480027 0.181957 0.520504 0.103482
200 3 28 26 29 0.520504 0.103482 0.480027 0.181957 0.480027 0.0913424
200 3 29 26 30 0.480027 0.0913424 0.480027 0.181957 0.43955 0.103482
200 3 30 26 31 0.43955 0.103482 0.480027 0.181957 0.409919 0.13665
200 3 31 26 32 0.409919 0.13665 0.480027 0.181957 0.399073 0.181957
200 3 32 26 33 0.399073 0.181957 0.480027 0.181957 0.409919 0.13665
200 3 33 26 34 0.409919 0.13665 0.480027 0.181957 0.43955 0.103482
200 3 34 26 35 0.43955 0.103482 0.480027 0.181957 0.480027 0.0913424
200 3 35 26 36 0.480027 0.0913424 0.480027 0.181957 0.520504 0.103482
200 3 36 26 37 0.520504 0.103482 0.480027 0.181957 0.550135 0.13665
200 3 37 26 25 0.550135 0.13665 0.480027 0.181957 0.560981 0.181957
200 3 38 39 40 0.546441 0.140842 0.477807 0.140842 0.537246 0.0975931
200 3 40 39 41 0.537246 0.0975931 0.477807 0.140842 0.512124 0.0659329
200 3 41 39 42 0.512124 0.0659329 0.477807 0.140842 0.477807 0.0543445
200 3 42 39 43 0.477807 0.0543445 0.477807 0.140842 0.44349 0.0659329
200 3 43 39 44 0.44349 0.0659329 0.477807 0.140842 0.418369 0.0975931
200 3 44 39 45 0.418369 0.0975931 0.477807 0.140842 0.409174 0.140842
200 3 45 39 46 0.409174 0.140842 0.477807 0.140842 0.418369 0.0975931
200 3 46 39 47 0.418369 0.0975931 0.477807 0.140842 0.44349 0.0659329
200 3 47 39 48 0.44349 0.0659329 0.477807 0.140842 0.477807 0.0543445
200 3 48 39 49 0.477807 0.0543445 0.477807 0.140842 0.512124 0.0659329
200 3 49 39 50 0.512124 0.0659329 0.477807 0.140842 0.537246 0.0975931
200 3 50 39 38 0.537246 0.0975931 0.477807 0.140842 0.546441 0.140842
200 3 51 52 53 0.540626 0.100802 0.476142 0.100802 0.531986 0.0671586
200 3 53 52 54 0.531986 0.0671586 0.476142 0.100802 0.508384 0.0425297
200 3 54 52 55 0.508384 0.0425297 0.476142 0.100802 0.476142 0.0335151
200 3 55 52 56 0.476142 0.0335151 0.476142 0.100802 0.443901 0.0425297
200 3 56 52 57 0.443901 0.0425297 0.476142 0.100802 0.420298 0.0671586
200 3 57 52 58 0.420298 0.0671586 0.476142 0.100802 0.411659 0.100802
200 3 58 52 59 0.411659 0.100802 0.476142 0.100802 0.420298 0.0671586
200 3 59 52 60 0.420298 0.0671586 0.476142 0.100802 0.443901 0.0425297
200 3 60 52 61 0.443901 0.0425297 0.476142 0.100802 0.476142 0.0335151
200 3 61 52 62 0.476142 0.0335151 0.476142 0.100802 0.508384 0.0425297
200 3 62 52 63 0.508384 0.0425297 0.476142 0.100802 0.531986 0.0671586
200 3 63 52 51 0.531986 0.0671586 0.476142 0.100802 0.540626 0.100802
200 3 64 65 66 0.536889 0.0827199 0.478362 0.0827199 0.529048 0.0504009
200 3 66 65 67 0.529048 0.0504009 0.478362 0.0827199 0.507626 0.0267418
200 3 67 65 68 0.507626 0.0267418 0.478362 0.0827199 0.478362 0.018082
200 3 68 65 69 0.478362 0.018082 0.478362 0.0827199 0.449099 0.0267418
200 3 69 65 70 0.449099 0.0267418 0.478362 0.0827199 0.427677 0.0504009
200 3 70 65 71 0.427677 0.0504009 0.478362 0.0827199 0.419836 0.0827196
200 3 71 65 72 0.419836 0.0827196 0.478362 0.0827199 0.427677 0.0504009
200 3 72 65 73 0.427677 0.0504009 0.478362 0.0827199 0.449099 0.0267418
200 3 73 65 74 0.449099 0.0267418 0.478362 0.0827199 0.478362 0.018082
200 3 74 65 75 0.478362 0.018082 0.478362 0.0827199 0.507626 0.0267418
200 3 75 65 76 0.507626 0.0267418 0.478362 0.0827199 0.529048 0.0504009
200 3 76 65 64 0.529048 0.0504009 0.478362 0.0827199 0.536889 0.0827199
200 3 77 78 79 0.487048 0.0371633 0.468862 0.0371633 0.484612 0.0197034
200 3 79 78 80 0.484612 0.0197034 0.468862 0.0371633 0.477955 0.00692183
200 3 80 78 81 0.477955 0.00692183 0.468862 0.0371633 0.468862 0.00224346
200 3 81 78 82 0.468862 0.00224346 0.468862 0.0371633 0.459769 0.00692183
200 3 82 78 83 0.459769 0.00692183 0.468862 0.0371633 0.453112 0.0197034
200 3 83 78 84 0.453112 0.0197034 0.468862 0.0371633 0.450676 0.0371633
200 3 84 78 85 0.450676 0.0371633 0.468862 0.0371633 0.453112 0.0197034
200 3 85 78 86 0.453112 0.0197034 0.468862 0.0371633 0.459769 0.00692183
200 3 86 78 87 0.459769 0.00692183 0.468862 0.0371633 0.468862 0.00224346
200 3 87 78 88 0.468862 0.00224346 0.468862 0.0371633 0.477955 0.00692183
200 3 88 78 89 0.477955 0.00692183 0.468862 0.0371633 0.484612 0.0197034
200 3 89 78 77 0.484612 0.0197034 0.468862 0.0371633 0.487048 0.0371633
200 3 76 52 75 0.136208 0.39659 0.0966576 0.311774 0.173318 0.365452
200 3 75 52 74 0.173318 0.365452 0.0966576 0.311774 0.189886 0.31993
200 3 74 52 73 0.189886 0.31993 0.0966576 0.311774 0.181474 0.272223
200 3 73 52 72 0.181474 0.272223 0.0966576 0.311774 0.150336 0.235114
200 3 72 52 71 0.150336 0.235114 0.0966576 0.311774 0.104814 0.218545
200 3 71 52 70 0.104814 0.218545 0.0966576 0.311774 0.057107 0.226957
200 3 70 52 69 0.057107 0.226957 0.0966576 0.311774 0.0199974 0.258096
200 3 69 52 68 0.0199974 0.258096 0.0966576 0.311774 0.00342888 0.303617
200 3 68 52 67 0.00342888 0.303617 0.0966576 0.311774 0.011841 0.351324
200 3 67 52 66 0.011841 0.351324 0.0966576 0.311774 0.0429796 0.388434
200 3 66 52 64 0.0429796 0.388434 0.0966576 0.311774 0.0885012 0.405002
200 3 64 52 76 0.0885012 0.405002 0.0966576 0.311774 0.136208 0.39659
200 3 89 65 88 0.177704 0.264981 0.0966577 0.311774 0.14345 0.230727
200 3 88 65 87 0.14345 0.230727 0.0966577 0.311774 0.0966576 0.218189
200 3 87 65 86 0.0966576 0.218189 0.0966577 0.311774 0.0498652 0.230727
200 3 86 65 85 0.0498652 0.230727 0.0966577 0.311774 0.0156108 0.264981
200 3 85 65 84 0.0156108 0.264981 0.0966577 0.311774 0.00307285 0.311774
200 3 84 65 83 0.00307285 0.311774 0.0966577 0.311774 0.0156108 0.358566
200 3 83 65 82 0.0156108 0.358566 0.0966577 0.311774 0.0498653 0.39282
200 3 82 65 81 0.0498653 0.39282 0.0966577 0.311774 0.0966577 0.405358
200 3 81 65 80 0.0966577 0.405358 0.0966577 0.311774 0.14345 0.39282
200 3 80 65 79 0.14345 0.39282 0.0966577 0.311774 0.177705 0.358566
200 3 79 65 77 0.177705 0.358566 0.0966577 0.311774 0.190243 0.311774
200 3 77 65 89 0.190243 0.311774 0.0966577 0.311774 0.177704 0.264981
200 3 63 39 62 0.162832 0.377948 0.0966577 0.311774 0.187054 0.335995
200 3 62 39 61 0.187054 0.335995 0.0966577 0.311774 0.187054 0.287552
200 3 61 39 60 0.187054 0.287552 0.0966577 0.311774 0.162832 0.245599
200 3 60 39 59 0.162832 0.245599 0.0966577 0.311774 0.120879 0.221378
200 3 59 39 58 0.120879 0.221378 0.0966577 0.311774 0.0724362 0.221378
200 3 58 39 57 0.0724362 0.221378 0.0966577 0.311774 0.0304832 0.245599
200 3 57 39 56 0.0304832 0.245599 0.0966577 0.311774 0.00626171 0.287552
200 3 56 39 55 0.00626171 0.287552 0.0966577 0.311774 0.00626171 0.335995
200 3 55 39 54 0.00626171 0.335995 0.0966577 0.311774 0.0304832 0.377948
200 3 54 39 53 0.0304832 0.377948 0.0966577 0.311774 0.0724362 0.40217
200 3 53 39 51 0.0724362 0.40217 0.0966577 0.311774 0.120879 0.40217
200 3 51 39 63 0.120879 0.40217 0.0966577 0.311774 0.162832 0.377948
200 3 50 26 49 0.189886 0.303617 0.0966577 0.311774 0.173318 0.258095
200 3 49 26 48 0.173318 0.258095 0.0966577 0.311774 0.136208 0.226957
200 3 48 26 47 0.136208 0.226957 0.0966577 0.311774 0.0885012 0.218545
200 3 47 26 46 0.0885012 0.218545 0.0966577 0.311774 0.0429797 0.235113
200 3 46 26 45 0.0429797 0.235113 0.0966577 0.311774 0.011841 0.272223
200 3 45 26 44 0.011841 0.272223 0.0966577 0.311774 0.003429 0.31993
200 3 44 26 43 0.003429 0.31993 0.0966577 0.311774 0.0199975 0.365452
200 3 43 26 42 0.0199975 0.365452 0.0966577 0.311774 0.057107 0.39659
200 3 42 26 41 0.057107 0.39659 0.0966577 0.311774 0.104814 0.405002
200 3 41 26 40 0.104814 0.405002 0.0966577 0.311774 0.150336 0.388434
200 3 40 26 38 0.150336 0.388434 0.0966577 0.311774 0.181474 0.351324
200 3 38 26 50 0.181474 0.351324 0.0966577 0.311774 0.189886 0.303617
200 3 37 13 36 0.190243 0.311774 0.0966577 0.311774 0.177705 0.264981
200 3 36 13 35 0.177705 0.264981 0.0966577 0.311774 0.14345 0.230727
200 3 35 13 34 0.14345 0.230727 0.0966577 0.311774 0.0966577 0.218189
200 3 34 13 33 0.0966577 0.218189 0.0966577 0.311774 0.0498653 0.230727
200 3 33 13 32 0.0498653 0.230727 0.0966577 0.311774 0.0156108 0.264981
200 3 32 13 31 0.0156108 0.264981 0.0966577 0.311774 0.00307286 0.311774
200 3 31 13 30 0.00307286 0.311774 0.0966577 0.311774 0.0156108 0.358566
200 3 30 13 29 0.0156108 0.358566 0.0966577 0.311774 0.0498653 0.39282
200 3 29 13 28 0.0498653 0.39282 0.0966577 0.311774 0.0966577 0.405358
200 3 28 13 27 0.0966577 0.405358 0.0966577 0.311774 0.14345 0.39282
200 3 27 13 25 0.14345 0.39282 0.0966577 0.311774 0.177705 0.358566
200 3 25 13 37 0.177705 0.358566 0.0966577 0.311774 0.190243 0.311774
200 3 24 90 23 0.177704 0.264981 0.0966577 0.311774 0.14345 0.230727
200 3 23 90 22 0.14345 0.230727 0.0966577 0.311774 0.0966576 0.218189
200 3 22 90 21 0.0966576 0.218189 0.0966577 0.311774 0.0498652 0.230727
200 3 21 90 20 0.0498652 0.230727 0.0966577 0.311774 0.0156108 0.264981
200 3 20 90 19 0.0156108 0.264981 0.0966577 0.311774 0.00307285 0.311774
200 3 19 90 18 0.00307285 0.311774 0.0966577 0.311774 0.0156108 0.358566
200 3 18 90 17 0.0156108 0.358566 0.0966577 0.311774 0.0498653 0.39282
200 3 17 90 16 0.0498653 0.39282 0.0966577 0.311774 0.0966577 0.405358
200 3 16 90 15 0.0966577 0.405358 0.0966577 0.311774 0.14345 0.39282
200 3 15 90 14 0.14345 0.39282 0.0966577 0.311774 0.177705 0.358566
200 3 14 90 12 0.177705 0.358566 0.0966577 0.311774 0.190243 0.311774
200 3 12 90 24 0.190243 0.311774 0.0966577 0.311774 0.177704 0.264981
Loading
Loading