chiark / gitweb /
ilks: Make ilk available earlier in passive calculation
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Apr 2022 15:17:43 +0000 (16:17 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Apr 2022 18:00:24 +0000 (19:00 +0100)
The only functional effect is that some broken states now no longer
get occultated.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/hidden.rs

index 8dd0f8c6cd63172fac2c5361ab52c76184cbe668..0713789aa32826508b672a2c862ec7557968d898 100644 (file)
@@ -696,10 +696,10 @@ fn recalculate_occultation_general<
       if let Some(occid) = occulteds.new;
       let zg = gen.next();
       let occ = occultation(goccults, occid);
+      if let Some(ilk) = wants!( ipc.occilk.as_ref() );
       then {
         if_chain!{
           if occ.notches.is_empty();
-          if let Some(ilk) = wants!( ipc.occilk.as_ref() );
           if let Some(ilk) = wants!( ioccults.ilks.get(ilk) );
           if let Some(bbox) = want!( Ok = ilk.p_occ.bbox_approx() );
           if let Some(size) = want!( Ok = bbox.br() - bbox.tl(), ?(bbox) );