diff options
| -rw-r--r-- | Cargo.lock | 1412 | ||||
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | src/grid.rs | 38 | ||||
| -rw-r--r-- | src/infinite_grid.rs | 63 | ||||
| -rw-r--r-- | src/main.rs | 146 | ||||
| -rw-r--r-- | src/math.rs | 18 | ||||
| -rw-r--r-- | src/tool/mod.rs | 16 | ||||
| -rw-r--r-- | src/tool/room_tool.rs | 81 | ||||
| -rw-r--r-- | src/transform.rs | 76 |
9 files changed, 237 insertions, 1617 deletions
@@ -1,547 +1,34 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "addr2line" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "andrew" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e" -dependencies = [ - "bitflags", - "line_drawing", - "rusttype 0.7.9", - "walkdir", - "xdg", - "xml-rs", -] - -[[package]] -name = "android_glue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" - -[[package]] -name = "approx" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -dependencies = [ - "num-traits", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "backtrace" -version = "0.3.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" -dependencies = [ - "addr2line", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.4.3", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bytemuck" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41aa2ec95ca3b5c54cf73c91acf06d24f4495d5f1b1c12506ae3483d646177ac" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] name = "cc" version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" [[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cgl" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49" -dependencies = [ - "gleam", - "libc", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "cocoa" -version = "0.18.5" +name = "cmake" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54" +checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb" dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "core-foundation" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-graphics" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" -dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "dlib" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" -dependencies = [ - "libloading 0.6.4", + "cc", ] [[package]] -name = "downcast-rs" +name = "fs_extra" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "draw_state" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651" -dependencies = [ - "bitflags", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "gfx" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b" -dependencies = [ - "draw_state", - "gfx_core", - "log", -] - -[[package]] -name = "gfx_core" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441" -dependencies = [ - "bitflags", - "draw_state", - "log", -] - -[[package]] -name = "gfx_device_gl" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c385fa380c18888633aa27d1e16cbae518469702a2f69dcb5f52d5378bebc" -dependencies = [ - "gfx_core", - "gfx_gl", - "log", -] - -[[package]] -name = "gfx_gl" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d38164670920cfb7491bc0cf6f49f0554bd1c44cdbedc6c78d2bf91691ff5e" -dependencies = [ - "gl_generator 0.14.0", -] - -[[package]] -name = "gif" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02efba560f227847cb41463a7395c514d127d4f74fff12ef0137fff1b84b96c4" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" - -[[package]] -name = "gl" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d8c8e25e8ed44d4813809205090162723a866fb4be3a9d8bb983c9a0bf98f1" -dependencies = [ - "gl_generator 0.10.0", -] - -[[package]] -name = "gl_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604" -dependencies = [ - "khronos_api 3.1.0", - "log", - "xml-rs", -] - -[[package]] -name = "gl_generator" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a" -dependencies = [ - "khronos_api 3.1.0", - "log", - "xml-rs", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api 3.1.0", - "log", - "xml-rs", -] - -[[package]] -name = "gleam" -version = "0.6.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5" -dependencies = [ - "gl_generator 0.13.1", -] - -[[package]] -name = "glutin" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd" -dependencies = [ - "android_glue", - "cgl", - "cocoa", - "core-foundation", - "core-graphics", - "glutin_egl_sys", - "glutin_emscripten_sys", - "glutin_gles2_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "lazy_static", - "libloading 0.5.2", - "objc", - "osmesa-sys", - "parking_lot", - "wayland-client", - "winapi", - "winit", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abb6aa55523480c4adc5a56bbaa249992e2dddb2fc63dc96e04a3355364c211" -dependencies = [ - "gl_generator 0.14.0", - "winapi", -] - -[[package]] -name = "glutin_emscripten_sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1" - -[[package]] -name = "glutin_gles2_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094e708b730a7c8a1954f4f8a31880af00eb8a1c5b5bf85d28a0a3c6d69103" -dependencies = [ - "gl_generator 0.14.0", - "objc", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e393c8fc02b807459410429150e9c4faffdb312d59b8c038566173c81991351" -dependencies = [ - "gl_generator 0.14.0", - "x11-dl", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5951a1569dbab865c6f2a863efafff193a93caf05538d193e9e3816d21696" -dependencies = [ - "gl_generator 0.14.0", -] +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "graf_karto" version = "0.1.0" dependencies = [ - "piston2d-opengl_graphics", - "piston_window", - "pistoncore-sdl2_window", -] - -[[package]] -name = "hermit-abi" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" -dependencies = [ - "libc", -] - -[[package]] -name = "image" -version = "0.23.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985fc06b1304d19c28d5c562ed78ef5316183f2b0053b46763a0b94862373c34" -dependencies = [ - "bytemuck", - "byteorder", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits", - "png", - "scoped_threadpool", - "tiff", -] - -[[package]] -name = "interpolation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02" - -[[package]] -name = "jpeg-decoder" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" -dependencies = [ - "byteorder", - "rayon", + "raylib", ] [[package]] -name = "khronos_api" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037ab472c33f67b5fbd3e9163a2645319e5356fcd355efa6d4eb7fff4bbcb554" - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -554,888 +41,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" [[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3557c9384f7f757f6d139cd3a4c62ef4e850696c16bf27924a5538c8a09717a1" -dependencies = [ - "cfg-if 0.1.10", - "winapi", -] - -[[package]] -name = "line_drawing" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9" -dependencies = [ - "num-traits", -] - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "lzw" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "nix" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - -[[package]] -name = "num-integer" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "object" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" - -[[package]] -name = "ordered-float" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3741934be594d77de1c8461ebcbbe866f585ea616a9753aa78f2bdc69f0e4579" -dependencies = [ - "num-traits", -] - -[[package]] -name = "osmesa-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" -dependencies = [ - "shared_library", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api", - "parking_lot_core", - "rustc_version", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall", - "rustc_version", - "smallvec", - "winapi", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "piston" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cb93ac01a1f5f04bed53f01881ebe13fe40860f7ca332697687aac422670a6" -dependencies = [ - "pistoncore-event_loop", - "pistoncore-input", - "pistoncore-window", -] - -[[package]] -name = "piston-float" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f900be47e312e126cc71d35548e8e31edd3901b92ab82d1c4c4757e6b5526564" - -[[package]] -name = "piston-gfx_texture" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8d1197620f9774197c2f4fa5bca2b667ec40a9521160d6a4b46ccfdf4ac97c" -dependencies = [ - "gfx", - "gfx_core", - "image", - "piston-texture", -] - -[[package]] -name = "piston-graphics_api_version" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c10c0d7a00f671e717ab98aa2c7f7bf204082d0e6b246827dc17b68bbaf8d18" - -[[package]] -name = "piston-shaders_graphics2d" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97bc17dac1dfff3e5cb84116062c7b46ff9d3dc0d88696a46d2f054cf64a10b6" - -[[package]] -name = "piston-texture" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c93564eef40a9920d026697f63d224efd7ac80981fb418fe1dad447c2d9bdd" - -[[package]] -name = "piston-viewport" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01abb19b781051290d0837b9294c26d419cc4156907c21ffe86705e219446798" -dependencies = [ - "piston-float", -] - -[[package]] -name = "piston2d-gfx_graphics" -version = "0.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99f0b10722f4ceb4c74c435cfa33d1382d3824ea3c690396d94f409cc1f1c9a" -dependencies = [ - "draw_state", - "gfx", - "piston-gfx_texture", - "piston-shaders_graphics2d", - "piston2d-graphics", - "shader_version", -] - -[[package]] -name = "piston2d-graphics" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed0b4ea49db58337ec99d3e5e5bd6db3ae2f736b3f586e33428f92647113f70" -dependencies = [ - "fnv", - "interpolation", - "piston-texture", - "piston-viewport", - "read_color", - "rusttype 0.8.3", - "vecmath", -] - -[[package]] -name = "piston2d-opengl_graphics" -version = "0.74.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a42f83a1a157bff10f3d6310e15f973953decdee4b1ca43653fd240d25b74c0" -dependencies = [ - "fnv", - "gl", - "image", - "khronos_api 2.2.0", - "piston-shaders_graphics2d", - "piston-texture", - "piston-viewport", - "piston2d-graphics", - "shader_version", -] - -[[package]] -name = "piston_window" -version = "0.113.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75ddb469b647f4d923cf178590334e45449cd51c6aaf224ba621438f19a6aa84" -dependencies = [ - "gfx", - "gfx_device_gl", - "piston", - "piston-texture", - "piston2d-gfx_graphics", - "piston2d-graphics", - "pistoncore-glutin_window", - "shader_version", -] - -[[package]] -name = "pistoncore-event_loop" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1afc1c7b1bd1c673ffa0a0651f2d114e68a3cb5db0ba736d8227c4d68783b02" -dependencies = [ - "pistoncore-input", - "pistoncore-window", -] - -[[package]] -name = "pistoncore-glutin_window" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb21dcf638ce1c28bc31c76bae90f3589b395ace8918e3c6a328558fca41275" -dependencies = [ - "gl", - "glutin", - "pistoncore-input", - "pistoncore-window", - "shader_version", -] - -[[package]] -name = "pistoncore-input" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bb41e7bdd8213f06b2da31e67ae9469f83094d0e45122ead52158915d9af30" -dependencies = [ - "bitflags", - "piston-viewport", - "serde", - "serde_derive", -] - -[[package]] -name = "pistoncore-sdl2_window" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bc705a418a045bfa791e5e084be72696ac83c07d3d7715533ea6152baf96ee" -dependencies = [ - "gl", - "pistoncore-input", - "pistoncore-window", - "sdl2", - "shader_version", -] - -[[package]] -name = "pistoncore-window" -version = "0.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4932383d894231cdb3fcb0d26607c63b153b808b5621d911df6b929dd53b32" -dependencies = [ - "piston-graphics_api_version", - "pistoncore-input", -] - -[[package]] -name = "pkg-config" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - -[[package]] -name = "png" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe7f9f1c730833200b134370e1d5098964231af8450bce9b78ee3ab5278b970" -dependencies = [ - "bitflags", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" -dependencies = [ - "unicode-xid 0.2.1", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2 1.0.24", -] - -[[package]] -name = "raw-window-handle" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211" -dependencies = [ - "libc", -] - -[[package]] -name = "rayon" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "lazy_static", - "num_cpus", -] - -[[package]] -name = "read_color" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4c8858baa4ad3c8bcc156ae91a0ffe22b76a3975c40c49b4f04c15c6bce0da" - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "rustc-demangle" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rusttype" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5" -dependencies = [ - "rusttype 0.8.3", -] - -[[package]] -name = "rusttype" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0" -dependencies = [ - "approx", - "ordered-float", - "stb_truetype", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sdl2" -version = "0.34.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbb85f4211627a7291c83434d6bbfa723e28dcaa53c7606087e3c61929e4b9c" -dependencies = [ - "bitflags", - "lazy_static", - "libc", - "sdl2-sys", -] - -[[package]] -name = "sdl2-sys" -version = "0.34.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d81feded049b9c14eceb4a4f6d596a98cebbd59abdba949c5552a015466d33" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "version-compare", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" - -[[package]] -name = "serde_derive" -version = "1.0.117" +name = "raylib" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", - "syn", -] - -[[package]] -name = "shader_version" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfadbf7574784ee97f062ace17e1008fb5e7f46dd714b7dd46baf6efebd30e26" -dependencies = [ - "piston-graphics_api_version", -] - -[[package]] -name = "shared_library" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11" +checksum = "b222dc0fecd87b6a4272b2ebd80ca8c5435f5c0360c38ed2a2b2b3f6bd2c1f13" dependencies = [ "lazy_static", "libc", + "raylib-sys", ] [[package]] -name = "smallvec" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa" -dependencies = [ - "andrew", - "bitflags", - "dlib", - "lazy_static", - "memmap", - "nix", - "wayland-client", - "wayland-commons", - "wayland-protocols", -] - -[[package]] -name = "stb_truetype" -version = "0.3.1" +name = "raylib-sys" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51" +checksum = "5c6909eb526b5f7a3f6f8b3904dc7acc4f433f4f8bd071a342b5139bab913fe7" dependencies = [ - "byteorder", -] - -[[package]] -name = "syn" -version = "1.0.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9c5432ff16d6152371f808fb5a871cd67368171b09bb21b43df8e4a47a3556" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", - "unicode-xid 0.2.1", -] - -[[package]] -name = "tiff" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b8a87c4da944c3f27e5943289171ac71a6150a79ff6bacfff06d159dfff2f" -dependencies = [ - "byteorder", - "lzw", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "vecmath" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ae1e0d85bca567dee1dcf87fb1ca2e792792f66f87dced8381f99cd91156a" -dependencies = [ - "piston-float", -] - -[[package]] -name = "version-compare" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "wayland-client" -version = "0.21.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.21.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec" -dependencies = [ - "nix", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.21.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145" -dependencies = [ - "bitflags", - "wayland-client", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-scanner" -version = "0.21.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.21.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628" -dependencies = [ - "dlib", - "lazy_static", -] - -[[package]] -name = "weezl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e26e7a4d998e3d7949c69444b8b4916bac810da0d3a82ae612c89e952782f4" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "winit" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8" -dependencies = [ - "android_glue", - "backtrace", - "bitflags", - "cocoa", - "core-foundation", - "core-graphics", - "lazy_static", - "libc", - "log", - "objc", - "parking_lot", - "percent-encoding", - "raw-window-handle", - "smithay-client-toolkit", - "wayland-client", - "winapi", - "x11-dl", -] - -[[package]] -name = "x11-dl" -version = "2.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" -dependencies = [ - "lazy_static", - "libc", - "maybe-uninit", - "pkg-config", + "cc", + "cmake", + "fs_extra", ] - -[[package]] -name = "xdg" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" - -[[package]] -name = "xml-rs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" @@ -5,6 +5,4 @@ authors = ["Arne Dußin <arne.dussin@gmail.com>"] edition = "2018" [dependencies] -piston_window = "*" -piston2d-opengl_graphics = "*" -pistoncore-sdl2_window = "0.66.0" +raylib = "3.0.0" diff --git a/src/grid.rs b/src/grid.rs new file mode 100644 index 0000000..1ec49a3 --- /dev/null +++ b/src/grid.rs @@ -0,0 +1,38 @@ +use crate::transform::Transform; +use raylib::drawing::RaylibDraw; +use raylib::ffi::Color; + +pub const LINE_COLOUR: Color = Color { + r: 255, + g: 255, + b: 255, + a: 75, +}; + +/// Draw an infinite grid that can be moved around on the screen and zoomed in and out of. +pub fn draw_grid<D>(rld: &mut D, screen_width: i32, screen_height: i32, transform: &Transform) +where + D: RaylibDraw, +{ + /* Calculate the actual screen offset of the grid, by modulo-ing the translation of the + * transform. + */ + let translation_x_px: i32 = + transform.translation_px().x as i32 % transform.pixels_per_m() as i32; + let translation_y_px: i32 = + transform.translation_px().y as i32 % transform.pixels_per_m() as i32; + + // Draw the row lines. + let mut line_y: f32 = translation_y_px as f32; + while line_y <= screen_height as f32 { + rld.draw_line(0, line_y as i32, screen_width, line_y as i32, LINE_COLOUR); + line_y += transform.pixels_per_m(); + } + + // Draw the column lines. + let mut line_x: f32 = translation_x_px as f32; + while line_x <= screen_width as f32 { + rld.draw_line(line_x as i32, 0, line_x as i32, screen_height, LINE_COLOUR); + line_x += transform.pixels_per_m(); + } +} diff --git a/src/infinite_grid.rs b/src/infinite_grid.rs deleted file mode 100644 index 163c2b2..0000000 --- a/src/infinite_grid.rs +++ /dev/null @@ -1,63 +0,0 @@ -//! Grid that can be moved and scaled, and which gives the appearance of being infinite, while -//! staying easily renderable. - -use crate::transform::Transform; -use piston_window::grid::Grid; -use piston_window::line::{Line, Shape}; -use piston_window::{Context, Graphics, Size, Transformed}; - -/// The line used to draw the grids lines -const GRID_LINE: Line = Line { - color: [1., 1., 1., 0.3], - radius: 1.2, - shape: Shape::Square, -}; - -pub struct InfiniteGrid(Grid); - -impl InfiniteGrid { - pub fn new(transform: &Transform, draw_size: Size) -> InfiniteGrid { - /* Create a grid with two extra columns and rows per draw_size, so when the user moves the - * grid up and down they can be seen, before the grid position is reset to create the - * infinitness illusion. - * The +3 instead of the +2 is necessary, since the amount needed may be underestimated - * because of rounding errors (I think) - */ - InfiniteGrid(Grid { - cols: (draw_size.width / transform.pixels_per_m()) as u32 + 3, - rows: (draw_size.height / transform.pixels_per_m()) as u32 + 3, - units: transform.pixels_per_m(), - }) - } - - // TODO: Yes, this is ugly af - pub fn on_scale_change(&mut self, transform: &Transform, draw_size: Size) { - self.0.cols = (draw_size.width / transform.pixels_per_m()) as u32 + 3; - self.0.rows = (draw_size.height / transform.pixels_per_m()) as u32 + 3; - self.0.units = transform.pixels_per_m() - } - - pub fn draw<G>(&self, map_trans: &Transform, context: &Context, g: &mut G) - where - G: Graphics, - { - /* Since mouse movement is actually always provided as whole pixels, this is fine. - * the - cell_size (i.e. pixels_per_m) is provided, so that the grid is centered in the - * screen,and not at position 0.x, 0.x, which would mean there would be no row at the top - * and/or no column to the left. - */ - let actual_trans_px = [ - (map_trans.translation_px()[0] as i64 % self.0.units as i64) as f64 - - map_trans.pixels_per_m(), - (map_trans.translation_px()[1] as i64 % self.0.units as i64) as f64 - - map_trans.pixels_per_m(), - ]; - - self.0.draw( - &GRID_LINE, - &context.draw_state, - context.trans_pos(actual_trans_px).transform, - g, - ); - } -} diff --git a/src/main.rs b/src/main.rs index 4969261..3f36123 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,132 +1,48 @@ -pub mod infinite_grid; +pub mod grid; +pub mod math; +pub mod tool; pub mod transform; -use infinite_grid::*; -use transform::*; +pub use transform::Transform; -use piston_window::grid::Grid; -use piston_window::rectangle::{Border, Rectangle}; -use piston_window::*; -use sdl2_window::Sdl2Window; - -/// Helper function to turn two given points into a rectangle. The order of the two points is not -/// important, they are considered two endpoints of a diagonal and therefore identify the rectangle -/// unambiguously. -fn bounding_box(p0: [f64; 2], p1: [f64; 2]) -> [f64; 4] { - let min_x = p0[0].min(p1[0]); - let min_y = p0[1].min(p1[1]); - let max_x = p0[0].max(p1[0]); - let max_y = p0[1].max(p1[1]); - - [min_x, min_y, max_x - min_x, max_y - min_y] -} +use raylib::prelude::*; +use tool::{RoomTool, Tool}; fn main() { - let mut window: PistonWindow<Sdl2Window> = WindowSettings::new("Hello there!", [1000, 1000]) - .build() - .expect("Could not initialise window"); - - // The amount of on-screen pixels used to represent a meter of actual terrain. - let mut transform = Transform::new(); - let mut grid = InfiniteGrid::new(&transform, window.draw_size()); - - /* Create a rectangle that is used to draw all rectangles that were created by the user. It has - * a thicc blacc border and white colour. - */ - let render_rect = Rectangle::new([0.7, 0.7, 0.7, 1.]).border(Border { - color: [0.5, 0.5, 0.5, 1.], - radius: 2., - }); - // The point the user has clicked. This is where they want the rectangle to start. - let mut starting_rect_point: Option<[f64; 2]> = None; - let mut rectangles = Vec::new(); - - let mut mouse_pos_px = [0., 0.]; - let mut mouse_pos_m = [0., 0.]; - let mut canvas_follows_mouse = false; - - let mut events = Events::new(EventSettings::new().lazy(true)); - while let Some(e) = events.next(&mut window) { - // Update the mouse cursor position and possibly the canvas position too, in case the user - // is currently dragging the canvas. - e.mouse_cursor(|new_pos| { - if canvas_follows_mouse { - let move_by = math::sub(new_pos, mouse_pos_px); - transform.move_by_px(move_by); - } + let (mut rl, thread) = raylib::init().resizable().title("Hello there!").build(); - mouse_pos_px = new_pos; - mouse_pos_m = transform.point_px_to_m(new_pos); - }); + let mut current_tool = RoomTool::new(); - // The zoom factor is changed with the mouse wheel. - e.mouse_scroll(|[_, y]| { - let scale_changed = if y < 0. && transform.try_zoom_in() { - true - } else if y > 0. && transform.try_zoom_out() { - true - } else { - false - }; - - // Notify the user of the change if there was any - if scale_changed { - grid.on_scale_change(&transform, window.draw_size()); - println!( - "Changed scale to {} pixels per m.", - transform.pixels_per_m() - ); - } - }); - - // Handle the movement of the canvas when pressing the middle mouse button. - if let Some(Button::Mouse(MouseButton::Middle)) = e.press_args() { - canvas_follows_mouse = true; - println!("Canvas now follows the mouse"); - } - if let Some(Button::Mouse(MouseButton::Middle)) = e.release_args() { - canvas_follows_mouse = false; - println!("Canvas no longer follows the mouse"); - } + let mut transform = Transform::new(); + let mut last_mouse_pos = rl.get_mouse_position(); + while !rl.window_should_close() { + let screen_width = rl.get_screen_width(); + let screen_height = rl.get_screen_height(); - // Handle drawing a rectangle or finishing the rectangle when clicking with the mouse. - if let Some(Button::Mouse(MouseButton::Left)) = e.press_args() { - if let Some(first_point) = starting_rect_point { - rectangles.push(bounding_box(first_point, mouse_pos_m)); - starting_rect_point = None; - } else { - starting_rect_point = Some(mouse_pos_m); - } - } - // Abort drawing a rectangle when clicking with the right mouse button - if let Some(Button::Mouse(MouseButton::Right)) = e.press_args() { - starting_rect_point = None; + // Move the canvas together with the mouse + if rl.is_mouse_button_down(MouseButton::MOUSE_MIDDLE_BUTTON) { + transform.move_by_px(rl.get_mouse_position() - last_mouse_pos); } - // Close the window when the user presses escape - if let Some(Button::Keyboard(Key::Escape)) = e.press_args() { - window.set_should_close(true); + // Handle scrolling of the canvas + if rl.get_mouse_wheel_move() > 0 { + transform.try_zoom_in(); + } else if rl.get_mouse_wheel_move() < 0 { + transform.try_zoom_out(); } - window.draw_2d(&e, |c, g, _device| { - clear([0.4, 0.2, 0., 1.], g); + current_tool.update(&rl, &transform); - grid.draw(&transform, &c, g); + // Update the last mouse position + last_mouse_pos = rl.get_mouse_position(); - // Draw all rectangles that are part of the map - for &rect in &rectangles { - render_rect.draw(transform.rect_m_to_px(rect), &c.draw_state, c.transform, g); - } + // Drawing section + { + let mut d = rl.begin_drawing(&thread); + d.clear_background(Color::BLACK); + grid::draw_grid(&mut d, screen_width, screen_height, &transform); - // Draw the current rectangle that is being drawn, but not part of the map - if let Some(starting_rect_point) = starting_rect_point { - render_rect.draw( - transform.rect_m_to_px(bounding_box(starting_rect_point, mouse_pos_m)), - &c.draw_state, - c.transform, - g, - ); - } - }); + current_tool.draw(&mut d, &transform); + } } } diff --git a/src/math.rs b/src/math.rs new file mode 100644 index 0000000..c4e7ac0 --- /dev/null +++ b/src/math.rs @@ -0,0 +1,18 @@ +use raylib::math::{Rectangle, Vector2}; + +/// Function to calculate the bounding rectangle that is between two vectors. The order of the +/// vectors is irrelevent for this. As long as they are diagonally opposite of each other, this +/// function will work. +pub fn bounding_rect(pos1: Vector2, pos2: Vector2) -> Rectangle { + let min_x = pos1.x.min(pos2.x); + let min_y = pos1.y.min(pos2.y); + let max_x = pos1.x.max(pos2.x); + let max_y = pos1.y.max(pos2.y); + + Rectangle { + x: min_x, + y: min_y, + width: max_x - min_x, + height: max_y - min_y, + } +} diff --git a/src/tool/mod.rs b/src/tool/mod.rs new file mode 100644 index 0000000..e0d4f1e --- /dev/null +++ b/src/tool/mod.rs @@ -0,0 +1,16 @@ +pub mod room_tool; +pub use room_tool::RoomTool; + +use crate::transform::Transform; +use raylib::core::drawing::RaylibDraw; +use raylib::RaylibHandle; + +pub trait Tool { + fn update(&mut self, rl: &RaylibHandle, transform: &Transform); + + fn draw<D>(&self, _rld: &mut D, _transform: &Transform) + where + D: RaylibDraw, + { + } +} diff --git a/src/tool/room_tool.rs b/src/tool/room_tool.rs new file mode 100644 index 0000000..16ff5ce --- /dev/null +++ b/src/tool/room_tool.rs @@ -0,0 +1,81 @@ +use super::Tool; +use crate::math; +use crate::transform::Transform; +use raylib::core::drawing::RaylibDraw; +use raylib::ffi::{Color, MouseButton}; +use raylib::math::{Rectangle, Vector2}; +use raylib::RaylibHandle; + +pub struct RoomTool { + /// Vector of all Rectangles representing rooms that have already been drawn. + room_rects: Vec<Rectangle>, + /// The rectangle that is currently being drawn by the user. Once it is finished, it will be + /// pushed into the room_rects. + unfinished_rect: Option<(Vector2, Vector2)>, +} + +impl RoomTool { + /// Create a new room tool where no rooms have been drawn yet. + pub fn new() -> Self { + Self { + room_rects: Vec::new(), + unfinished_rect: None, + } + } +} + +impl Tool for RoomTool { + fn update(&mut self, rl: &RaylibHandle, transform: &Transform) { + let mouse_pos_m = transform.point_px_to_m(rl.get_mouse_position()); + // Update the currently drawn rectangle, if it exists + if let Some((_, ref mut pos2)) = &mut self.unfinished_rect { + *pos2 = mouse_pos_m; + } + + // Start or finish drawing the currently unfinished rectangle + if rl.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) { + if let Some((pos1, pos2)) = self.unfinished_rect { + self.room_rects.push(math::bounding_rect(pos1, pos2)); + self.unfinished_rect = None; + } else { + self.unfinished_rect = Some((mouse_pos_m, mouse_pos_m)) + } + } + + // Abort drawing the room (if any) in case the right mouse button was pressed. + if rl.is_mouse_button_pressed(MouseButton::MOUSE_RIGHT_BUTTON) { + self.unfinished_rect = None; + } + } + + fn draw<D>(&self, rld: &mut D, transform: &Transform) + where + D: RaylibDraw, + { + // Draw all finished rectangles. + for &rect in &self.room_rects { + rld.draw_rectangle_rec( + transform.rect_m_to_px(rect), + Color { + r: 50, + g: 50, + b: 50, + a: 255, + }, + ); + } + + // Do the same for the unfinished rectangle + if let Some((pos1, pos2)) = self.unfinished_rect { + rld.draw_rectangle_rec( + transform.rect_m_to_px(math::bounding_rect(pos1, pos2)), + Color { + r: 70, + g: 100, + b: 70, + a: 255, + }, + ); + } + } +} diff --git a/src/transform.rs b/src/transform.rs index a91d7da..fa24636 100644 --- a/src/transform.rs +++ b/src/transform.rs @@ -1,19 +1,19 @@ //! Transformation module //! -//! Useful to turn on-screen coordinates into the measurements in the "real" world the map -//! describes and the other way around. +//! Useful to turn on-screen coordinates into measurements of the "real" world the map describes +//! and the other way around. -use piston_window::math; +use raylib::prelude::*; -const STANDARD_PIXELS_PER_M: f64 = 64.; -const MIN_PIXELS_PER_M: f64 = 0.5; -const MAX_PIXELS_PER_M: f64 = 10_000.; +const STANDARD_PIXELS_PER_M: f32 = 64.; +const MIN_PIXELS_PER_M: f32 = 0.5; +const MAX_PIXELS_PER_M: f32 = 10_000.; pub struct Transform { /// The (not necessarily natural) number of pixels per m, i.e. the current scale of the map - pixels_per_m: f64, + pixels_per_m: f32, /// The vector the entire on-screen map is moved by in pixels - translation_px: [f64; 2], + translation_px: Vector2, } impl Transform { @@ -21,66 +21,60 @@ impl Transform { pub fn new() -> Self { Self { pixels_per_m: STANDARD_PIXELS_PER_M, - translation_px: [0., 0.], + translation_px: Vector2::new(0., 0.), } } /// Convert a point that is given in meters into the corresponding point in pixels. #[inline] - pub fn point_m_to_px(&self, point: [f64; 2]) -> [f64; 2] { + pub fn point_m_to_px(&self, point: Vector2) -> Vector2 { // Start by converting the absolute position in meters into the absolute position in // pixels, then add the translation of the screen. - math::add( - math::mul_scalar(point, self.pixels_per_m), - self.translation_px, - ) + (point * self.pixels_per_m) + self.translation_px } /// Convert an on-screen point into an absolute point with values in meters. #[inline] - pub fn point_px_to_m(&self, point: [f64; 2]) -> [f64; 2] { + pub fn point_px_to_m(&self, point: Vector2) -> Vector2 { // Start by subtracting the pixel translation and afterwards convert these absolute pixel // measurements into meters. - math::mul_scalar( - math::sub(point, self.translation_px), - 1. / self.pixels_per_m, - ) + (point - self.translation_px) / self.pixels_per_m } /// Convert a length given in meters into a length in pixels #[inline] - pub fn length_m_to_px(&self, length: f64) -> f64 { + pub fn length_m_to_px(&self, length: f32) -> f32 { length * self.pixels_per_m } /// Convert a length given in pixels into a length in meters #[inline] - pub fn length_px_to_m(&self, length: f64) -> f64 { + pub fn length_px_to_m(&self, length: f32) -> f32 { length / self.pixels_per_m } /// Convert a rectangle which has measurements in meters into one of pixels #[inline] - pub fn rect_m_to_px(&self, rect: [f64; 4]) -> [f64; 4] { - let left_upper = self.point_m_to_px([rect[0], rect[1]]); - [ - left_upper[0], - left_upper[1], - self.length_m_to_px(rect[2]), - self.length_m_to_px(rect[3]), - ] + pub fn rect_m_to_px(&self, rect: Rectangle) -> Rectangle { + let left_upper = self.point_m_to_px(Vector2::new(rect.x, rect.y)); + Rectangle::new( + left_upper.x, + left_upper.y, + self.length_m_to_px(rect.width), + self.length_m_to_px(rect.height), + ) } /// Convert a rectangle which has measurements in pixels into one of meters #[inline] - pub fn rect_px_to_m(&self, rect: [f64; 4]) -> [f64; 4] { - let left_upper = self.point_px_to_m([rect[0], rect[1]]); - [ - left_upper[0], - left_upper[1], - self.length_px_to_m(rect[2]), - self.length_px_to_m(rect[3]), - ] + pub fn rect_px_to_m(&self, rect: Rectangle) -> Rectangle { + let left_upper = self.point_px_to_m(Vector2::new(rect.x, rect.y)); + Rectangle::new( + left_upper.x, + left_upper.y, + self.length_px_to_m(rect.width), + self.length_px_to_m(rect.height), + ) } /* Helper function to make sure the standard zoom factor is always exact. This helps @@ -122,14 +116,14 @@ impl Transform { } /// Move the canvas by the vector in pixels. - pub fn move_by_px(&mut self, by: [f64; 2]) { - self.translation_px = math::add(self.translation_px, by); + pub fn move_by_px(&mut self, by: Vector2) { + self.translation_px += by; } - pub fn pixels_per_m(&self) -> f64 { + pub fn pixels_per_m(&self) -> f32 { self.pixels_per_m } - pub fn translation_px(&self) -> [f64; 2] { + pub fn translation_px(&self) -> Vector2 { self.translation_px } } |