From ec106d32245952cc143b0b0cd928075f7d9ead7f Mon Sep 17 00:00:00 2001 From: Marrub Date: Mon, 4 Mar 2019 05:18:57 -0500 Subject: [PATCH] formatting --- source/durandal/bin.rs | 32 +++++++++------------ source/durandal/cenum.rs | 2 +- source/durandal/crc.rs | 3 +- source/durandal/err.rs | 9 ++++-- source/durandal/fixed.rs | 6 ++-- source/durandal/image.rs | 25 ++++++++++------ source/durandal/sound.rs | 25 +++++++++------- source/durandal/text.rs | 32 ++++++++++----------- source/leela/main.rs | 18 ++++++------ source/marathon/machdr.rs | 8 ++---- source/marathon/pict.rs | 10 +++---- source/marathon/shp.rs | 4 +-- source/marathon/trm.rs | 2 ++ source/marathon/wad.rs | 52 +++++++++++++++++----------------- source/rozinante/draw.rs | 8 +++++- source/tycho/build.rs | 9 +++--- source/tycho/hiddenprotocol.rs | 6 ++-- source/tycho/main.rs | 23 +++++++-------- source/tycho/noroom.rs | 9 +++--- 19 files changed, 150 insertions(+), 133 deletions(-) diff --git a/source/durandal/bin.rs b/source/durandal/bin.rs index 91197b5..1234ce6 100644 --- a/source/durandal/bin.rs +++ b/source/durandal/bin.rs @@ -61,12 +61,8 @@ macro_rules! _durandal_read_impl { }; // no endianness - ($_:ident $b:ident $nam:ident u8 $n:expr) => { - let $nam = $b[$n]; - }; - ($_:ident $b:ident $nam:ident slice u8 $n:expr) => { - let $nam = &$b[$n]; - }; + ($_:ident $b:ident $nam:ident u8 $n:expr) => {let $nam = $b[$n];}; + ($_:ident $b:ident $nam:ident slice u8 $n:expr) => {let $nam = &$b[$n];}; ($_:ident $b:ident $nam:ident i8 $n:expr) => { let $nam = i8::from_ne_bytes([$b[$n]]); }; @@ -108,24 +104,24 @@ macro_rules! _durandal_read_impl { /// - `u16` or `i16`: two bytes will be read at `place` with `from_*_bytes`. /// - `u32` or `i32`: four bytes will be read at `place` with `from_*_bytes`. /// - `Ident`: four bytes will be read at `place` into an array, disregarding -/// endianness, creating an `Ident` object. +/// endianness, creating an `Ident` object. /// - `Angle`: same as `u16`, but the result is passed to -/// `fixed::Angle::from_bits`, resulting in a `fixed::Angle` object. +/// `fixed::Angle::from_bits`, resulting in a `fixed::Angle` object. /// - `Fixed`: same as `u32`, but the result is passed to -/// `fixed::Fixed::from_bits`, resulting in a `fixed::Fixed` object. +/// `fixed::Fixed::from_bits`, resulting in a `fixed::Fixed` object. /// - `Unit`: same as `u16`, but the result is passed to -/// `fixed::Unit::from_bits`, resulting in a `fixed::Unit` object. +/// `fixed::Unit::from_bits`, resulting in a `fixed::Unit` object. /// - `OptU16`: same as `u16`, but the result is passed to -/// `OptU16::from_repr`, resulting in an `OptU16` object. +/// `OptU16::from_repr`, resulting in an `OptU16` object. /// - The name of a function, which is passed `&source[place]` as its only -/// argument. The function's result has the `?` operator applied to it. +/// argument. The function's result has the `?` operator applied to it. /// - `opts` may be one of: /// - `slice` when `type` is `u8`: `place` is a range specifying a `u8` slice -/// to be taken from `source`. -/// - `usize` when `type` is `u16` or `u32`: converts the resulting integer -/// to `usize` by `usize_to_u32` for `u32` or by `from` for `u16`. +/// to be taken from `source`. +/// - `usize` when `type` is `u16` or `u32`: converts the resulting integer to +/// `usize` by `usize_to_u32` for `u32` or by `from` for `u16`. /// - `no_try` when `type` is a function name: does not use the `?` operator -/// on the resulting function call. +/// on the resulting function call. /// - Nothing at all. /// - `place` is either an integer literal which must be representable as /// `usize`, or a range, which may only be used when `type` is a function @@ -245,7 +241,7 @@ impl OptU16 pub fn get_repr(&self) -> u16 { match self.0 { - None => u16::max_value(), + None => u16::max_value(), Some(n) => n.get() - 1, } } @@ -254,7 +250,7 @@ impl OptU16 pub fn get(&self) -> Option { match self.0 { - None => None, + None => None, Some(n) => Some(n.get() - 1), } } diff --git a/source/durandal/cenum.rs b/source/durandal/cenum.rs index 7a80725..0595cc2 100644 --- a/source/durandal/cenum.rs +++ b/source/durandal/cenum.rs @@ -32,7 +32,7 @@ macro_rules! c_enum { match n { $($value => Ok($E::$Enum),)+ - n => Err(ReprError(n.into())) + n => Err(ReprError(n.into())) } } } diff --git a/source/durandal/crc.rs b/source/durandal/crc.rs index 1e13490..1b6c4ce 100644 --- a/source/durandal/crc.rs +++ b/source/durandal/crc.rs @@ -22,7 +22,8 @@ fn crc_init() -> [u32; 256] pub fn crc32(b: &[u8], s: u32) -> u32 { let t = crc_init(); - !b.iter().fold(s, |a, &o| a >> 8 ^ t[usize::from(a as u8 ^ o)]) + !b.iter() + .fold(s, |a, &o| a >> 8 ^ t[usize::from(a as u8 ^ o)]) } #[test] diff --git a/source/durandal/err.rs b/source/durandal/err.rs index 6657b80..3dd8d91 100644 --- a/source/durandal/err.rs +++ b/source/durandal/err.rs @@ -8,7 +8,7 @@ macro_rules! ok { ($v:expr, $msg:expr) => { match $v { Some(v) => Ok(v), - None => Err(err_msg($msg)), + None => Err(err_msg($msg)), } }; } @@ -17,7 +17,7 @@ macro_rules! flag_ok { ($t:ident, $v:expr) => { match $t::from_bits($v) { Some(v) => Ok(v), - None => Err(err_msg(concat!("bad ", stringify!($t)))), + None => Err(err_msg(concat!("bad ", stringify!($t)))), } }; } @@ -52,7 +52,10 @@ impl fmt::Debug for ReprError impl fmt::Display for ErrMsg { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {f.write_str(self.0)} + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result + { + f.write_str(self.0) + } } impl fmt::Debug for ErrMsg diff --git a/source/durandal/fixed.rs b/source/durandal/fixed.rs index a07a50a..adf7d3c 100644 --- a/source/durandal/fixed.rs +++ b/source/durandal/fixed.rs @@ -190,9 +190,9 @@ fn fixed_basic_ops() assert_eq!((Fixed::from(1) + 1.into()).to_bits(), 2 << Fixed::FRACBITS); assert_eq!((Fixed::from(2) - 1.into()).to_bits(), 1 << Fixed::FRACBITS); assert_eq!((Fixed::from(6) * 2.into()).to_bits(), 12 << Fixed::FRACBITS); - assert_eq!((Fixed::from(6).mul_i(2)).to_bits(), 12 << Fixed::FRACBITS); + assert_eq!((Fixed::from(6).mul_i(2)) .to_bits(), 12 << Fixed::FRACBITS); assert_eq!((Fixed::from(7) / 2.into()).to_bits(), seven_div_2); - assert_eq!((Fixed::from(7).div_i(2)).to_bits(), seven_div_2); + assert_eq!((Fixed::from(7).div_i(2)) .to_bits(), seven_div_2); } #[test] @@ -203,7 +203,7 @@ fn fixed_overflow() {Fixed::from(i16::max_value()) + 1.into();} #[test] fn fixed_printing() { - assert_eq!(format!("{}", Fixed::from(6)), "6.0"); + assert_eq!(format!("{}", Fixed::from(6)), "6.0"); assert_eq!(format!("{}", Fixed::from(7).div_i(2)), "3.5"); assert_eq!(format!("{:7.7}", Fixed::from_bits(0xDEAD_BEEF)), " -8531.7458343"); diff --git a/source/durandal/image.rs b/source/durandal/image.rs index adfe9bc..6d80f3f 100644 --- a/source/durandal/image.rs +++ b/source/durandal/image.rs @@ -26,7 +26,9 @@ pub fn r5g5b5_to_rgb16(rgb: u16) -> Color16 /// Creates a RGB16 color from a RGB8 format color. pub fn rgb8_to_rgb16(r: u8, g: u8, b: u8) -> Color16 { - Color16::new(u16::from(r) << 8, u16::from(g) << 8, u16::from(b) << 8) + Color16::new(u16::from(r) << 8, + u16::from(g) << 8, + u16::from(b) << 8) } /// Writes a PPM file from an image. @@ -49,13 +51,20 @@ pub fn write_ppm(out: &mut impl io::Write, im: &impl Image) -> ResultS<()> /// Writes a TGA file from an image. pub fn write_tga(out: &mut impl io::Write, im: &impl Image) -> ResultS<()> { - out.write_all(&[0, 0, 2])?; // id len, color map type, image type - out.write_all(&[0, 0, 0, 0, 0])?; // color map spec - out.write_all(&[0, 0])?; // x origin - out.write_all(&[0, 0])?; // y origin - out.write_all(&(im.w() as u16).to_le_bytes())?; // width - out.write_all(&(im.h() as u16).to_le_bytes())?; // height - out.write_all(&[32, 0])?; // depth, descriptor + // id len, color map type, image type + out.write_all(&[0, 0, 2])?; + // color map spec + out.write_all(&[0, 0, 0, 0, 0])?; + // x origin + out.write_all(&[0, 0])?; + // y origin + out.write_all(&[0, 0])?; + // width + out.write_all(&u16::to_le_bytes(im.w() as u16))?; + // height + out.write_all(&u16::to_le_bytes(im.h() as u16))?; + // depth, descriptor + out.write_all(&[32, 0])?; for y in (0..im.h()).rev() { for x in 0..im.w() { diff --git a/source/durandal/sound.rs b/source/durandal/sound.rs index 4052598..f0ffd19 100644 --- a/source/durandal/sound.rs +++ b/source/durandal/sound.rs @@ -6,22 +6,27 @@ use std::io; /// Writes a WAVE file from a sound. pub fn write_wav(out: &mut impl io::Write, snd: &impl Sound) -> ResultS<()> { - let rate = u32::from(snd.rate()); - let bps = rate * 2; + let smp_rate = u32::from(snd.rate()); + let smp_size = smp_rate * 2; let dat_size = snd.len() as u32 * 2; - let hdr_size = 36 + dat_size; out.write_all(b"RIFF")?; - out.write_all(&u32::to_le_bytes(hdr_size))?; + out.write_all(&u32::to_le_bytes(36 + dat_size))?; out.write_all(b"WAVE")?; + out.write_all(b"fmt ")?; out.write_all(&u32::to_le_bytes(16))?; - out.write_all(&u16::to_le_bytes(1))?; // PCM - out.write_all(&u16::to_le_bytes(1))?; // mono - out.write_all(&u32::to_le_bytes(rate))?; - out.write_all(&u32::to_le_bytes(bps))?; - out.write_all(&u16::to_le_bytes(2))?; // block alignment - out.write_all(&u16::to_le_bytes(16))?; // bits per sample + // PCM + out.write_all(&u16::to_le_bytes(1))?; + // mono + out.write_all(&u16::to_le_bytes(1))?; + out.write_all(&u32::to_le_bytes(smp_rate))?; + out.write_all(&u32::to_le_bytes(smp_size))?; + // block alignment + out.write_all(&u16::to_le_bytes(2))?; + // bits per sample + out.write_all(&u16::to_le_bytes(16))?; + out.write_all(b"data")?; out.write_all(&u32::to_le_bytes(dat_size))?; diff --git a/source/durandal/text.rs b/source/durandal/text.rs index 329469d..173b0b2 100644 --- a/source/durandal/text.rs +++ b/source/durandal/text.rs @@ -81,11 +81,11 @@ pub fn mac_roman_conv(s: &[u8]) -> String for &c in s.iter() { v.push(match c { - 0 => break, - b'\r' => '\n', - c if c & 0x80 != 0 => TR[usize::from(c) & 0x7F], - c => char::from(c), - }); + 0 => break, + b'\r' => '\n', + c if c & 0x80 != 0 => TR[usize::from(c) & 0x7F], + c => char::from(c), + }); } v @@ -118,17 +118,17 @@ const TR: [char; 128] = #[test] fn to_binsize_integrals() { - assert_eq!(to_binsize(0), "empty"); - assert_eq!(to_binsize(1), "1 byte"); - assert_eq!(to_binsize(2), "2 bytes"); - assert_eq!(to_binsize(999), "999 bytes"); - assert_eq!(to_binsize(1000), "1kB"); - assert_eq!(to_binsize(1000 * 7), "7kB"); - assert_eq!(to_binsize(1000 * 1000), "1MB"); - assert_eq!(to_binsize(1000 * 1000 * 7), "7MB"); - assert_eq!(to_binsize(1000 * 1000 * 1000), "1GB"); - assert_eq!(to_binsize(1000 * 1000 * 1000 * 7), "7GB"); - assert_eq!(to_binsize(1000 * 1000 * 1000 * 1000), "1TB"); + assert_eq!(to_binsize(0), "empty"); + assert_eq!(to_binsize(1), "1 byte"); + assert_eq!(to_binsize(2), "2 bytes"); + assert_eq!(to_binsize(999), "999 bytes"); + assert_eq!(to_binsize(1000), "1kB"); + assert_eq!(to_binsize(1000 * 7), "7kB"); + assert_eq!(to_binsize(1000 * 1000), "1MB"); + assert_eq!(to_binsize(1000 * 1000 * 7), "7MB"); + assert_eq!(to_binsize(1000 * 1000 * 1000), "1GB"); + assert_eq!(to_binsize(1000 * 1000 * 1000 * 7), "7GB"); + assert_eq!(to_binsize(1000 * 1000 * 1000 * 1000), "1TB"); assert_eq!(to_binsize(1000 * 1000 * 1000 * 1000 * 7), "7TB"); } diff --git a/source/leela/main.rs b/source/leela/main.rs index b6297f0..672442e 100644 --- a/source/leela/main.rs +++ b/source/leela/main.rs @@ -5,6 +5,7 @@ use std::{fs, io}; fn make_tga(_opt: &Options, fname: &str, im: &impl Image) -> ResultS<()> { let mut out = io::BufWriter::new(fs::File::create(fname)?); + write_tga(&mut out, im) } @@ -17,6 +18,7 @@ fn make_yaml(opt: &Options, data: &T) -> ResultS<()> serde_yaml::to_writer(io::stdout(), &data)?; println!(); } + Ok(()) } @@ -64,15 +66,10 @@ fn dump_bitmaps(opt: &Options, c: &shp::Collection, i: usize) -> ResultS<()> fn write_shp_objs(opt: &Options, cl: &shp::Collection) -> ResultS<()> { - if opt.shp_tab { - make_yaml(opt, &cl.tabs)?; - } - if opt.shp_frm { - make_yaml(opt, &cl.frms)?; - } - if opt.shp_seq { - make_yaml(opt, &cl.seqs)?; - } + if opt.shp_tab {make_yaml(opt, &cl.tabs)?;} + if opt.shp_frm {make_yaml(opt, &cl.frms)?;} + if opt.shp_seq {make_yaml(opt, &cl.seqs)?;} + Ok(()) } @@ -83,6 +80,7 @@ fn process_shp(opt: &Options, b: &[u8]) -> ResultS<()> dump_bitmaps(opt, cl, i)?; write_shp_objs(opt, cl)?; } + if let Some(cl) = &cl.1 { dump_bitmaps(opt, cl, i + 100)?; write_shp_objs(opt, cl)?; @@ -243,7 +241,7 @@ fn main() -> ResultS<()> "wad:" => process_wad(&opt, b), "shp:" => process_shp(&opt, b), "snd:" => process_snd(&opt, b), - _ => Err(err_msg("invalid file type specified on commandline")), + _ => Err(err_msg("invalid file type specified on commandline")), }?; } diff --git a/source/marathon/machdr.rs b/source/marathon/machdr.rs index b31e4a2..c080eda 100644 --- a/source/marathon/machdr.rs +++ b/source/marathon/machdr.rs @@ -36,6 +36,7 @@ pub fn check_apple_single(b: &[u8]) -> Option pub fn check_macbin(b: &[u8]) -> Option { // check legacy version, length, zero fill, and macbin2 version + // I swear this isn't *completely* magic if b.len() < 128 || b[0] != 0 || b[1] > 63 || b[74] != 0 || b[123] > 129 { return None; } @@ -46,6 +47,7 @@ pub fn check_macbin(b: &[u8]) -> Option for &byte in b.iter().take(124) { for j in 8..16 { let d = u16::from(byte) << j; + if (d ^ crc) & 0x8000 == 0 { crc <<= 1; } else { @@ -55,11 +57,7 @@ pub fn check_macbin(b: &[u8]) -> Option } // if ok, resource fork follows - if crc == u16b(&b[124..]) { - Some(128) - } else { - None - } + if crc == u16b(&b[124..]) {Some(128)} else {None} } /// Reads a `MacBin` or `AppleSingle` header if there is one and returns the diff --git a/source/marathon/pict.rs b/source/marathon/pict.rs index 999c217..696ba53 100644 --- a/source/marathon/pict.rs +++ b/source/marathon/pict.rs @@ -67,7 +67,9 @@ fn read_pm_ind(mut im: Image8, b: &[u8], hdr: Header) -> ResultS for _ in 0..im.h() { for _ in 0..im.w() { let idx = usize::from(b[p]); + im.cr.push(ok!(clut.get(idx), "invalid index")?.clone()); + p += 1; } } @@ -77,11 +79,8 @@ fn read_pm_ind(mut im: Image8, b: &[u8], hdr: Header) -> ResultS // RLE compressed 1, 2, 4 or 8 bit colormap indices for _ in 0..im.h() { let (d, pp) = read_rle::(&b[p..], hdr.pitch)?; - let d = if hdr.depth < 8 { - expand_data(d, hdr.depth)? - } else { - d - }; + + let d = if hdr.depth < 8 {expand_data(d, hdr.depth)?} else {d}; p += pp; @@ -107,6 +106,7 @@ fn read_pm_16(mut im: Image8, b: &[u8], hdr: Header) -> ResultS for _ in 0..im.h() { for _ in 0..im.w() { let cr = u16b(&b[p..]); + im.cr.push(r5g5b5_to_rgb8(cr)); p += 2; } diff --git a/source/marathon/shp.rs b/source/marathon/shp.rs index 29a8090..6566b62 100644 --- a/source/marathon/shp.rs +++ b/source/marathon/shp.rs @@ -18,8 +18,8 @@ fn read_color(b: &[u8], clut: &mut [ColorShp]) -> ResultS<()> let l = match l { 128 => Ok(true), - 0 => Ok(false), - _ => Err(err_msg("invalid flag in color")), + 0 => Ok(false), + _ => Err(err_msg("invalid flag in color")), }?; let cr = ColorShp::Opaque{r, g, b, l}; diff --git a/source/marathon/trm.rs b/source/marathon/trm.rs index 4ed575a..795a97d 100644 --- a/source/marathon/trm.rs +++ b/source/marathon/trm.rs @@ -149,9 +149,11 @@ impl fmt::Debug for Group fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "Group{{{:?} {} {}", self.ttype, self.pdata, self.lines)?; + if !self.text.is_empty() { write!(f, ";\n{}", self.text)?; } + write!(f, "}}") } } diff --git a/source/marathon/wad.rs b/source/marathon/wad.rs index 12107b8..5745cfa 100644 --- a/source/marathon/wad.rs +++ b/source/marathon/wad.rs @@ -1,7 +1,7 @@ //! Marathon Wad format handling. -use crate::durandal::{bin::*, err::*, image, text::mac_roman_conv}; -use crate::marathon::{map, phy, pict, trm}; +use crate::{durandal::{bin::*, err::*, image, text::mac_roman_conv}, + marathon::{map, phy, pict, trm}}; use std::collections::BTreeMap; /// Reads all chunks in an entry. @@ -27,30 +27,30 @@ pub fn read_chunks(b: &[u8], old_dat: bool, siz_cnk: usize) let data = &b[beg..end]; chunks.push(match &iden.0 { - b"PICT" => Chunk::Pict(pict::load_pict(data)?), - b"Minf" => Chunk::Minf(map::read_minf(data)?), - b"iidx" => Chunk::Iidx(rd_array(data, map::read_iidx)?), - b"EPNT" => Chunk::Pnts(rd_array(data, map::read_epnt)?), - b"PNTS" => Chunk::Pnts(rd_array(data, map::read_pnts)?), - b"LINS" => Chunk::Lins(rd_array(data, map::read_lins)?), - b"SIDS" => Chunk::Sids(rd_array(data, map_read_sides)?), - b"POLY" => Chunk::Poly(rd_array(data, map_read_polys)?), - b"OBJS" => Chunk::Objs(rd_array(data, map::read_objs)?), - b"LITE" => Chunk::Lite(rd_array(data, map_read_light)?), - b"plac" => Chunk::Plac(rd_array(data, map::read_plac)?), - b"ambi" => Chunk::Ambi(rd_array(data, map::read_ambi)?), - b"bonk" => Chunk::Bonk(rd_array(data, map::read_bonk)?), - b"medi" => Chunk::Medi(rd_array(data, map::read_medi)?), - b"plat" => Chunk::Plat(rd_array(data, map::read_plat)?), - b"NOTE" => Chunk::Note(rd_array(data, map::read_note)?), - b"term" => Chunk::Term(rd_array(data, trm::read_term)?), - b"FXpx" => Chunk::Fxpx(rd_array(data, phy::read_fxpx)?), - b"MNpx" => Chunk::Mnpx(rd_array(data, phy::read_mnpx)?), - b"PRpx" => Chunk::Prpx(rd_array(data, phy::read_prpx)?), - b"PXpx" => Chunk::Pxpx(rd_array(data, phy::read_pxpx)?), - b"WPpx" => Chunk::Wppx(rd_array(data, phy::read_wppx)?), - _ => Chunk::Data{iden, data: data.to_vec()}, - }); + b"PICT" => Chunk::Pict(pict::load_pict(data)?), + b"Minf" => Chunk::Minf(map::read_minf(data)?), + b"iidx" => Chunk::Iidx(rd_array(data, map::read_iidx)?), + b"EPNT" => Chunk::Pnts(rd_array(data, map::read_epnt)?), + b"PNTS" => Chunk::Pnts(rd_array(data, map::read_pnts)?), + b"LINS" => Chunk::Lins(rd_array(data, map::read_lins)?), + b"SIDS" => Chunk::Sids(rd_array(data, map_read_sides)?), + b"POLY" => Chunk::Poly(rd_array(data, map_read_polys)?), + b"OBJS" => Chunk::Objs(rd_array(data, map::read_objs)?), + b"LITE" => Chunk::Lite(rd_array(data, map_read_light)?), + b"plac" => Chunk::Plac(rd_array(data, map::read_plac)?), + b"ambi" => Chunk::Ambi(rd_array(data, map::read_ambi)?), + b"bonk" => Chunk::Bonk(rd_array(data, map::read_bonk)?), + b"medi" => Chunk::Medi(rd_array(data, map::read_medi)?), + b"plat" => Chunk::Plat(rd_array(data, map::read_plat)?), + b"NOTE" => Chunk::Note(rd_array(data, map::read_note)?), + b"term" => Chunk::Term(rd_array(data, trm::read_term)?), + b"FXpx" => Chunk::Fxpx(rd_array(data, phy::read_fxpx)?), + b"MNpx" => Chunk::Mnpx(rd_array(data, phy::read_mnpx)?), + b"PRpx" => Chunk::Prpx(rd_array(data, phy::read_prpx)?), + b"PXpx" => Chunk::Pxpx(rd_array(data, phy::read_pxpx)?), + b"WPpx" => Chunk::Wppx(rd_array(data, phy::read_wppx)?), + _ => Chunk::Data{iden, data: data.to_vec()}, + }); p = end; } diff --git a/source/rozinante/draw.rs b/source/rozinante/draw.rs index e6bf0b2..71d01a6 100644 --- a/source/rozinante/draw.rs +++ b/source/rozinante/draw.rs @@ -25,6 +25,12 @@ pub type Coord = i32; pub type Point = (Coord, Coord); #[derive(Copy, Clone, Debug)] -pub struct Rect {pub x: Coord, pub y: Coord, pub w: Coord, pub h: Coord} +pub struct Rect +{ + pub x: Coord, + pub y: Coord, + pub w: Coord, + pub h: Coord, +} // EOF diff --git a/source/tycho/build.rs b/source/tycho/build.rs index 30c29dd..e0c9e2f 100644 --- a/source/tycho/build.rs +++ b/source/tycho/build.rs @@ -4,11 +4,10 @@ fn main() { println!("cargo:rerun-if-changed=data"); - Command::new("glib-compile-resources") - .arg("data/tycho_res.xml") - .arg("--target=data/tycho.res") - .status() - .unwrap(); + Command::new("glib-compile-resources").arg("data/tycho_res.xml") + .arg("--target=data/tycho.res") + .status() + .unwrap(); } // EOF diff --git a/source/tycho/hiddenprotocol.rs b/source/tycho/hiddenprotocol.rs index fc8929f..85b9bf7 100644 --- a/source/tycho/hiddenprotocol.rs +++ b/source/tycho/hiddenprotocol.rs @@ -1,6 +1,6 @@ -use maraiah::durandal::image::*; -use maraiah::marathon::*; -use maraiah::rozinante::{color::*, draw::*}; +use maraiah::{durandal::image::*, + marathon::*, + rozinante::{color::*, draw::*}}; pub fn draw_map_none(d: &D, im: &I) where D: DrawArea, diff --git a/source/tycho/main.rs b/source/tycho/main.rs index 04b4573..07995e3 100644 --- a/source/tycho/main.rs +++ b/source/tycho/main.rs @@ -1,8 +1,7 @@ mod hiddenprotocol; mod noroom; -use crate::hiddenprotocol::*; -use crate::noroom::*; +use crate::{hiddenprotocol::*, noroom::*}; use gio::prelude::*; use gtk::prelude::*; use maraiah::durandal::err::*; @@ -23,21 +22,21 @@ fn mk_draw_area(b: >k::Builder) let im = CairoPixbuf(load_img("/net/greyserv/maraiah/tycho/tycho1")); area.connect_draw(move |area, cr| { - let w = f64::from(area.get_allocated_width()); - let h = f64::from(area.get_allocated_height()); + let w = f64::from(area.get_allocated_width()); + let h = f64::from(area.get_allocated_height()); - ax.set_lower(0.0); - ax.set_upper(w); + ax.set_lower(0.0); + ax.set_upper(w); - ay.set_lower(0.0); - ay.set_upper(h); + ay.set_lower(0.0); + ay.set_upper(h); - let d = CairoDrawArea::new(cr.clone(), w, h); + let d = CairoDrawArea::new(cr.clone(), w, h); - draw_map_none(&d, &im); + draw_map_none(&d, &im); - Inhibit(true) - }); + Inhibit(true) + }); } fn run_app(app: >k::Application) diff --git a/source/tycho/noroom.rs b/source/tycho/noroom.rs index e2b6072..a2390d5 100644 --- a/source/tycho/noroom.rs +++ b/source/tycho/noroom.rs @@ -1,5 +1,4 @@ -use maraiah::rozinante::draw::*; -use maraiah::durandal::image::*; +use maraiah::{durandal::image::*, rozinante::draw::*}; fn flt_color(cr: impl Color) -> (f64, f64, f64) { @@ -35,7 +34,8 @@ impl DrawArea for CairoDrawArea self.rect(Rect{x: 0, y: 0, w: self.w(), h: self.h()}, cr); - self.ctx.select_font_face("Sans", FontSlant::Normal, FontWeight::Normal); + self.ctx + .select_font_face("Sans", FontSlant::Normal, FontWeight::Normal); self.ctx.set_font_size(14.0); } @@ -65,7 +65,8 @@ impl DrawArea for CairoDrawArea fn image(&self, pos: Point, im: &Self::NativeImage) { use gdk::prelude::*; - self.ctx.set_source_pixbuf(&im.0, f64::from(pos.0), f64::from(pos.1)); + self.ctx + .set_source_pixbuf(&im.0, f64::from(pos.0), f64::from(pos.1)); self.ctx.paint(); } }