From c55e471c854289bb1949df0fe1b1853b97b23ffb Mon Sep 17 00:00:00 2001 From: Dane Johnson Date: Thu, 12 May 2022 16:34:18 -0500 Subject: [PATCH] Reformat, finish risk board, build for production, v1.1.0 --- Cargo.lock | 192 +----------------- Cargo.toml | 4 +- .../Cargo.toml | 4 +- .../src/main.rs | 2 + samples/risk.board | Bin 512774 -> 512810 bytes 5 files changed, 9 insertions(+), 193 deletions(-) rename {board-builder-impl-egui => board-builder-gui}/Cargo.toml (81%) rename {board-builder-impl-egui => board-builder-gui}/src/main.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index da9a7f0..c8a5785 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,15 +59,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407" -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "arboard" version = "2.1.0" @@ -145,7 +136,7 @@ dependencies = [ [[package]] name = "board-builder" -version = "1.0.0" +version = "1.1.0" dependencies = [ "image", "serde", @@ -154,8 +145,8 @@ dependencies = [ ] [[package]] -name = "board-builder-impl-egui" -version = "0.1.0" +name = "board-builder-gui" +version = "1.0.0" dependencies = [ "board-builder", "eframe", @@ -163,16 +154,6 @@ dependencies = [ "rfd", ] -[[package]] -name = "board-builder-impl-fltk" -version = "0.1.0" -dependencies = [ - "board-builder", - "fltk", - "image", - "state", -] - [[package]] name = "bumpalo" version = "3.9.1" @@ -317,15 +298,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "cmake" -version = "0.1.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" -dependencies = [ - "cc", -] - [[package]] name = "cocoa" version = "0.24.0" @@ -746,28 +718,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "fltk" -version = "1.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ab2f73e2c40921098e1d6b8e82887b37823dee2412ffab147219562251e0c0" -dependencies = [ - "bitflags", - "crossbeam-channel", - "fltk-sys", - "paste", - "ttf-parser", -] - -[[package]] -name = "fltk-sys" -version = "1.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fef608d4752f3eec2dc30818be069ead5a6f20d173cb3b154776812041e465d" -dependencies = [ - "cmake", -] - [[package]] name = "flume" version = "0.10.12" @@ -854,19 +804,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "generator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "winapi", -] - [[package]] name = "generic-array" version = "0.14.5" @@ -1251,21 +1188,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "loom" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - [[package]] name = "malloc_buf" version = "0.0.6" @@ -1275,15 +1197,6 @@ dependencies = [ "libc", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - [[package]] name = "matches" version = "0.1.9" @@ -1680,12 +1593,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "paste" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" - [[package]] name = "pbkdf2" version = "0.10.1" @@ -1824,30 +1731,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "regex" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - [[package]] name = "rfd" version = "0.8.2" @@ -1872,12 +1755,6 @@ dependencies = [ "windows", ] -[[package]] -name = "rustversion" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" - [[package]] name = "ryu" version = "1.0.9" @@ -1964,15 +1841,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - [[package]] name = "shared_library" version = "0.1.9" @@ -2026,15 +1894,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - [[package]] name = "str-buf" version = "1.0.5" @@ -2097,15 +1956,6 @@ dependencies = [ "syn", ] -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - [[package]] name = "threadpool" version = "1.8.1" @@ -2198,36 +2048,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" -dependencies = [ - "ansi_term", - "lazy_static", - "matchers", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", ] [[package]] @@ -2275,12 +2095,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "version-compare" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index d6bc3cb..ee47d9a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "board-builder" -version = "1.0.0" +version = "1.1.0" edition = "2021" [lib] @@ -13,4 +13,4 @@ zip = "0.6.2" image = "0.24.2" [workspace] -members = ["board-builder-impl-fltk", "board-builder-impl-egui"] \ No newline at end of file +members = ["board-builder-gui"] \ No newline at end of file diff --git a/board-builder-impl-egui/Cargo.toml b/board-builder-gui/Cargo.toml similarity index 81% rename from board-builder-impl-egui/Cargo.toml rename to board-builder-gui/Cargo.toml index 1cdc7aa..7b4cab9 100644 --- a/board-builder-impl-egui/Cargo.toml +++ b/board-builder-gui/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "board-builder-impl-egui" -version = "0.1.0" +name = "board-builder-gui" +version = "1.1.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/board-builder-impl-egui/src/main.rs b/board-builder-gui/src/main.rs similarity index 99% rename from board-builder-impl-egui/src/main.rs rename to board-builder-gui/src/main.rs index 7b7e70c..07b7aee 100644 --- a/board-builder-impl-egui/src/main.rs +++ b/board-builder-gui/src/main.rs @@ -1,3 +1,5 @@ +#![windows_subsystem = "windows"] // Don't show a console + use eframe::egui; use egui::*; diff --git a/samples/risk.board b/samples/risk.board index 186a506c823f17a20346c1f087130954bd299a09..b3adf8fc5cccba4a40f9fe07006ebe615454fb7a 100644 GIT binary patch delta 1405 zcmV-@1%mp9rXQ-NAAe9w0|XQR000O8IIFBw(}x>Dy#xRN(+~gv3IG5AXL4b1XfA4V zZ*G-WU2oe)5d13wpAW_D?tS`A34$Okk`_(Vq6qSEu`V)Ug)%6rsT26WcS(tNN67+J zTQE#n-nreKnce$QZNlfc*;O|`s^8iUw>m;--b$5@3!sa`PIJN zK1BXyx!-kd*wp=-%P+^jE_eL==}A=0b`^)nME%cys~h=~RoW;|qI&F~$Pjt}#h(pd zV|7!#-8Sp(Azoaq`~Uu^Kq&c1Jafjm|-5kxcP0hQ0Jt))&dM1s z_ys?B!+)JgNH6cE`XUm9b9v;3Xyv)dDyiXMM`mId=M6zEkOZnr1S>m}ov&AlR(8a) zWLfZ;UoY7!*kztUn+1U)Ap;VbS0js!v;8Zfe7J8z-NY%2IpMx5ewN8umguaMh&JJP z({td=XJ3XUtjcV(u;K#Irc-7}EHh47XMrdU4uA6fOHZ|P$p~ORHOf%7r+_kPgqXn! z&K&2t5pvA{L6^nqq(zqAQAUiab>TQ{o?$A}S#DDf?#M`xV~1d%TVc+>gs-=Ep}YUT zqZYIOb9}3kV>*t`1kZ(f%bj0`-EC;gZm3y0D=3D!lCD@5RIi}~@N;;W_}E-+Qdp8& zdw-+G+87Sozf#~AZTMbqCSy>5I-P`hbW0Bki$Q2KTcXMFmYcAf6q*N^5pb;xFzb#Z zv-HLZ(oZPnOd)Tk*$HFj`k7Y)Fo*B4+#FnzGH1m9(9~UAE#7ybW0bk_pQl4P9o|JO zrr{2RplmMN-{F4W?e0s0^0G5GrXbUY>3`{!^l5mYqjGkPj+^${1S9md$(W*i%A$f~ ziL7PdHwqH)0@qDpuBSjIn{vJJ+0mZVkpy|`>X-Ltop9C!RYu{xgtW~5u6Z>rwEd<% zZOvR)iaJ>?3;86L;mb~){2Oy^@keaiy4$vo1&qCVc4WCTnn6_KP}GL61TyFHXMb$s z_qg9omQ*E30GzGswkQx82V)m30@6aWAK2mm;%tW*$XdxO#hhtdQA zhtdQBhtdQChtdQDhtdQEhtdQFx6%X$yUh+btE^PhhZ{k?1ONcj5SN?M2P#20tE^NI zWqW&>%?AMa&IbSq00000000000001_f#n1M0BLPuXJsyMZf8(S1qJ{B000620swCS L005=Z2LJ#7pFy1! delta 1322 zcmV+_1=aehrXPl;AAe9w0|XQR000O8h_b6xL}co^nFIg;rw#xB3IG5AXL4b1XfA4V zZ*GlOU2hvV5d15`Jrf1F%TK>4K@hY>(xPr!6hR&siIESMPsZug#0mW0vpnla-cd1P z9c)XM=a#cOv!id#-hT}HV{`Sb`77+&L)TorZ>|rg;byhI3x9pP@eOO%$2R_Wb?OiI zfqr>==;wbw9f#iU$2YA%jW2$9WKDP2h7lP>{Qjl6;=dTFv~lXyNmz&9)Tf#V7bai!j%b4=%>dS4iyTHQYW~7!*K|Gw|dvLL)fma2R{&O zhF>D<0$Cc6!hf8RK`JHag@nA`e+>OlmMWMm;S!w-w&HD&r~7CZ8Byok2x~Pr%B9;} zw{)9!#)x3(h!iIIvU-37tE3|?WA7>jibnDQb+_${g$N0*s;n|E>Q{97^z~+wb5LjVJ#Rdt(fUCqLxmYDy~|e z`y){aXQ#7k>XbH0&KqCrypp%bauh~7$z3vNuzy(kbLe7yh4-hiXH~x;+nlsLVuMO&TspOq5;>X$lcT*aaLp1l z7k>$0xFi0O%#mcCr}K|)@O^tIz%*O*`?+^Mpf4Hql{F|B4lb5Z5^xAEIx&~ z0($pwKa>`!8BoT!V3dFvGwy$BCIdEOz%aD~RpF(=%_lCt8e4Vb?p+6r0CV_~FwQhe#!g!q7HhDGkMhWmVWf{C`2* z#-|vV_rse*w>!+Y4aJu_uI2Seo0fC3izF80=dw!~G;%qx9P3t0+eOA?B- zL_#K8E_1j)&ax&2k464^?naP9l%iC|^>i@B$HiYz)o!=@u!`p^I{@PXpoy;BH8%lC za!$($T9X9hm7rhr{%gCR#T_Op*;ffHB#jzCs-!#05!)ZUukHpFaP{=+( zsouymeKrns>6mY*ojZTr_`Xy~y{IywCVt|ONh5aj2CRbArN}c!eSG{5P)h>@6aWAK z2mpw(tAp|chw=mghw=mhhw=mihw=mjhw=mkhw=mlxAFuBzs(Mava3`?Wa_$^1ONc1 g4wt{u2Py-Iva6Tu(gzy>!Iucr2OI{0(gy$l00(<*!2kdN