93 Commits

Author SHA1 Message Date
Louis Erbkamm
834ce7b51d Merge pull request #629 from louis-e/2.3.1-release-prep
Prepare release 2.3.1
2025-11-16 19:52:38 +01:00
louis-e
93b6f5ac99 Prepare release 2.3.1 2025-11-16 19:52:09 +01:00
Louis Erbkamm
77df683deb Merge pull request #628 from louis-e/terrain-only-mode
Terrain only mode
2025-11-16 19:47:08 +01:00
louis-e
9d791f4299 Fix cargo fmt 2025-11-16 19:44:20 +01:00
louis-e
a2dff0b84b Backend for terrain only mode 2025-11-16 19:40:08 +01:00
louis-e
24630351b9 UI frontend for terrain only mode 2025-11-16 19:24:10 +01:00
Louis Erbkamm
819b03e3b1 Merge pull request #627 from louis-e/floodfill-stuck-fix
Fix stuck at 70% generation
2025-11-16 18:57:43 +01:00
Louis Erbkamm
f315245637 Improve timeout checks in floodfill algorithm
Added timeout checks in inner loops for better performance.
2025-11-16 18:56:05 +01:00
Louis Erbkamm
16c9f3c3bf Merge branch 'main' into floodfill-stuck-fix 2025-11-16 18:51:58 +01:00
louis-e
3043ca6d24 Fix stuck at 70% generation 2025-11-16 18:50:59 +01:00
Louis Erbkamm
3657878f01 Merge pull request #626 from louis-e/ground_crash_fix
Fix ground crash
2025-11-16 17:44:21 +01:00
louis-e
44cc57c3dd Add arnis website references 2025-11-16 17:43:11 +01:00
louis-e
408caa9176 Improve logging 2025-11-16 17:42:57 +01:00
louis-e
3191a3676d Fix src\ground.rs:27 panic crash 2025-11-16 17:42:26 +01:00
Louis Erbkamm
9bedca071a Revise official website links in README
Updated official project website information in README.
2025-10-24 19:57:32 +02:00
Louis Erbkamm
d611837746 Merge pull request #592 from louis-e/dependabot/cargo/fastnbt-2.6.0
build(deps): bump fastnbt from 2.5.0 to 2.6.0
2025-10-02 13:13:03 +02:00
Louis Erbkamm
e06fcaf7a2 Merge pull request #590 from louis-e/dependabot/cargo/tauri-2.8.5
build(deps): bump tauri from 2.7.0 to 2.8.5
2025-10-02 13:10:06 +02:00
Louis Erbkamm
1f2772f052 Merge pull request #589 from louis-e/dependabot/cargo/tempfile-3.23.0
build(deps): bump tempfile from 3.21.0 to 3.23.0
2025-10-02 13:08:37 +02:00
Louis Erbkamm
82f3460043 Merge pull request #586 from scd31/fix-rivers
Fix rivers
2025-10-02 13:05:28 +02:00
dependabot[bot]
65d6bb6c99 build(deps): bump fastnbt from 2.5.0 to 2.6.0
Bumps [fastnbt](https://github.com/owengage/fastnbt) from 2.5.0 to 2.6.0.
- [Commits](https://github.com/owengage/fastnbt/compare/fastnbt-2.5.0...fastnbt-2.6.0)

---
updated-dependencies:
- dependency-name: fastnbt
  dependency-version: 2.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-01 02:15:16 +00:00
dependabot[bot]
7ebee82982 build(deps): bump tauri from 2.7.0 to 2.8.5
Bumps [tauri](https://github.com/tauri-apps/tauri) from 2.7.0 to 2.8.5.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v2.7.0...tauri-v2.8.5)

---
updated-dependencies:
- dependency-name: tauri
  dependency-version: 2.8.5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-01 02:14:36 +00:00
dependabot[bot]
5056e83dff build(deps): bump tempfile from 3.21.0 to 3.23.0
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.21.0 to 3.23.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.21.0...v3.23.0)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-version: 3.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-01 02:14:14 +00:00
Stephen D
3cb0b994e1 handle bays 2025-09-29 18:54:56 -04:00
Stephen D
5ded3c961e fix docks 2025-09-29 18:54:56 -04:00
Stephen D
893c14bff8 fix rivers 2025-09-29 18:54:56 -04:00
Louis Erbkamm
4f8e0020e3 Merge pull request #582 from louis-e/manual_is_multiple_of
Fix indentation
2025-09-27 15:14:43 +02:00
Louis Erbkamm
456018abf7 Fix indentation
Reduced timeout checking frequency for better performance.
2025-09-27 15:14:15 +02:00
Louis Erbkamm
175bdc4582 Merge pull request #581 from louis-e/manual_is_multiple_of
Use manual % check since is_multiple_of() is unstable on stable Rust
2025-09-27 15:00:20 +02:00
Louis Erbkamm
ed294a3973 Optimize timeout checking in floodfill algorithm
Reduced timeout checking frequency for better performance and added a manual check for stability.
2025-09-27 14:59:55 +02:00
Louis Erbkamm
6c966fc9cc Implement manual % check for block counter
Add manual check for block counter multiple of batch size
2025-09-27 14:59:10 +02:00
Louis Erbkamm
ecfc6634fc Add rustfmt component to Rust toolchain setup 2025-09-27 14:49:55 +02:00
Louis Erbkamm
a336ccd1aa Merge pull request #579 from louis-e/disable-benchmark
Temporarily disable benchmark workflow
2025-09-25 21:10:20 +02:00
louis-e
f702a41af1 Temporarily disable benchmark workflow 2025-09-25 21:09:57 +02:00
Louis Erbkamm
29c4dc6d7c Merge pull request #561 from louis-e/elevated-highways-layer-support 2025-09-13 20:44:42 +02:00
Louis Erbkamm
f60b341eca Merge branch 'main' into elevated-highways-layer-support 2025-09-13 20:39:34 +02:00
louis-e
92c5e52f46 Disable negative layer highways 2025-09-13 20:39:10 +02:00
Louis Erbkamm
e4d7dd15c2 Merge pull request #566 from louis-e/root-dir-cleanup
Clean up root directory
2025-09-13 16:55:58 +02:00
Louis Erbkamm
cc6748115b Merge branch 'main' into root-dir-cleanup 2025-09-13 16:55:50 +02:00
louis-e
ce9496aea5 Link images as relative paths 2025-09-13 16:54:37 +02:00
louis-e
4c87eb8141 Use include_str instead of read_to_string 2025-09-13 16:52:14 +02:00
louis-e
ada475f73e Remove asset suffix from asset/ subdirectories 2025-09-13 16:51:50 +02:00
Louis Erbkamm
e5a82ba526 Merge pull request #563 from scd31/metadata
Metadata
2025-09-13 16:46:25 +02:00
Louis Erbkamm
309ac19b09 Fix cargo fmt in save_metadata function 2025-09-13 16:42:46 +02:00
Louis Erbkamm
90df7688df Implement error handling for saving world metadata 2025-09-13 16:38:56 +02:00
Louis Erbkamm
5b3889a7bb Add Latvian language option to dropdown 2025-09-13 15:20:32 +02:00
Louis Erbkamm
67deb739e6 Merge branch 'main' into metadata 2025-09-13 15:17:24 +02:00
Louis Erbkamm
7c08d21f36 Merge pull request #533 from scd31/nix
Nix development fix/improvements
2025-09-13 15:16:57 +02:00
louis-e
280acc7a8a Move example_transformations.json to tests/ directory 2025-09-13 14:24:11 +02:00
louis-e
ee59da5d9b Clean up root dir by combining assets 2025-09-13 14:19:59 +02:00
louis-e
b772cb6ab9 Move gui-src/ to src/gui/ 2025-09-13 14:16:55 +02:00
Louis Erbkamm
2646947ed0 Merge pull request #536 from freeutka/main
Add latvian language
2025-09-13 14:12:59 +02:00
Louis Erbkamm
b9976fd562 Merge pull request #534 from scd31/dynmap-fix
fix dynmap, and maybe other things
2025-09-13 11:12:14 +02:00
Louis Erbkamm
a621703da4 Refactor data check to use is_empty method 2025-09-13 11:01:38 +02:00
Louis Erbkamm
87efd02c74 Merge branch 'main' into dynmap-fix 2025-09-13 10:58:02 +02:00
Louis Erbkamm
6a6b58fd8f Fix block property insertion in world_editor 2025-09-13 10:57:45 +02:00
Stephen D
855c6fe846 switch to mold linker for performance 2025-09-07 19:03:48 -04:00
Stephen D
1592951fe3 world metadata 2025-09-07 16:06:58 -04:00
louis-e
e267e04350 Fix cargo fmt and clippy 2025-09-07 21:39:03 +02:00
louis-e
c2e8d5959f feat: add elevated highways with layer-based elevation 2025-09-07 18:55:42 +02:00
Stephen D
ffe8f865d2 initial cleanup 2025-09-07 11:02:25 -04:00
Louis Erbkamm
4f9f4f127a Merge pull request #558 from louis-e/interior-entityblock-removal
Replace entity blocks in building interior generation for lag reduction
2025-09-03 16:26:09 +02:00
louis-e
014208426b Replace entity blocks in building interior generation for lag reduction 2025-09-03 16:25:22 +02:00
Louis Erbkamm
6d848ef7cd Merge pull request #557 from louis-e/rollercoasters
Add rollercoasters
2025-09-03 16:23:33 +02:00
louis-e
1e25dfea37 Add rollercoasters 2025-09-03 16:13:47 +02:00
Louis Erbkamm
903efec459 Merge pull request #556 from louis-e/elevation-tilecache-crash
Implement faulty elevation tile cache detection crash
2025-09-03 15:48:27 +02:00
Louis Erbkamm
22b3969c72 Merge branch 'main' into elevation-tilecache-crash 2025-09-03 15:41:15 +02:00
Louis Erbkamm
0f62c4283b Remove clear_tile_cache function and improve error logging
Removed the clear_tile_cache function and updated error handling for file removal.
2025-09-03 15:40:19 +02:00
Louis Erbkamm
4299e64cba Merge pull request #549 from louis-e/dependabot/cargo/semver-1.0.26
build(deps): bump semver from 1.0.24 to 1.0.26
2025-09-03 15:38:20 +02:00
Louis Erbkamm
0cd386b399 Merge pull request #550 from louis-e/dependabot/cargo/tempfile-3.21.0
build(deps): bump tempfile from 3.20.0 to 3.21.0
2025-09-03 15:38:12 +02:00
Louis Erbkamm
2fdecbe206 Merge pull request #551 from louis-e/dependabot/cargo/fastanvil-0.32.0
build(deps): bump fastanvil from 0.31.0 to 0.32.0
2025-09-03 15:37:54 +02:00
Louis Erbkamm
75d1ab14e7 Merge pull request #552 from louis-e/dependabot/github_actions/actions/checkout-5
build(deps): bump actions/checkout from 4 to 5
2025-09-03 15:36:58 +02:00
Louis Erbkamm
f9c18ae5f6 Merge pull request #548 from louis-e/dependabot/cargo/tauri-build-2.4.0
build(deps): bump tauri-build from 2.3.1 to 2.4.0
2025-09-03 15:36:42 +02:00
Louis Erbkamm
963fe2327b Merge pull request #553 from louis-e/dependabot/github_actions/actions/download-artifact-5
build(deps): bump actions/download-artifact from 4 to 5
2025-09-03 15:36:26 +02:00
Louis Erbkamm
2a8ff6f641 Merge branch 'main' into elevation-tilecache-crash 2025-09-03 15:34:49 +02:00
louis-e
ff3ea1093a Implement faulty elevation tile cache detection crash 2025-09-03 15:32:50 +02:00
Louis Erbkamm
fd401ab23f Merge pull request #555 from louis-e/taginfo-refinement
Refine elements based on taginfo feedback
2025-09-03 15:03:00 +02:00
louis-e
3f67e060eb Refine elements based on taginfo feedback 2025-09-03 15:01:08 +02:00
dependabot[bot]
858c2f4c93 build(deps): bump actions/download-artifact from 4 to 5
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 06:22:06 +00:00
dependabot[bot]
e8fad0e197 build(deps): bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 06:00:27 +00:00
dependabot[bot]
7ebc66db7e build(deps): bump fastanvil from 0.31.0 to 0.32.0
Bumps [fastanvil](https://github.com/owengage/fastnbt) from 0.31.0 to 0.32.0.
- [Commits](https://github.com/owengage/fastnbt/compare/fastanvil-0.31.0...fastanvil-0.32.0)

---
updated-dependencies:
- dependency-name: fastanvil
  dependency-version: 0.32.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 05:29:00 +00:00
dependabot[bot]
28b75a22cf build(deps): bump tempfile from 3.20.0 to 3.21.0
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.20.0 to 3.21.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.20.0...v3.21.0)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-version: 3.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 05:22:02 +00:00
dependabot[bot]
9ee9f0de64 build(deps): bump semver from 1.0.24 to 1.0.26
Bumps [semver](https://github.com/dtolnay/semver) from 1.0.24 to 1.0.26.
- [Release notes](https://github.com/dtolnay/semver/releases)
- [Commits](https://github.com/dtolnay/semver/compare/1.0.24...1.0.26)

---
updated-dependencies:
- dependency-name: semver
  dependency-version: 1.0.26
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 05:19:45 +00:00
dependabot[bot]
5b874a5c29 build(deps): bump tauri-build from 2.3.1 to 2.4.0
Bumps [tauri-build](https://github.com/tauri-apps/tauri) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/tauri-build-v2.3.1...tauri-build-v2.4.0)

---
updated-dependencies:
- dependency-name: tauri-build
  dependency-version: 2.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-01 05:17:50 +00:00
freeutka
eeecdc8f99 Create lv.json 2025-08-25 12:20:23 +03:00
Louis Erbkamm
8b33e152ef Remove icon_url from taginfo.json 2025-08-24 19:28:05 +02:00
Louis Erbkamm
ca8e50fbf1 Merge pull request #535 from louis-e/taginfo
Add comprehensive taginfo.json for OSM tag documentation
2025-08-24 18:22:18 +02:00
louis-e
7f4ef9130f Add comprehensive taginfo.json for OSM tag documentation 2025-08-24 18:18:02 +02:00
Stephen D
8d183543be fix dynmap, and maybe other things 2025-08-24 09:01:39 -04:00
Stephen D
dd07fba15c missed a file 2025-08-24 08:58:02 -04:00
Stephen D
083fbed040 nix development fix/improvements 2025-08-24 08:57:07 -04:00
Louis Erbkamm
4191fa4902 Merge pull request #532 from sralmai/patch-1
Update README.md
2025-08-24 12:25:07 +02:00
David Samuelson
6c82265ee3 Update README.md
Fix lat and long ordering in the command line build example.
2025-08-24 05:16:05 -05:00
Louis Erbkamm
7d978047b4 Enhance bug report template with additional details
Updated bug report template for clarity and detail.
2025-08-24 02:59:43 +02:00
126 changed files with 2353 additions and 837 deletions

1
.envrc Normal file
View File

@@ -0,0 +1 @@
use flake

2
.gitattributes vendored
View File

@@ -1 +1 @@
gui-src/** linguist-vendored
src/gui/** linguist-vendored

View File

@@ -11,13 +11,13 @@ assignees: ''
A clear and concise description of what the bug is and what you expected to happen.
**Used bbox area**
Please provide your input parameters so we can reproduce the issue. *(For example: 48.133444 11.569462 48.142609 11.584740)*
Please provide your input parameters (BBOX) so we can reproduce the issue. *(For example: 48.133444 11.569462 48.142609 11.584740)*
**Arnis and Minecraft version**
Please tell us what version of Arnis and Minecraft you used.
Please tell us what version of Arnis and Minecraft you used, as well as if you are on Windows, Linux or MacOS.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Additional context**
Add any other context about the problem here. If you used any more custom settings, please provide them here too. If you experienced any issue with the application itself like a crash, please provide the log file which can be found at C:\Users\USERNAME\AppData\Local\com.louisdev.arnis\logs
Add any other context about the problem here. If you used any more custom settings, please provide them here too. Please provide the log file if possible as well, which can be found at C:\Users\USERNAME\AppData\Local\com.louisdev.arnis\logs

View File

@@ -18,13 +18,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1
with:
toolchain: stable
components: clippy
components: clippy, rustfmt
- name: Install Linux dependencies
run: |
@@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1

View File

@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1

View File

@@ -30,7 +30,7 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Set up Rust
uses: dtolnay/rust-toolchain@v1
@@ -97,13 +97,13 @@ jobs:
runs-on: macos-latest
steps:
- name: Download macOS Intel build
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: macos-13-x86_64-apple-darwin-build
path: ./intel
- name: Download macOS ARM64 build
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: macos-latest-aarch64-apple-darwin-build
path: ./arm64
@@ -124,22 +124,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Download Windows build artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: windows-latest-x86_64-pc-windows-msvc-build
path: ./builds/windows
- name: Download Linux build artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: ubuntu-latest-x86_64-unknown-linux-gnu-build
path: ./builds/linux
- name: Download macOS universal build artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: macos-universal-build
path: ./builds/macos

1
.gitignore vendored
View File

@@ -2,7 +2,6 @@
# Environment files
.env
.envrc
/.direnv
# Build artifacts

129
Cargo.lock generated
View File

@@ -191,7 +191,7 @@ dependencies = [
[[package]]
name = "arnis"
version = "2.2.1"
version = "2.3.1"
dependencies = [
"clap",
"colored",
@@ -1208,9 +1208,9 @@ dependencies = [
[[package]]
name = "dlopen2"
version = "0.7.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
checksum = "b54f373ccf864bf587a89e880fb7610f8d73f3045f13580948ccbcaff26febff"
dependencies = [
"dlopen2_derive",
"libc",
@@ -1423,9 +1423,9 @@ dependencies = [
[[package]]
name = "fastanvil"
version = "0.31.0"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "619fbd9bb48f9e54a7ff88cdd0f7048b8ea519448518c690057f9d03d3e81ebf"
checksum = "68f773cb151aa058dd65e3a119cc0733252abf2942d4d3eed8eee72bd231d5b4"
dependencies = [
"bit_field",
"byteorder",
@@ -1433,6 +1433,7 @@ dependencies = [
"flate2",
"image 0.23.14",
"log",
"lz4-java-wrc",
"num_enum 0.5.11",
"once_cell",
"serde",
@@ -1442,9 +1443,9 @@ dependencies = [
[[package]]
name = "fastnbt"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d4a73a95dc65551ccd98e1ecd1adb5d1ba5361146963b31f481ca42fc0520a3"
checksum = "29e3bb1f9ba8b6dbb35d89b415216041c2cad0c3e0b329db85ef5d4fc9e80cd6"
dependencies = [
"byteorder",
"cesu8",
@@ -2905,6 +2906,22 @@ dependencies = [
"imgref",
]
[[package]]
name = "lz4-java-wrc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed1c11dbd317fa5d0508cbb5ce47696bb27771e3c9604428e0e98c7c3d76d0d"
dependencies = [
"lz4_flex",
"twox-hash",
]
[[package]]
name = "lz4_flex"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
[[package]]
name = "mac"
version = "0.1.1"
@@ -3397,6 +3414,16 @@ dependencies = [
"objc2-core-foundation",
]
[[package]]
name = "objc2-javascript-core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9052cb1bb50a4c161d934befcf879526fb87ae9a68858f241e693ca46225cf5a"
dependencies = [
"objc2 0.6.1",
"objc2-core-foundation",
]
[[package]]
name = "objc2-metal"
version = "0.2.2"
@@ -3433,6 +3460,17 @@ dependencies = [
"objc2-foundation 0.3.1",
]
[[package]]
name = "objc2-security"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1f8e0ef3ab66b08c42644dcb34dba6ec0a574bbd8adbb8bdbdc7a2779731a44"
dependencies = [
"bitflags 2.6.0",
"objc2 0.6.1",
"objc2-core-foundation",
]
[[package]]
name = "objc2-ui-kit"
version = "0.3.1"
@@ -3457,6 +3495,8 @@ dependencies = [
"objc2-app-kit",
"objc2-core-foundation",
"objc2-foundation 0.3.1",
"objc2-javascript-core",
"objc2-security",
]
[[package]]
@@ -4620,9 +4660,9 @@ dependencies = [
[[package]]
name = "semver"
version = "1.0.24"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
dependencies = [
"serde",
]
@@ -4763,9 +4803,9 @@ dependencies = [
[[package]]
name = "serialize-to-javascript"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5"
dependencies = [
"serde",
"serde_json",
@@ -4774,13 +4814,13 @@ dependencies = [
[[package]]
name = "serialize-to-javascript-impl"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.95",
]
[[package]]
@@ -5090,11 +5130,12 @@ dependencies = [
[[package]]
name = "tao"
version = "0.34.0"
version = "0.34.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
checksum = "959469667dbcea91e5485fc48ba7dd6023face91bb0f1a14681a70f99847c3f7"
dependencies = [
"bitflags 2.6.0",
"block2 0.6.1",
"core-foundation 0.10.0",
"core-graphics",
"crossbeam-channel",
@@ -5162,12 +5203,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
version = "2.7.0"
version = "2.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "352a4bc7bf6c25f5624227e3641adf475a6535707451b09bb83271df8b7a6ac7"
checksum = "d4d1d3b3dc4c101ac989fd7db77e045cc6d91a25349cd410455cb5c57d510c1c"
dependencies = [
"anyhow",
"bytes",
"cookie",
"dirs",
"dunce",
"embed_plist",
@@ -5185,6 +5227,7 @@ dependencies = [
"objc2-app-kit",
"objc2-foundation 0.3.1",
"objc2-ui-kit",
"objc2-web-kit",
"percent-encoding",
"plist",
"raw-window-handle",
@@ -5212,9 +5255,9 @@ dependencies = [
[[package]]
name = "tauri-build"
version = "2.3.1"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "182d688496c06bf08ea896459bf483eb29cdff35c1c4c115fb14053514303064"
checksum = "9c432ccc9ff661803dab74c6cd78de11026a578a9307610bbc39d3c55be7943f"
dependencies = [
"anyhow",
"cargo_toml",
@@ -5228,15 +5271,15 @@ dependencies = [
"serde_json",
"tauri-utils",
"tauri-winres",
"toml 0.8.19",
"toml 0.9.2",
"walkdir",
]
[[package]]
name = "tauri-codegen"
version = "2.3.1"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b54a99a6cd8e01abcfa61508177e6096a4fe2681efecee9214e962f2f073ae4a"
checksum = "1ab3a62cf2e6253936a8b267c2e95839674e7439f104fa96ad0025e149d54d8a"
dependencies = [
"base64 0.22.1",
"brotli",
@@ -5261,9 +5304,9 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "2.3.2"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7945b14dc45e23532f2ded6e120170bbdd4af5ceaa45784a6b33d250fbce3f9e"
checksum = "4368ea8094e7045217edb690f493b55b30caf9f3e61f79b4c24b6db91f07995e"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -5335,9 +5378,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "2.7.1"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b1cc885be806ea15ff7b0eb47098a7b16323d9228876afda329e34e2d6c4676"
checksum = "d4cfc9ad45b487d3fded5a4731a567872a4812e9552e3964161b08edabf93846"
dependencies = [
"cookie",
"dpi",
@@ -5346,20 +5389,23 @@ dependencies = [
"jni",
"objc2 0.6.1",
"objc2-ui-kit",
"objc2-web-kit",
"raw-window-handle",
"serde",
"serde_json",
"tauri-utils",
"thiserror 2.0.9",
"url",
"webkit2gtk",
"webview2-com",
"windows",
]
[[package]]
name = "tauri-runtime-wry"
version = "2.7.2"
version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe653a2fbbef19fe898efc774bc52c8742576342a33d3d028c189b57eb1d2439"
checksum = "c1fe9d48bd122ff002064e88cfcd7027090d789c4302714e68fcccba0f4b7807"
dependencies = [
"gtk",
"http",
@@ -5384,9 +5430,9 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "2.6.0"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330c15cabfe1d9f213478c9e8ec2b0c76dab26bb6f314b8ad1c8a568c1d186e"
checksum = "41a3852fdf9a4f8fbeaa63dc3e9a85284dd6ef7200751f0bd66ceee30c93f212"
dependencies = [
"anyhow",
"brotli",
@@ -5413,7 +5459,7 @@ dependencies = [
"serde_with",
"swift-rs",
"thiserror 2.0.9",
"toml 0.8.19",
"toml 0.9.2",
"url",
"urlpattern",
"uuid",
@@ -5433,9 +5479,9 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.20.0"
version = "3.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
dependencies = [
"fastrand",
"getrandom 0.3.3",
@@ -5809,6 +5855,16 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "twox-hash"
version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if",
"static_assertions",
]
[[package]]
name = "typeid"
version = "1.0.2"
@@ -6766,14 +6822,15 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
[[package]]
name = "wry"
version = "0.52.1"
version = "0.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12a714d9ba7075aae04a6e50229d6109e3d584774b99a6a8c60de1698ca111b9"
checksum = "31f0e9642a0d061f6236c54ccae64c2722a7879ad4ec7dff59bd376d446d8e90"
dependencies = [
"base64 0.22.1",
"block2 0.6.1",
"cookie",
"crossbeam-channel",
"dirs",
"dpi",
"dunce",
"gdkx11",

View File

@@ -1,6 +1,6 @@
[package]
name = "arnis"
version = "2.3.0"
version = "2.3.1"
edition = "2021"
description = "Arnis - Generate real life cities in Minecraft"
homepage = "https://github.com/louis-e/arnis"
@@ -23,8 +23,8 @@ tauri-build = {version = "2", optional = true}
clap = { version = "4.5", features = ["derive", "env"] }
colored = "3.0.0"
dirs = {version = "6.0.0", optional = true }
fastanvil = "0.31.0"
fastnbt = "2.5.0"
fastanvil = "0.32.0"
fastnbt = "2.6.0"
flate2 = "1.1"
fnv = "1.0.7"
fs2 = "0.4"
@@ -38,7 +38,7 @@ rand = "0.8.5"
rayon = "1.10.0"
reqwest = { version = "0.12.15", features = ["blocking", "json"] }
rfd = { version = "0.15.4", optional = true }
semver = "1.0.23"
semver = "1.0.26"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tauri = { version = "2", optional = true }
@@ -50,4 +50,4 @@ tokio = { version = "1.47.0", features = ["full"], optional = true }
windows = { version = "0.61.1", features = ["Win32_System_Console"] }
[dev-dependencies]
tempfile = "3.20.0"
tempfile = "3.23.0"

View File

@@ -1,4 +1,4 @@
<img src="https://github.com/louis-e/arnis/blob/main/gitassets/banner.png?raw=true" width="100%" alt="Banner">
<img src="assets/git/banner.png" width="100%" alt="Banner">
# Arnis [![CI Build Status](https://github.com/louis-e/arnis/actions/workflows/ci-build.yml/badge.svg)](https://github.com/louis-e/arnis/actions) [<img alt="GitHub Release" src="https://img.shields.io/github/v/release/louis-e/arnis" />](https://github.com/louis-e/arnis/releases) [<img alt="GitHub Downloads (all assets, all releases" src="https://img.shields.io/github/downloads/louis-e/arnis/total" />](https://github.com/louis-e/arnis/releases) [![Download here](https://img.shields.io/badge/Download-here-green)](https://github.com/louis-e/arnis/releases) [![Discord](https://img.shields.io/discord/1326192999738249267?label=Discord&color=%237289da)](https://discord.gg/mA2g69Fhxq)
@@ -7,11 +7,11 @@ Arnis creates complex and accurate Minecraft Java Edition worlds that reflect re
This free and open source project is designed to handle large-scale geographic data from the real world and generate detailed Minecraft worlds. The algorithm processes geospatial data from OpenStreetMap as well as elevation data to create an accurate Minecraft representation of terrain and architecture.
Generate your hometown, big cities, and natural landscapes with ease!
![Minecraft Preview](https://raw.githubusercontent.com/louis-e/arnis/refs/heads/main/gitassets/preview.jpg)
<i>This Github page is the official project website. Do not download Arnis from any other website.</i>
![Minecraft Preview](assets/git/preview.jpg)
<i>This Github page and [arnismc.com](https://arnismc.com) are the only official project websites. Do not download Arnis from any other website.</i>
## :keyboard: Usage
<img width="60%" src="https://github.com/louis-e/arnis/blob/main/gitassets/gui.png?raw=true"><br>
<img width="60%" src="assets/git/gui.png"><br>
Download the [latest release](https://github.com/louis-e/arnis/releases/) or [compile](#trophy-open-source) the project on your own.
Choose your area on the map using the rectangle tool and select your Minecraft world - then simply click on <i>Start Generation</i>!
@@ -19,7 +19,7 @@ Additionally, you can customize various generation settings, such as world scale
## 📚 Documentation
<img src="https://github.com/louis-e/arnis/blob/main/gitassets/documentation.png?raw=true" width="100%" alt="Banner">
<img src="assets/git/documentation.png" width="100%" alt="Banner">
Full documentation is available in the [GitHub Wiki](https://github.com/louis-e/arnis/wiki/), covering topics such as technical explanations, FAQs, contribution guidelines and roadmaps.
@@ -34,7 +34,7 @@ Full documentation is available in the [GitHub Wiki](https://github.com/louis-e/
#### How to contribute
This project is open source and welcomes contributions from everyone! Whether you're interested in fixing bugs, improving performance, adding new features, or enhancing documentation, your input is valuable. Simply fork the repository, make your changes, and submit a pull request. Please respect the above mentioned key objectives. Contributions of all levels are appreciated, and your efforts help improve this tool for everyone.
Command line Build: ```cargo run --no-default-features -- --terrain --path="C:/YOUR_PATH/.minecraft/saves/worldname" --bbox="min_lng,min_lat,max_lng,max_lat"```<br>
Command line Build: ```cargo run --no-default-features -- --terrain --path="C:/YOUR_PATH/.minecraft/saves/worldname" --bbox="min_lat,min_lng,max_lat,max_lng"```<br>
GUI Build: ```cargo run```<br>
After your pull request was merged, I will take care of regularly creating update releases which will include your changes.
@@ -51,7 +51,7 @@ After your pull request was merged, I will take care of regularly creating updat
## :newspaper: Academic & Press Recognition
<img src="https://github.com/louis-e/arnis/blob/main/gitassets/recognition.png?raw=true" width="100%" alt="Banner">
<img src="assets/git/recognition.png" width="100%" alt="Banner">
Arnis has been recognized in various academic and press publications after gaining a lot of attention in December 2024.
@@ -78,7 +78,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.[^3]
Download Arnis only from the official source (https://github.com/louis-e/arnis/). Every other website providing a download and claiming to be affiliated with the project is unofficial and may be malicious.
Download Arnis only from the official source https://arnismc.com or https://github.com/louis-e/arnis/. Every other website providing a download and claiming to be affiliated with the project is unofficial and may be malicious.
The logo was made by @nxfx21.

View File

Before

Width:  |  Height:  |  Size: 163 KiB

After

Width:  |  Height:  |  Size: 163 KiB

View File

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 160 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

View File

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

View File

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 196 KiB

View File

Before

Width:  |  Height:  |  Size: 790 KiB

After

Width:  |  Height:  |  Size: 790 KiB

View File

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 127 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

View File

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

View File

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 258 KiB

View File

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

60
flake.lock generated Normal file
View File

@@ -0,0 +1,60 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

36
flake.nix Normal file
View File

@@ -0,0 +1,36 @@
{
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "nixpkgs/nixos-unstable";
};
outputs =
{
flake-utils,
nixpkgs,
...
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
stdenv = if pkgs.stdenv.isLinux then pkgs.stdenvAdapters.useMoldLinker pkgs.stdenv else pkgs.stdenv;
in
{
devShell = pkgs.mkShell.override { inherit stdenv; } {
buildInputs = with pkgs; [
openssl.dev
pkg-config
wayland
glib
gdk-pixbuf
pango
gtk3
libsoup_3.dev
webkitgtk_4_1.dev
];
};
}
);
}

99
flake/flake.lock generated
View File

@@ -1,99 +0,0 @@
{
"nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1724653830,
"narHash": "sha256-88f0KK8h6tGIP4Na5RJDKs0S+7WsGGaCGNkLj/bPV3g=",
"owner": "nix-community",
"repo": "fenix",
"rev": "9ecf5e7d800ace001320da8acadd4a3deb872a83",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"fenix": "fenix",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1724586512,
"narHash": "sha256-mrfwk6nO8N2WtCq3sB2zhd2QN1HMKzeSESzOA6lSsQg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "7106cd3be50b2a43c1d9f2787bf22d4369c2b25b",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View File

@@ -1,34 +0,0 @@
{
inputs = {
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "nixpkgs/nixos-unstable";
};
outputs = { self, fenix, flake-utils, nixpkgs }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
fenixPkgs = (fenix.packages.${system}.stable);
in
{
devShell = pkgs.mkShell
{
buildInputs = with pkgs; [
openssl.dev
pkg-config
fenixPkgs.toolchain
wayland
glib
gdk-pixbuf
pango
gtk3
libsoup_3.dev
webkitgtk_4_1.dev
];
};
});
}

View File

@@ -1,6 +1,6 @@
use crate::coordinate_system::geographic::LLBBox;
use clap::Parser;
use std::path::Path;
use std::path::PathBuf;
use std::time::Duration;
/// Command-line arguments parser
@@ -21,7 +21,7 @@ pub struct Args {
/// Path to the Minecraft world (required)
#[arg(long, value_parser = validate_minecraft_world_path)]
pub path: String,
pub path: PathBuf,
/// Downloader method (requests/curl/wget) (optional)
#[arg(long, default_value = "requests")]
@@ -64,8 +64,8 @@ pub struct Args {
pub spawn_point: Option<(f64, f64)>,
}
fn validate_minecraft_world_path(path: &str) -> Result<String, String> {
let mc_world_path = Path::new(path);
fn validate_minecraft_world_path(path: &str) -> Result<PathBuf, String> {
let mc_world_path = PathBuf::from(path);
if !mc_world_path.exists() {
return Err(format!("Path does not exist: {path}"));
}
@@ -76,7 +76,7 @@ fn validate_minecraft_world_path(path: &str) -> Result<String, String> {
if !region.is_dir() {
return Err(format!("No Minecraft world found at {region:?}"));
}
Ok(path.to_string())
Ok(mc_world_path)
}
fn parse_duration(arg: &str) -> Result<std::time::Duration, std::num::ParseIntError> {

View File

@@ -236,7 +236,7 @@ impl Block {
155 => "chest",
156 => "red_carpet",
157 => "anvil",
158 => "jukebox",
158 => "note_block",
159 => "oak_door",
160 => "brewing_stand",
161 => "red_bed", // North head
@@ -667,7 +667,7 @@ pub const OAK_STAIRS: Block = Block::new(144);
pub const CHEST: Block = Block::new(155);
pub const RED_CARPET: Block = Block::new(156);
pub const ANVIL: Block = Block::new(157);
pub const JUKEBOX: Block = Block::new(158);
pub const NOTE_BLOCK: Block = Block::new(158);
pub const OAK_DOOR: Block = Block::new(159);
pub const BREWING_STAND: Block = Block::new(160);
pub const RED_BED_NORTH_HEAD: Block = Block::new(161);

View File

@@ -1,6 +1,7 @@
use crate::args::Args;
use crate::block_definitions::{BEDROCK, DIRT, GRASS_BLOCK, STONE};
use crate::coordinate_system::cartesian::XZBBox;
use crate::coordinate_system::geographic::LLBBox;
use crate::element_processing::*;
use crate::ground::Ground;
use crate::osm_parser::ProcessedElement;
@@ -14,11 +15,11 @@ pub const MIN_Y: i32 = -64;
pub fn generate_world(
elements: Vec<ProcessedElement>,
xzbbox: XZBBox,
llbbox: LLBBox,
ground: Ground,
args: &Args,
) -> Result<(), String> {
let region_dir: String = format!("{}/region", args.path);
let mut editor: WorldEditor = WorldEditor::new(&region_dir, &xzbbox);
let mut editor: WorldEditor = WorldEditor::new(args.path.clone(), &xzbbox, llbbox);
println!("{} Processing data...", "[4/7]".bold());
@@ -63,7 +64,7 @@ pub fn generate_world(
if way.tags.contains_key("building") || way.tags.contains_key("building:part") {
buildings::generate_buildings(&mut editor, way, args, None);
} else if way.tags.contains_key("highway") {
highways::generate_highways(&mut editor, element, args);
highways::generate_highways(&mut editor, element, args, &elements);
} else if way.tags.contains_key("landuse") {
landuse::generate_landuse(&mut editor, way, args);
} else if way.tags.contains_key("natural") {
@@ -74,12 +75,19 @@ pub fn generate_world(
leisure::generate_leisure(&mut editor, way, args);
} else if way.tags.contains_key("barrier") {
barriers::generate_barriers(&mut editor, element);
} else if way.tags.contains_key("waterway") {
waterways::generate_waterways(&mut editor, way);
} else if let Some(val) = way.tags.get("waterway") {
if val == "dock" {
// docks count as water areas
water_areas::generate_water_area_from_way(&mut editor, way);
} else {
waterways::generate_waterways(&mut editor, way);
}
} else if way.tags.contains_key("bridge") {
//bridges::generate_bridges(&mut editor, way, ground_level); // TODO FIX
} else if way.tags.contains_key("railway") {
railways::generate_railways(&mut editor, way);
} else if way.tags.contains_key("roller_coaster") {
railways::generate_roller_coaster(&mut editor, way);
} else if way.tags.contains_key("aeroway") || way.tags.contains_key("area:aeroway")
{
highways::generate_aeroway(&mut editor, way, args);
@@ -101,7 +109,7 @@ pub fn generate_world(
} else if node.tags.contains_key("barrier") {
barriers::generate_barrier_nodes(&mut editor, node);
} else if node.tags.contains_key("highway") {
highways::generate_highways(&mut editor, element, args);
highways::generate_highways(&mut editor, element, args, &elements);
} else if node.tags.contains_key("tourism") {
tourisms::generate_tourisms(&mut editor, node);
} else if node.tags.contains_key("man_made") {
@@ -112,9 +120,13 @@ pub fn generate_world(
if rel.tags.contains_key("building") || rel.tags.contains_key("building:part") {
buildings::generate_building_from_relation(&mut editor, rel, args);
} else if rel.tags.contains_key("water")
|| rel.tags.get("natural") == Some(&"water".to_string())
|| rel
.tags
.get("natural")
.map(|val| val == "water" || val == "bay")
.unwrap_or(false)
{
water_areas::generate_water_areas(&mut editor, rel);
water_areas::generate_water_areas_from_relation(&mut editor, rel);
} else if rel.tags.contains_key("natural") {
natural::generate_natural_from_relation(&mut editor, rel, args);
} else if rel.tags.contains_key("landuse") {
@@ -187,6 +199,8 @@ pub fn generate_world(
editor.set_block_absolute(BEDROCK, x, MIN_Y, z, None, Some(&[BEDROCK]));
block_counter += 1;
// Use manual % check since is_multiple_of() is unstable on stable Rust
#[allow(clippy::manual_is_multiple_of)]
if block_counter % batch_size == 0 {
ground_pb.inc(batch_size);
}

View File

@@ -92,13 +92,6 @@ pub fn generate_amenities(editor: &mut WorldEditor, element: &ProcessedElement,
}
}
}
"vending" => {
// Place vending machine blocks
if let Some(pt) = first_node {
editor.set_block(IRON_BLOCK, pt.x, 1, pt.z, None, None);
editor.set_block(IRON_BLOCK, pt.x, 2, pt.z, None, None);
}
}
"shelter" => {
let roof_block: Block = STONE_BRICK_SLAB;

View File

@@ -5,8 +5,66 @@ use crate::coordinate_system::cartesian::XZPoint;
use crate::floodfill::flood_fill_area;
use crate::osm_parser::{ProcessedElement, ProcessedWay};
use crate::world_editor::WorldEditor;
use std::collections::HashMap;
pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, args: &Args) {
/// Generates highways with elevation support based on layer tags and connectivity analysis
pub fn generate_highways(
editor: &mut WorldEditor,
element: &ProcessedElement,
args: &Args,
all_elements: &[ProcessedElement],
) {
let highway_connectivity = build_highway_connectivity_map(all_elements);
generate_highways_internal(editor, element, args, &highway_connectivity);
}
/// Build a connectivity map for highway endpoints to determine where slopes are needed
fn build_highway_connectivity_map(elements: &[ProcessedElement]) -> HashMap<(i32, i32), Vec<i32>> {
let mut connectivity_map: HashMap<(i32, i32), Vec<i32>> = HashMap::new();
for element in elements {
if let ProcessedElement::Way(way) = element {
if way.tags.contains_key("highway") {
let layer_value = way
.tags
.get("layer")
.and_then(|layer| layer.parse::<i32>().ok())
.unwrap_or(0);
// Treat negative layers as ground level (0) for connectivity
let layer_value = if layer_value < 0 { 0 } else { layer_value };
// Add connectivity for start and end nodes
if !way.nodes.is_empty() {
let start_node = &way.nodes[0];
let end_node = &way.nodes[way.nodes.len() - 1];
let start_coord = (start_node.x, start_node.z);
let end_coord = (end_node.x, end_node.z);
connectivity_map
.entry(start_coord)
.or_default()
.push(layer_value);
connectivity_map
.entry(end_coord)
.or_default()
.push(layer_value);
}
}
}
}
connectivity_map
}
/// Internal function that generates highways with connectivity context for elevation handling
fn generate_highways_internal(
editor: &mut WorldEditor,
element: &ProcessedElement,
args: &Args,
highway_connectivity: &HashMap<(i32, i32), Vec<i32>>, // Maps node coordinates to list of layers that connect to this node
) {
if let Some(highway_type) = element.tags().get("highway") {
if highway_type == "street_lamp" {
// Handle street lamps
@@ -97,13 +155,17 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
let mut add_outline = false;
let scale_factor = args.scale;
// Skip if 'layer' or 'level' is negative in the tags
if let Some(layer) = element.tags().get("layer") {
if layer.parse::<i32>().unwrap_or(0) < 0 {
return;
}
}
// Parse the layer value for elevation calculation
let layer_value = element
.tags()
.get("layer")
.and_then(|layer| layer.parse::<i32>().ok())
.unwrap_or(0);
// Treat negative layers as ground level (0)
let layer_value = if layer_value < 0 { 0 } else { layer_value };
// Skip if 'level' is negative in the tags (indoor mapping)
if let Some(level) = element.tags().get("level") {
if level.parse::<i32>().unwrap_or(0) < 0 {
return;
@@ -120,10 +182,14 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
block_type = DIRT_PATH;
block_range = 1;
}
"motorway" | "primary" => {
"motorway" | "primary" | "trunk" => {
block_range = 5;
add_stripe = true;
}
"secondary" => {
block_range = 4;
add_stripe = true;
}
"tertiary" => {
add_stripe = true;
}
@@ -173,7 +239,40 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
block_range = ((block_range as f64) * scale_factor).floor() as i32;
}
// Calculate elevation based on layer
const LAYER_HEIGHT_STEP: i32 = 6; // Each layer is 6 blocks higher/lower
let base_elevation = layer_value * LAYER_HEIGHT_STEP;
// Check if we need slopes at start and end
let needs_start_slope =
should_add_slope_at_node(&way.nodes[0], layer_value, highway_connectivity);
let needs_end_slope = should_add_slope_at_node(
&way.nodes[way.nodes.len() - 1],
layer_value,
highway_connectivity,
);
// Calculate total way length for slope distribution
let total_way_length = calculate_way_length(way);
// Check if this is a short isolated elevated segment - if so, treat as ground level
let is_short_isolated_elevated =
needs_start_slope && needs_end_slope && layer_value > 0 && total_way_length <= 35;
// Override elevation and slopes for short isolated segments
let (effective_elevation, effective_start_slope, effective_end_slope) =
if is_short_isolated_elevated {
(0, false, false) // Treat as ground level
} else {
(base_elevation, needs_start_slope, needs_end_slope)
};
let slope_length = (total_way_length as f32 * 0.35).clamp(15.0, 50.0) as usize; // 35% of way length, max 50 blocks, min 15 blocks
// Iterate over nodes to create the highway
let mut segment_index = 0;
let total_segments = way.nodes.len() - 1;
for node in &way.nodes {
if let Some(prev) = previous_node {
let (x1, z1) = prev;
@@ -181,17 +280,30 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
let z2: i32 = node.z;
// Generate the line of coordinates between the two nodes
// we don't care about the y because it's going to get overwritten
// I'm not sure if we'll keep it this way
let bresenham_points: Vec<(i32, i32, i32)> =
bresenham_line(x1, 0, z1, x2, 0, z2);
// Calculate elevation for this segment
let segment_length = bresenham_points.len();
// Variables to manage dashed line pattern
let mut stripe_length: i32 = 0;
let dash_length: i32 = (5.0 * scale_factor).ceil() as i32; // Length of the solid part of the stripe
let gap_length: i32 = (5.0 * scale_factor).ceil() as i32; // Length of the gap part of the stripe
let dash_length: i32 = (5.0 * scale_factor).ceil() as i32;
let gap_length: i32 = (5.0 * scale_factor).ceil() as i32;
for (point_index, (x, _, z)) in bresenham_points.iter().enumerate() {
// Calculate Y elevation for this point based on slopes and layer
let current_y = calculate_point_elevation(
segment_index,
point_index,
segment_length,
total_segments,
effective_elevation,
effective_start_slope,
effective_end_slope,
slope_length,
);
for (x, _, z) in bresenham_points {
// Draw the road surface for the entire width
for dx in -block_range..=block_range {
for dz in -block_range..=block_range {
@@ -209,7 +321,7 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
WHITE_CONCRETE,
set_x,
0,
current_y,
set_z,
Some(&[BLACK_CONCRETE]),
None,
@@ -218,7 +330,7 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
BLACK_CONCRETE,
set_x,
0,
current_y,
set_z,
None,
None,
@@ -228,7 +340,7 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
WHITE_CONCRETE,
set_x,
0,
current_y,
set_z,
Some(&[BLACK_CONCRETE]),
None,
@@ -237,7 +349,7 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
BLACK_CONCRETE,
set_x,
0,
current_y,
set_z,
None,
None,
@@ -247,12 +359,38 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
block_type,
set_x,
0,
current_y,
set_z,
None,
Some(&[BLACK_CONCRETE, WHITE_CONCRETE]),
);
}
// Add stone brick foundation underneath elevated highways for thickness
if effective_elevation > 0 && current_y > 0 {
// Add 1 layer of stone bricks underneath the highway surface
editor.set_block(
STONE_BRICKS,
set_x,
current_y - 1,
set_z,
None,
None,
);
}
// Add support pillars for elevated highways
if effective_elevation != 0 && current_y > 0 {
add_highway_support_pillar(
editor,
set_x,
current_y,
set_z,
dx,
dz,
block_range,
);
}
}
}
@@ -265,7 +403,7 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
LIGHT_GRAY_CONCRETE,
outline_x,
0,
current_y,
outline_z,
None,
None,
@@ -278,7 +416,7 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
editor.set_block(
LIGHT_GRAY_CONCRETE,
outline_x,
0,
current_y,
outline_z,
None,
None,
@@ -289,12 +427,12 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
// Add a dashed white line in the middle for larger roads
if add_stripe {
if stripe_length < dash_length {
let stripe_x: i32 = x;
let stripe_z: i32 = z;
let stripe_x: i32 = *x;
let stripe_z: i32 = *z;
editor.set_block(
WHITE_CONCRETE,
stripe_x,
0,
current_y,
stripe_z,
Some(&[BLACK_CONCRETE]),
None,
@@ -308,6 +446,8 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
}
}
}
segment_index += 1;
}
previous_node = Some((node.x, node.z));
}
@@ -315,6 +455,131 @@ pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, a
}
}
/// Helper function to determine if a slope should be added at a specific node
fn should_add_slope_at_node(
node: &crate::osm_parser::ProcessedNode,
current_layer: i32,
highway_connectivity: &HashMap<(i32, i32), Vec<i32>>,
) -> bool {
let node_coord = (node.x, node.z);
// If we don't have connectivity information, always add slopes for non-zero layers
if highway_connectivity.is_empty() {
return current_layer != 0;
}
// Check if there are other highways at different layers connected to this node
if let Some(connected_layers) = highway_connectivity.get(&node_coord) {
// Count how many ways are at the same layer as current way
let same_layer_count = connected_layers
.iter()
.filter(|&&layer| layer == current_layer)
.count();
// If this is the only way at this layer connecting to this node, we need a slope
// (unless we're at ground level and connecting to ground level ways)
if same_layer_count <= 1 {
return current_layer != 0;
}
// If there are multiple ways at the same layer, don't add slope
false
} else {
// No other highways connected, add slope if not at ground level
current_layer != 0
}
}
/// Helper function to calculate the total length of a way in blocks
fn calculate_way_length(way: &ProcessedWay) -> usize {
let mut total_length = 0;
let mut previous_node: Option<&crate::osm_parser::ProcessedNode> = None;
for node in &way.nodes {
if let Some(prev) = previous_node {
let dx = (node.x - prev.x).abs();
let dz = (node.z - prev.z).abs();
total_length += ((dx * dx + dz * dz) as f32).sqrt() as usize;
}
previous_node = Some(node);
}
total_length
}
/// Calculate the Y elevation for a specific point along the highway
#[allow(clippy::too_many_arguments)]
fn calculate_point_elevation(
segment_index: usize,
point_index: usize,
segment_length: usize,
total_segments: usize,
base_elevation: i32,
needs_start_slope: bool,
needs_end_slope: bool,
slope_length: usize,
) -> i32 {
// If no slopes needed, return base elevation
if !needs_start_slope && !needs_end_slope {
return base_elevation;
}
// Calculate total distance from start
let total_distance_from_start = segment_index * segment_length + point_index;
let total_way_length = total_segments * segment_length;
// Ensure we have reasonable values
if total_way_length == 0 || slope_length == 0 {
return base_elevation;
}
// Start slope calculation - gradual rise from ground level
if needs_start_slope && total_distance_from_start <= slope_length {
let slope_progress = total_distance_from_start as f32 / slope_length as f32;
let elevation_offset = (base_elevation as f32 * slope_progress) as i32;
return elevation_offset;
}
// End slope calculation - gradual descent to ground level
if needs_end_slope
&& total_distance_from_start >= (total_way_length.saturating_sub(slope_length))
{
let distance_from_end = total_way_length - total_distance_from_start;
let slope_progress = distance_from_end as f32 / slope_length as f32;
let elevation_offset = (base_elevation as f32 * slope_progress) as i32;
return elevation_offset;
}
// Middle section at full elevation
base_elevation
}
/// Add support pillars for elevated highways
fn add_highway_support_pillar(
editor: &mut WorldEditor,
x: i32,
highway_y: i32,
z: i32,
dx: i32,
dz: i32,
_block_range: i32, // Keep for future use
) {
// Only add pillars at specific intervals and positions
if dx == 0 && dz == 0 && (x + z) % 8 == 0 {
// Add pillar from ground to highway level
for y in 1..highway_y {
editor.set_block(STONE_BRICKS, x, y, z, None, None);
}
// Add pillar base
for base_dx in -1..=1 {
for base_dz in -1..=1 {
editor.set_block(STONE_BRICKS, x + base_dx, 0, z + base_dz, None, None);
}
}
}
}
/// Generates a siding using stone brick slabs
pub fn generate_siding(editor: &mut WorldEditor, element: &ProcessedWay) {
let mut previous_node: Option<XZPoint> = None;

View File

@@ -18,6 +18,7 @@ pub fn generate_leisure(editor: &mut WorldEditor, element: &ProcessedWay, args:
"park" | "nature_reserve" | "garden" | "disc_golf_course" | "golf_course" => {
GRASS_BLOCK
}
"schoolyard" => BLACK_CONCRETE,
"playground" | "recreation_ground" | "pitch" | "beach_resort" | "dog_park" => {
if let Some(surface) = element.tags.get("surface") {
match surface.as_str() {

View File

@@ -25,6 +25,7 @@ pub fn generate_man_made(editor: &mut WorldEditor, element: &ProcessedElement, _
"chimney" => generate_chimney(editor, element),
"water_well" => generate_water_well(editor, element),
"water_tower" => generate_water_tower(editor, element),
"mast" => generate_antenna(editor, element),
_ => {} // Unknown man_made type, ignore
}
}
@@ -96,7 +97,6 @@ fn generate_antenna(editor: &mut WorldEditor, element: &ProcessedElement) {
Some(h) => h.parse::<i32>().unwrap_or(20).min(40), // Max 40 blocks
None => match element.tags().get("tower:type").map(|s| s.as_str()) {
Some("communication") => 20,
Some("transmission") => 25,
Some("cellular") => 15,
_ => 20,
},
@@ -249,6 +249,7 @@ pub fn generate_man_made_nodes(editor: &mut WorldEditor, node: &ProcessedNode) {
"chimney" => generate_chimney(editor, &element),
"water_well" => generate_water_well(editor, &element),
"water_tower" => generate_water_tower(editor, &element),
"mast" => generate_antenna(editor, &element),
_ => {} // Unknown man_made type, ignore
}
}

View File

@@ -174,3 +174,71 @@ fn determine_rail_direction(
(None, None) => RAIL_NORTH_SOUTH,
}
}
pub fn generate_roller_coaster(editor: &mut WorldEditor, element: &ProcessedWay) {
if let Some(roller_coaster) = element.tags.get("roller_coaster") {
if roller_coaster == "track" {
// Check if it's indoor (skip if yes)
if let Some(indoor) = element.tags.get("indoor") {
if indoor == "yes" {
return;
}
}
// Check if layer is negative (skip if yes)
if let Some(layer) = element.tags.get("layer") {
if let Ok(layer_value) = layer.parse::<i32>() {
if layer_value < 0 {
return;
}
}
}
let elevation_height = 4; // 4 blocks in the air
let pillar_interval = 6; // Support pillars every 6 blocks
for i in 1..element.nodes.len() {
let prev_node = element.nodes[i - 1].xz();
let cur_node = element.nodes[i].xz();
let points = bresenham_line(prev_node.x, 0, prev_node.z, cur_node.x, 0, cur_node.z);
let smoothed_points = smooth_diagonal_rails(&points);
for j in 0..smoothed_points.len() {
let (bx, _, bz) = smoothed_points[j];
// Place track foundation at elevation height
editor.set_block(IRON_BLOCK, bx, elevation_height, bz, None, None);
let prev = if j > 0 {
Some(smoothed_points[j - 1])
} else {
None
};
let next = if j < smoothed_points.len() - 1 {
Some(smoothed_points[j + 1])
} else {
None
};
let rail_block = determine_rail_direction(
(bx, bz),
prev.map(|(x, _, z)| (x, z)),
next.map(|(x, _, z)| (x, z)),
);
// Place rail on top of the foundation
editor.set_block(rail_block, bx, elevation_height + 1, bz, None, None);
// Place support pillars every pillar_interval blocks
if bx % pillar_interval == 0 && bz % pillar_interval == 0 {
// Create a pillar from ground level up to the track
for y in 1..elevation_height {
editor.set_block(IRON_BLOCK, bx, y, bz, None, None);
}
}
}
}
}
}
}

View File

@@ -133,7 +133,7 @@ pub fn get_interior_block(c: char, is_layer2: bool, wall_block: Block) -> Option
'6' => Some(RED_BED_SOUTH_FOOT), // Bed South Foot
'7' => Some(RED_BED_WEST_HEAD), // Bed West Head
'8' => Some(RED_BED_WEST_FOOT), // Bed West Foot
'H' => Some(CHEST), // Chest
// 'H' => Some(CHEST), // Chest
'L' => Some(CAULDRON), // Cauldron
'A' => Some(ANVIL), // Anvil
'P' => Some(OAK_PRESSURE_PLATE), // Pressure Plate
@@ -145,7 +145,7 @@ pub fn get_interior_block(c: char, is_layer2: bool, wall_block: Block) -> Option
Some(DARK_OAK_DOOR_LOWER)
}
}
'J' => Some(JUKEBOX), // Jukebox
'J' => Some(NOTE_BLOCK), // Note block
'G' => Some(GLOWSTONE), // Glowstone
'N' => Some(BREWING_STAND), // Brewing Stand
'T' => Some(WHITE_CARPET), // White Carpet

View File

@@ -307,7 +307,7 @@ impl Tree<'_> {
FURNACE,
ANVIL,
BREWING_STAND,
JUKEBOX,
NOTE_BLOCK,
BOOKSHELF,
CAULDRON,
// Beds

View File

@@ -4,16 +4,32 @@ use std::time::Instant;
use crate::{
block_definitions::WATER,
coordinate_system::cartesian::XZPoint,
osm_parser::{ProcessedMemberRole, ProcessedNode, ProcessedRelation},
osm_parser::{ProcessedMemberRole, ProcessedNode, ProcessedRelation, ProcessedWay},
world_editor::WorldEditor,
};
pub fn generate_water_areas(editor: &mut WorldEditor, element: &ProcessedRelation) {
pub fn generate_water_area_from_way(editor: &mut WorldEditor, element: &ProcessedWay) {
let start_time = Instant::now();
let outers = [element.nodes.clone()];
if !verify_loopy_loops(&outers) {
println!("Skipping way {} due to invalid polygon", element.id);
return;
}
generate_water_areas(editor, &outers, &[], start_time);
}
pub fn generate_water_areas_from_relation(editor: &mut WorldEditor, element: &ProcessedRelation) {
let start_time = Instant::now();
// Check if this is a water relation (either with water tag or natural=water)
let is_water = element.tags.contains_key("water")
|| element.tags.get("natural") == Some(&"water".to_string());
|| element
.tags
.get("natural")
.map(|val| val == "water" || val == "bay")
.unwrap_or(false);
if !is_water {
return;
@@ -36,70 +52,41 @@ pub fn generate_water_areas(editor: &mut WorldEditor, element: &ProcessedRelatio
}
}
// Process each outer polygon individually
for (i, outer_nodes) in outers.iter().enumerate() {
let mut individual_outers = vec![outer_nodes.clone()];
merge_loopy_loops(&mut individual_outers);
if !verify_loopy_loops(&individual_outers) {
println!(
"Skipping invalid outer polygon {} for relation {}",
i + 1,
element.id
);
continue; // Skip this outer if it's not valid
}
merge_loopy_loops(&mut inners);
if !verify_loopy_loops(&inners) {
// If inners are invalid, process outer without inners
let empty_inners: Vec<Vec<ProcessedNode>> = vec![];
let mut temp_inners = empty_inners;
merge_loopy_loops(&mut temp_inners);
let (min_x, min_z) = editor.get_min_coords();
let (max_x, max_z) = editor.get_max_coords();
let individual_outers_xz: Vec<Vec<XZPoint>> = individual_outers
.iter()
.map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
.collect();
let empty_inners_xz: Vec<Vec<XZPoint>> = vec![];
inverse_floodfill(
min_x,
min_z,
max_x,
max_z,
individual_outers_xz,
empty_inners_xz,
editor,
start_time,
);
continue;
}
let (min_x, min_z) = editor.get_min_coords();
let (max_x, max_z) = editor.get_max_coords();
let individual_outers_xz: Vec<Vec<XZPoint>> = individual_outers
.iter()
.map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
.collect();
let inners_xz: Vec<Vec<XZPoint>> = inners
.iter()
.map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
.collect();
inverse_floodfill(
min_x,
min_z,
max_x,
max_z,
individual_outers_xz,
inners_xz,
editor,
start_time,
);
merge_loopy_loops(&mut outers);
if !verify_loopy_loops(&outers) {
println!("Skipping relation {} due to invalid polygon", element.id);
return;
}
merge_loopy_loops(&mut inners);
if !verify_loopy_loops(&inners) {
println!("Skipping relation {} due to invalid polygon", element.id);
return;
}
generate_water_areas(editor, &outers, &inners, start_time);
}
fn generate_water_areas(
editor: &mut WorldEditor,
outers: &[Vec<ProcessedNode>],
inners: &[Vec<ProcessedNode>],
start_time: Instant,
) {
let (min_x, min_z) = editor.get_min_coords();
let (max_x, max_z) = editor.get_max_coords();
let outers_xz: Vec<Vec<XZPoint>> = outers
.iter()
.map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
.collect();
let inners_xz: Vec<Vec<XZPoint>> = inners
.iter()
.map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
.collect();
inverse_floodfill(
min_x, min_z, max_x, max_z, outers_xz, inners_xz, editor, start_time,
);
}
// Merges ways that share nodes into full loops

View File

@@ -44,6 +44,28 @@ fn lat_lng_to_tile(lat: f64, lng: f64, zoom: u8) -> (u32, u32) {
(x, y)
}
/// Downloads a tile from AWS Terrain Tiles service
fn download_tile(
client: &reqwest::blocking::Client,
tile_x: u32,
tile_y: u32,
zoom: u8,
tile_path: &Path,
) -> Result<image::ImageBuffer<Rgb<u8>, Vec<u8>>, Box<dyn std::error::Error>> {
println!("Fetching tile x={tile_x},y={tile_y},z={zoom} from AWS Terrain Tiles");
let url: String = AWS_TERRARIUM_URL
.replace("{z}", &zoom.to_string())
.replace("{x}", &tile_x.to_string())
.replace("{y}", &tile_y.to_string());
let response: reqwest::blocking::Response = client.get(&url).send()?;
response.error_for_status_ref()?;
let bytes = response.bytes()?;
std::fs::write(tile_path, &bytes)?;
let img: image::DynamicImage = image::load_from_memory(&bytes)?;
Ok(img.to_rgb8())
}
pub fn fetch_elevation_data(
bbox: &LLBBox,
scale: f64,
@@ -80,26 +102,54 @@ pub fn fetch_elevation_data(
let tile_path = tile_cache_dir.join(format!("z{zoom}_x{tile_x}_y{tile_y}.png"));
let rgb_img: image::ImageBuffer<Rgb<u8>, Vec<u8>> = if tile_path.exists() {
println!(
"Loading cached tile x={tile_x},y={tile_y},z={zoom} from {}",
tile_path.display()
);
let img: image::DynamicImage = image::open(&tile_path)?;
img.to_rgb8()
} else {
// AWS Terrain Tiles don't require an API key
println!("Fetching tile x={tile_x},y={tile_y},z={zoom} from AWS Terrain Tiles");
let url: String = AWS_TERRARIUM_URL
.replace("{z}", &zoom.to_string())
.replace("{x}", &tile_x.to_string())
.replace("{y}", &tile_y.to_string());
// Check if the cached file has a reasonable size (PNG files should be at least a few KB)
let file_size = match std::fs::metadata(&tile_path) {
Ok(metadata) => metadata.len(),
Err(_) => 0,
};
let response: reqwest::blocking::Response = client.get(&url).send()?;
response.error_for_status_ref()?;
let bytes = response.bytes()?;
std::fs::write(&tile_path, &bytes)?;
let img: image::DynamicImage = image::load_from_memory(&bytes)?;
img.to_rgb8()
if file_size < 1000 {
eprintln!("Warning: Cached tile at {} appears to be too small ({} bytes). Refetching tile.",
tile_path.display(), file_size);
// Remove the potentially corrupted file
if let Err(remove_err) = std::fs::remove_file(&tile_path) {
eprintln!(
"Warning: Failed to remove corrupted tile file: {}",
remove_err
);
}
// Re-download the tile
download_tile(&client, *tile_x, *tile_y, zoom, &tile_path)?
} else {
println!(
"Loading cached tile x={tile_x},y={tile_y},z={zoom} from {}",
tile_path.display()
);
// Try to load cached tile, but handle corruption gracefully
match image::open(&tile_path) {
Ok(img) => img.to_rgb8(),
Err(e) => {
eprintln!("Warning: Cached tile at {} is corrupted or invalid: {}. Re-downloading...", tile_path.display(), e);
// Remove the corrupted file
if let Err(remove_err) = std::fs::remove_file(&tile_path) {
eprintln!(
"Warning: Failed to remove corrupted tile file: {}",
remove_err
);
}
// Re-download the tile
download_tile(&client, *tile_x, *tile_y, zoom, &tile_path)?
}
}
}
} else {
// Download the tile for the first time
download_tile(&client, *tile_x, *tile_y, zoom, &tile_path)?
};
// Only process pixels that fall within the requested bbox

View File

@@ -68,11 +68,14 @@ fn optimized_flood_fill_area(
// Pre-allocate queue with reasonable capacity to avoid reallocations
let mut queue = VecDeque::with_capacity(1024);
let mut iterations = 0u64;
const MAX_ITERATIONS: u64 = 1_000_000; // Safety limit to prevent infinite loops
for z in (min_z..=max_z).step_by(step_z as usize) {
for x in (min_x..=max_x).step_by(step_x as usize) {
// Fast timeout check - only every few iterations
if filled_area.len() % 100 == 0 {
// Check timeout more frequently for small areas
#[allow(clippy::manual_is_multiple_of)]
if iterations % 50 == 0 {
if let Some(timeout) = timeout {
if start_time.elapsed() > *timeout {
return filled_area;
@@ -80,6 +83,16 @@ fn optimized_flood_fill_area(
}
}
// Safety check: prevent infinite loops
iterations += 1;
if iterations > MAX_ITERATIONS {
eprintln!(
"Warning: Flood fill exceeded max iterations ({}), aborting",
MAX_ITERATIONS
);
return filled_area;
}
// Skip if already visited or not inside polygon
if global_visited.contains(&(x, z))
|| !polygon.contains(&Point::new(x as f64, z as f64))
@@ -93,6 +106,26 @@ fn optimized_flood_fill_area(
global_visited.insert((x, z));
while let Some((curr_x, curr_z)) = queue.pop_front() {
// Additional iteration check inside inner loop
iterations += 1;
if iterations > MAX_ITERATIONS {
eprintln!(
"Warning: Flood fill exceeded max iterations ({}), aborting",
MAX_ITERATIONS
);
return filled_area;
}
// Timeout check in inner loop for problematic polygons
#[allow(clippy::manual_is_multiple_of)]
if iterations % 1000 == 0 {
if let Some(timeout) = timeout {
if start_time.elapsed() > *timeout {
return filled_area;
}
}
}
// Add current point to filled area
filled_area.push((curr_x, curr_z));
@@ -155,12 +188,15 @@ fn original_flood_fill_area(
// Pre-allocate queue and reserve space for filled_area
let mut queue: VecDeque<(i32, i32)> = VecDeque::with_capacity(2048);
filled_area.reserve(1000); // Reserve space to reduce reallocations
let mut iterations = 0u64;
const MAX_ITERATIONS: u64 = 1_000_000; // Safety limit to prevent infinite loops
// Scan for multiple seed points to handle U-shapes and concave polygons
for z in (min_z..=max_z).step_by(step_z as usize) {
for x in (min_x..=max_x).step_by(step_x as usize) {
// Reduced timeout checking frequency for better performance
if global_visited.len() % 200 == 0 {
// Check timeout more frequently for problematic polygons
#[allow(clippy::manual_is_multiple_of)]
if iterations % 50 == 0 {
if let Some(timeout) = timeout {
if &start_time.elapsed() > timeout {
return filled_area;
@@ -168,6 +204,16 @@ fn original_flood_fill_area(
}
}
// Safety check: prevent infinite loops
iterations += 1;
if iterations > MAX_ITERATIONS {
eprintln!(
"Warning: Flood fill exceeded max iterations ({}), aborting",
MAX_ITERATIONS
);
return filled_area;
}
// Skip if already processed or not inside polygon
if global_visited.contains(&(x, z))
|| !polygon.contains(&Point::new(x as f64, z as f64))
@@ -181,6 +227,26 @@ fn original_flood_fill_area(
global_visited.insert((x, z));
while let Some((curr_x, curr_z)) = queue.pop_front() {
// Additional iteration check inside inner loop
iterations += 1;
if iterations > MAX_ITERATIONS {
eprintln!(
"Warning: Flood fill exceeded max iterations ({}), aborting",
MAX_ITERATIONS
);
return filled_area;
}
// Timeout check in inner loop
#[allow(clippy::manual_is_multiple_of)]
if iterations % 1000 == 0 {
if let Some(timeout) = timeout {
if &start_time.elapsed() > timeout {
return filled_area;
}
}
}
// Only check polygon containment once per point when adding to filled_area
if polygon.contains(&Point::new(curr_x as f64, curr_z as f64)) {
filled_area.push((curr_x, curr_z));

View File

@@ -23,12 +23,22 @@ impl Ground {
}
pub fn new_enabled(bbox: &LLBBox, scale: f64, ground_level: i32) -> Self {
let elevation_data = fetch_elevation_data(bbox, scale, ground_level)
.expect("Failed to fetch elevation data");
Self {
elevation_enabled: true,
ground_level,
elevation_data: Some(elevation_data),
match fetch_elevation_data(bbox, scale, ground_level) {
Ok(elevation_data) => Self {
elevation_enabled: true,
ground_level,
elevation_data: Some(elevation_data),
},
Err(e) => {
eprintln!("Failed to fetch elevation data: {}", e);
emit_gui_progress_update(15.0, "Elevation unavailable, using flat ground");
// Graceful fallback: disable elevation and keep provided ground_level
Self {
elevation_enabled: false,
ground_level,
elevation_data: None,
}
}
}
}

View File

@@ -1,6 +1,7 @@
use crate::args::Args;
use crate::coordinate_system::cartesian::XZPoint;
use crate::coordinate_system::geographic::{LLBBox, LLPoint};
use crate::coordinate_system::transformation::CoordTransformer;
use crate::data_processing;
use crate::ground::{self, Ground};
use crate::map_transformation;
@@ -226,13 +227,13 @@ fn create_new_world(base_path: &Path) -> Result<String, String> {
.map_err(|e| format!("Failed to create world directory: {e}"))?;
// Copy the region template file
const REGION_TEMPLATE: &[u8] = include_bytes!("../mcassets/region.template");
const REGION_TEMPLATE: &[u8] = include_bytes!("../assets/minecraft/region.template");
let region_path = new_world_path.join("region").join("r.0.0.mca");
fs::write(&region_path, REGION_TEMPLATE)
.map_err(|e| format!("Failed to create region file: {e}"))?;
// Add the level.dat file
const LEVEL_TEMPLATE: &[u8] = include_bytes!("../mcassets/level.dat");
const LEVEL_TEMPLATE: &[u8] = include_bytes!("../assets/minecraft/level.dat");
// Decompress the gzipped level.template
let mut decoder = GzDecoder::new(LEVEL_TEMPLATE);
@@ -299,7 +300,7 @@ fn create_new_world(base_path: &Path) -> Result<String, String> {
.map_err(|e| format!("Failed to create level.dat file: {e}"))?;
// Add the icon.png file
const ICON_TEMPLATE: &[u8] = include_bytes!("../mcassets/icon.png");
const ICON_TEMPLATE: &[u8] = include_bytes!("../assets/minecraft/icon.png");
fs::write(new_world_path.join("icon.png"), ICON_TEMPLATE)
.map_err(|e| format!("Failed to create icon.png file: {e}"))?;
@@ -307,52 +308,45 @@ fn create_new_world(base_path: &Path) -> Result<String, String> {
}
/// Adds localized area name to the world name in level.dat
fn add_localized_world_name(world_path_str: &str, bbox: &LLBBox) -> String {
let world_path = PathBuf::from(world_path_str);
fn add_localized_world_name(world_path: PathBuf, bbox: &LLBBox) -> PathBuf {
// Only proceed if the path exists
if !world_path.exists() {
return world_path_str.to_string();
return world_path;
}
// Check the level.dat file first to get the current name
let level_path = world_path.join("level.dat");
if !level_path.exists() {
return world_path_str.to_string();
return world_path;
}
// Try to read the current world name from level.dat
let current_name = match std::fs::read(&level_path) {
Ok(level_data) => {
let mut decoder = GzDecoder::new(level_data.as_slice());
let mut decompressed_data = Vec::new();
if decoder.read_to_end(&mut decompressed_data).is_ok() {
if let Ok(Value::Compound(ref root)) =
fastnbt::from_bytes::<Value>(&decompressed_data)
{
if let Some(Value::Compound(ref data)) = root.get("Data") {
if let Some(Value::String(name)) = data.get("LevelName") {
name.clone()
} else {
return world_path_str.to_string();
}
} else {
return world_path_str.to_string();
}
} else {
return world_path_str.to_string();
}
} else {
return world_path_str.to_string();
}
}
Err(_) => return world_path_str.to_string(),
let Ok(level_data) = std::fs::read(&level_path) else {
return world_path;
};
let mut decoder = GzDecoder::new(level_data.as_slice());
let mut decompressed_data = Vec::new();
if decoder.read_to_end(&mut decompressed_data).is_err() {
return world_path;
}
let Ok(Value::Compound(ref root)) = fastnbt::from_bytes::<Value>(&decompressed_data) else {
return world_path;
};
let Some(Value::Compound(ref data)) = root.get("Data") else {
return world_path;
};
let Some(Value::String(current_name)) = data.get("LevelName") else {
return world_path;
};
// Only modify if it's an Arnis world and doesn't already have an area name
if !current_name.starts_with("Arnis World ") || current_name.contains(": ") {
return world_path_str.to_string();
return world_path;
}
// Calculate center coordinates of bbox
@@ -362,7 +356,7 @@ fn add_localized_world_name(world_path_str: &str, bbox: &LLBBox) -> String {
// Try to fetch the area name
let area_name = match retrieve_data::fetch_area_name(center_lat, center_lon) {
Ok(Some(name)) => name,
_ => return world_path_str.to_string(), // Keep original name if no area name found
_ => return world_path, // Keep original name if no area name found
};
// Create new name with localized area name, ensuring total length doesn't exceed 30 characters
@@ -378,7 +372,7 @@ fn add_localized_world_name(world_path_str: &str, bbox: &LLBBox) -> String {
.collect::<String>()
} else if max_area_name_len == 0 {
// If base name is already too long, don't add area name
return world_path_str.to_string();
return world_path;
} else {
area_name
};
@@ -417,7 +411,7 @@ fn add_localized_world_name(world_path_str: &str, bbox: &LLBBox) -> String {
}
// Return the original path since we didn't change the directory name
world_path_str.to_string()
world_path
}
// Function to update player position in level.dat based on spawn point coordinates
@@ -528,7 +522,7 @@ fn update_player_position(
// Function to update player spawn Y coordinate based on terrain height after generation
pub fn update_player_spawn_y_after_generation(
world_path: &str,
world_path: &Path,
spawn_point: Option<(f64, f64)>,
bbox_text: String,
scale: f64,
@@ -678,6 +672,7 @@ fn gui_start_generation(
ground_level: i32,
floodfill_timeout: u64,
terrain_enabled: bool,
skip_osm_objects: bool,
interior_enabled: bool,
roof_enabled: bool,
fillground_enabled: bool,
@@ -744,9 +739,9 @@ fn gui_start_generation(
// Add localized name to the world if user generated a new world
let updated_world_path = if is_new_world {
add_localized_world_name(&selected_world, &bbox)
add_localized_world_name(world_path, &bbox)
} else {
selected_world.clone()
world_path
};
// Create an Args instance with the chosen bounding box and world directory path
@@ -767,7 +762,29 @@ fn gui_start_generation(
spawn_point,
};
// Run data fetch and world generation
// If skip_osm_objects is true (terrain-only mode), skip fetching and processing OSM data
if skip_osm_objects {
// Generate ground data (terrain) for terrain-only mode
let ground = ground::generate_ground_data(&args);
// Create empty parsed_elements and xzbbox for terrain-only mode
let parsed_elements = Vec::new();
let (_coord_transformer, xzbbox) =
CoordTransformer::llbbox_to_xzbbox(&args.bbox, args.scale)
.map_err(|e| format!("Failed to create coordinate transformer: {}", e))?;
let _ = data_processing::generate_world(
parsed_elements,
xzbbox,
args.bbox,
ground,
&args,
);
// Session lock will be automatically released when _session_lock goes out of scope
return Ok(());
}
// Run data fetch and world generation (standard mode: objects + terrain, or objects only)
match retrieve_data::fetch_data_from_overpass(args.bbox, args.debug, "requests", None) {
Ok(raw_data) => {
let (mut parsed_elements, mut xzbbox) =
@@ -794,7 +811,13 @@ fn gui_start_generation(
&mut ground,
);
let _ = data_processing::generate_world(parsed_elements, xzbbox, ground, &args);
let _ = data_processing::generate_world(
parsed_elements,
xzbbox,
args.bbox,
ground,
&args,
);
// Session lock will be automatically released when _session_lock goes out of scope
Ok(())
}

View File

View File

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 418 B

View File

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 312 B

View File

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

View File

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 262 B

View File

Before

Width:  |  Height:  |  Size: 348 B

After

Width:  |  Height:  |  Size: 348 B

View File

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

View File

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B

View File

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 849 B

After

Width:  |  Height:  |  Size: 849 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 847 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

View File

@@ -389,6 +389,34 @@ button:hover {
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
}
/* Generation mode dropdown styling */
.generation-mode-dropdown {
width: 100%;
max-width: 180px;
padding: 5px 8px;
border-radius: 4px;
border: 1px solid #fecc44;
background-color: #ffffff;
color: #0f0f0f;
appearance: menulist;
cursor: pointer;
font-size: 15px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
}
.generation-mode-dropdown option {
padding: 5px;
font-size: 15px;
}
@media (prefers-color-scheme: dark) {
.generation-mode-dropdown {
background-color: #0f0f0f98;
color: #ffffff;
border: 1px solid #fecc44;
}
}
/* Language dropdown styling */
.language-dropdown {
width: 100%;

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 487 B

After

Width:  |  Height:  |  Size: 487 B

View File

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View File

Before

Width:  |  Height:  |  Size: 231 KiB

After

Width:  |  Height:  |  Size: 231 KiB

View File

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 556 B

View File

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 811 B

View File

@@ -14,7 +14,7 @@
<body>
<main class="container">
<div class="row">
<a href="https://github.com/louis-e/arnis" target="_blank">
<a href="https://arnismc.com" target="_blank">
<img src="./images/logo.png" id="arnis-logo" class="logo arnis" alt="Arnis Logo" style="width: 35%; height: auto;">
</a>
</div>
@@ -87,11 +87,15 @@
<span class="close-button" onclick="closeSettings()">&times;</span>
<h2 data-localize="customization_settings">Customization Settings</h2>
<!-- Terrain Toggle Button -->
<!-- Generation Mode Dropdown -->
<div class="settings-row">
<label for="terrain-toggle" data-localize="terrain">Terrain</label>
<label for="generation-mode-select" data-localize="generation_mode">Generation Mode</label>
<div class="settings-control">
<input type="checkbox" id="terrain-toggle" name="terrain-toggle" checked>
<select id="generation-mode-select" name="generation-mode-select" class="generation-mode-dropdown">
<option value="geo-terrain" data-localize="mode_geo_terrain">Objects + Terrain</option>
<option value="geo-only" data-localize="mode_geo_only">Objects only</option>
<option value="terrain-only" data-localize="mode_terrain_only">Terrain only</option>
</select>
</div>
</div>
@@ -171,6 +175,7 @@
<option value="zh-CN">中文 (简体)</option>
<option value="ko">한국어</option>
<option value="pl">Polski</option>
<option value="lv">Latviešu</option>
<option value="sv">Svenska</option>
<option value="ar">العربية</option>
<option value="fi">Suomi</option>

View File

View File

View File

@@ -3,7 +3,7 @@ export const licenseText = `
<p>For a full list of contributors, please refer to the <a href="https://github.com/louis-e/arnis/graphs/contributors" style="color: inherit;" target="_blank">Github contributors page</a>. Logo made by nxfx21.
<p style="color: #ff8686;"><b>Download Arnis only from the official source:</b> <a href="https://github.com/louis-e/arnis" style="color: inherit;" target="_blank">https://github.com/louis-e/arnis/</a>. Every other website providing a download and claiming to be affiliated with the project is unofficial and may be malicious.</p>
<p style="color: #ff8686;"><b>Download Arnis only from the official source:</b> <a href="https://arnismc.com" style="color: inherit;" target="_blank">https://arnismc.com</a> or <a href="https://github.com/louis-e/arnis" style="color: inherit;" target="_blank">https://github.com/louis-e/arnis/</a>. Every other website providing a download and claiming to be affiliated with the project is unofficial and may be malicious.</p>
<p><b>Third-Party Map Data and Tile Services:</b></p>
<p>This application uses map tiles from multiple providers, each with their own licensing requirements:</p>
@@ -20,6 +20,9 @@ export const licenseText = `
<b>Stadia Maps:</b><br> © <a href="https://www.stadiamaps.com/" style="color: inherit;" target="_blank">Stadia Maps</a> © <a href="https://openmaptiles.org/" style="color: inherit;" target="_blank">OpenMapTiles</a> © OpenStreetMap contributors
<p>Users of this software must comply with the respective licensing terms of these map data providers when using the application.</p>
<b>AWS Terrain Tiles:</b><br>
Elevation data derived from the <a href="https://registry.opendata.aws/terrain-tiles/" style="color: inherit;" target="_blank">AWS Terrain Tiles</a> dataset.
<br><br>
<p><b>License:</b></p>
<pre style="white-space: pre-wrap; font-family: inherit;">

View File

@@ -93,6 +93,10 @@ async function applyLocalization(localization) {
// DEPRECATED: Ground level localization removed
// "label[data-localize='ground_level']": "ground_level",
"label[data-localize='language']": "language",
"label[data-localize='generation_mode']": "generation_mode",
"option[data-localize='mode_geo_terrain']": "mode_geo_terrain",
"option[data-localize='mode_geo_only']": "mode_geo_only",
"option[data-localize='mode_terrain_only']": "mode_terrain_only",
"label[data-localize='terrain']": "terrain",
"label[data-localize='interior']": "interior",
"label[data-localize='roof']": "roof",
@@ -595,7 +599,11 @@ async function startGeneration() {
}
}
var terrain = document.getElementById("terrain-toggle").checked;
// Get generation mode from dropdown
var generationMode = document.getElementById("generation-mode-select").value;
var terrain = (generationMode === "geo-terrain" || generationMode === "terrain-only");
var skipOsmObjects = (generationMode === "terrain-only");
var interior = document.getElementById("interior-toggle").checked;
var roof = document.getElementById("roof-toggle").checked;
var fill_ground = document.getElementById("fillground-toggle").checked;
@@ -617,6 +625,7 @@ async function startGeneration() {
groundLevel: ground_level,
floodfillTimeout: floodfill_timeout,
terrainEnabled: terrain,
skipOsmObjects: skipOsmObjects,
interiorEnabled: interior,
roofEnabled: roof,
fillgroundEnabled: fill_ground,

View File

Some files were not shown because too many files have changed in this diff Show More