From be94b04d1ddbd5000138e15bdc6503ef83d2797d Mon Sep 17 00:00:00 2001 From: Ian Chamberlain Date: Thu, 27 Jan 2022 23:52:45 -0500 Subject: [PATCH] Use better image conversion command This looks more correct on the device to my eye and is a bit simpler. --- ctru-rs/examples/assets/ferris.rgb | Bin 230400 -> 230400 bytes ctru-rs/examples/graphics-bitmap.rs | 12 ++++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ctru-rs/examples/assets/ferris.rgb b/ctru-rs/examples/assets/ferris.rgb index 0735606b8b82264f85f93d1f3ea08755bca0cf9d..aaa2087579dc72171aea4bc1827d0140b8621e88 100644 GIT binary patch delta 2043 zcma)73rv$&6u#%SFlbi`r9c(>glVIjvxcY(h%;(fHlfABjJl{qmu)VYbh^bXF+voC z%mLEPKTM6oq|q!ci$=L*FCmzbEUsV(WCi_U<{YHL%<=D=o6y#+>ZtQE-C<2tO23lEq!N zLAoT%>Qh>LWTy}8=SO~LXFf&HN}cYND2(V0CY!Ciq5jOZYZuSk9mh`f828K&rH^c$ z)mx*idq0C7SP#JS>U4UX3kwU|+S;b3rsn=L{L|i0$NkXm<9=fBX^Od_v$Tt?JpuP& zH~AV+d?^5oAGj?${GaY7Y zYT-xNjIWiJmWE^l0|Q7F3%uL)XE-vox z???3WhRfyJw{I^ZHSA^s>L*W7pWuyV6q3{F92*-$8Di)_Ab{)c?(Vv}I^4yf)xC~0 zY`88VHqtoQ<4r&{z= ztJQkFUMv>JP$H2?r_-SXL`>BLKT%m+TpY?%sZ=Tyig-475v(OL*w{*T43okjDT)Bw zG7TLx6?LpgCTXvpN!{j@oBd*QguFBR%>($Gs~87y%M+|O!}1mStn76}Y>0&;@KO5q zuB>;%%gh19^SxlmZaFSyJ+sgOs}d3tF~1nvY_=Ra{Ncfa@8{>KqsC)o$CS1t$TbAP z&8`IC9;}he<&;v~wb^W)ot@+3<9MH_m8Vai&dkiZT<#xkTwa$~Nmfp4SzQpWQj<(3 z6C$*?w?FUk(C+n&)->EFtNm(L7UAn3!{DW(Ygbnn?hA_H6|`ues01bA{<%v&Vw}}P zYwa=1p!62xYPDJ zV77yUgGhykd?sPcC?tH$x;3G;9Lz&=q{Qj+MO zumMW}?JX@W0$eEmMK3A*9PnpGJsml66v4|kIil^r{+&FLxfHY;OfgL~H#cM3SO~rJ z|D#8busV@K&4!fpD&2r(CmbX$&7=F%C%b(r(TS{tP#g(klW=J)(wOHZUrdM}$qc&=>#{OV+H#cGsQ&KB7 zRJvOquEZJ0Vg$n|kL)kSK-iobQVg=Z-pfi7OC|45*L&~Y_kP!_wTfO2hx48DzR!8z zbDrmX)rX&~rgl~gev*Ps7x3CRDtve|0J8^WPLx_LHwRS5USSup&@B$oS}Yf(SHg-r3s{7E zgVipm{4d1`xe+T@a@>(4p`f`rP|!Vl2N=LNkMaE_*&$PMhd3Y+KaRqRB&~+W2It=+F377Q(kFloY%g6kBg?~Ui}U7 z#wjn0NjlV;BjRUK#J9D4IfIRiFqqfN{lgmF1}%-**}wRzb+_BD++T}x;`tCpWhG{2 z*oBUqFWSFwXf)O*X?1oMJNGcgO9NU{p6ofgJHwiAD^3kG&{5?hBZJq<%W>t(Lo*>1 zn+P&Bqc$O9v9{c12%MFn*$|Yl=`7IPl;Yhz{FtSnOZs|nB0^jUUhzV zQT(e_Pl(9QJ0!JCtjI?0bBN4Y*iL+it%G>O2b0$56%K1j)lxO=6un|KqGLF>u$juR z=L5X+9*Q!9bDv?`ZB%%*CaF}Meg3ktP?gnPPd?_ z2CJr^8oc79%!k1c+MuWBQFk{zj;4M*?S|Uz56Yglp#vuy9OO8iEjoX~JtH%M6Ey2YLyI4zC49Ge=LsjX* z58opVXhsJoK7F*8oj0}zp91R-@iEGlB!@_cVNSHQ@sklQ;=aMPYphH%HI^bz%Jm@0 z>4g*)qP-oLF5$)vOiyES5_UWDxW1m<$+FgRzqU2>0{m)yu{l!hPm^OJ?;fp?Q$fK! zGpVUarDv1GU$a8C%bd`oLG-8lAR@-j|CZ@-r5Vacy__k3m$95(Tpa(R4#gX#iZ@0~ GzxyAtr#cY; diff --git a/ctru-rs/examples/graphics-bitmap.rs b/ctru-rs/examples/graphics-bitmap.rs index 6ec7b97..eb53694 100644 --- a/ctru-rs/examples/graphics-bitmap.rs +++ b/ctru-rs/examples/graphics-bitmap.rs @@ -1,5 +1,5 @@ use ctru::console::Console; -use ctru::gfx::{Screen as _, Side}; +use ctru::gfx::Screen as _; use ctru::services::hid::KeyPad; use ctru::services::{Apt, Hid}; use ctru::Gfx; @@ -9,16 +9,12 @@ use ctru::Gfx; /// command from the `examples` directory: /// /// ```sh -/// convert assets/ferris.png -channel B -separate \ -/// assets/ferris.png -channel G -separate \ -/// assets/ferris.png -channel R -separate \ -/// -channel RGB -combine -rotate 90 \ -/// assets/ferris.rgb +/// magick assets/ferris.png -channel-fx "red<=>blue" -rotate 90 assets/ferris.rgb /// ``` /// /// This creates an image appropriate for the default frame buffer format of -/// BGR888 and rotates the image 90° to account for the screen actually being -/// in portrait mode. +/// [`Bgr8`](ctru::services::gspgpu::FramebufferFormat::Bgr8) +/// and rotates the image 90° to account for the portrait mode screen. static IMAGE: &[u8] = include_bytes!("assets/ferris.rgb"); fn main() {