chiark / gitweb /
Ian Jackson [Thu, 11 Mar 2021 14:52:23 +0000 (14:52 +0000)]
shapelib: subst: remove whitespace next to empty replacements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 14:45:59 +0000 (14:45 +0000)]
shapelib hidden: Move subst up a level
nfc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Mar 2021 23:49:50 +0000 (23:49 +0000)]
hidden shapelib: Abolish old unused `desc_hidden`
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 14:25:25 +0000 (14:25 +0000)]
hidden: Do not permute pieces for players with Visible view
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 14:20:30 +0000 (14:20 +0000)]
hidden: Permute pieces only within same occult ilk
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:36:31 +0000 (11:36 +0000)]
hidden: New occultable arrangeents
Honour occilk, not occultable. Abolish the latter.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 12:24:26 +0000 (12:24 +0000)]
hidden, etc.: pass ioccults and ipc everywhere
Big internal API changes.
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:19:45 +0000 (11:19 +0000)]
occult ilks: find piece ilk and record it - BREAKING
This brakes savefiles because we need to put something different in
IPieces. We can't sensibly mix a Box<dyn PieceTrait> with anything
else.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:28:40 +0000 (11:28 +0000)]
occult ilks: Fix dispose (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:23:13 +0000 (11:23 +0000)]
occult ilks: Wrap in some structures
This will help with future-proofing savefiles.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:15:36 +0000 (11:15 +0000)]
occult ilks: change return value from PieceSpec::load
Nothing sets this or uses it, yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:14:14 +0000 (11:14 +0000)]
cmdlistener: Rename a variable `gpc` (was `pc`)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 11:12:32 +0000 (11:12 +0000)]
otterlib: Rename a variable `p` (was `pc`)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 10:34:46 +0000 (10:34 +0000)]
occult ilks: Change type of IPiece, no functional change yet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 10:29:06 +0000 (10:29 +0000)]
occult ilks: Save and restore
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 10:19:52 +0000 (10:19 +0000)]
hidden: Refer to occultilks in prelude
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 10:19:17 +0000 (10:19 +0000)]
hidden: Rename occultilks module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 10:18:25 +0000 (10:18 +0000)]
hidden: A todo wrt ilks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 11 Mar 2021 10:06:26 +0000 (10:06 +0000)]
hidden: Provide OccultIlks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Mar 2021 23:05:41 +0000 (23:05 +0000)]
hidden: Implement piece_pri properly (except for displacement)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Mar 2021 22:45:28 +0000 (22:45 +0000)]
hidden: Make an OccultationKindGeneral generic over displacement
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 9 Mar 2021 00:55:59 +0000 (00:55 +0000)]
hidden: adjust formatting (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 10 Mar 2021 21:54:08 +0000 (21:54 +0000)]
hidden: Implement PriOcculted properly
* Provide the three values we will need
* Do all piece rendering using this information
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 22:44:34 +0000 (22:44 +0000)]
hidden: do not occult pieces which aren't can_occultable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 15:32:52 +0000 (15:32 +0000)]
Introduce OccultedPieceTrait as a thing that a piece can do
Nothing impls or calls this yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 23:31:38 +0000 (23:31 +0000)]
Use dyn_upcast for OutlineTrait (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 23:57:06 +0000 (23:57 +0000)]
PieceTrait: make it 'static
We don't want any non-'static and this is needed for dyn_upcast which
we want.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 23:46:09 +0000 (23:46 +0000)]
hidden: use trace_dbg in one place
To check it works, mostly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 23:45:37 +0000 (23:45 +0000)]
utils: provide trace_dbg
No callers yet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:54:36 +0000 (20:54 +0000)]
Depend on cast_trait_object
hidden is going to want this for Outline etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:51:35 +0000 (20:51 +0000)]
extension traits: Use extend::ext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:30:19 +0000 (20:30 +0000)]
extension traits: Use extend::ext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:22:28 +0000 (20:22 +0000)]
extension traits: Use extend::ext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:15:44 +0000 (20:15 +0000)]
extension traits: Use extend::ext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:12:52 +0000 (20:12 +0000)]
extension traits: Use extend::ext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 20:10:24 +0000 (20:10 +0000)]
extension traits: Use extend::ext
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:17:00 +0000 (18:17 +0000)]
cargo: add dependency on "Extend" for extension traits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:12:59 +0000 (18:12 +0000)]
cargo: update num
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:11:38 +0000 (18:11 +0000)]
cargo: update nix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 19:15:06 +0000 (19:15 +0000)]
cargo: Pin wasm-bindgen which has a regression
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:49:14 +0000 (18:49 +0000)]
cargo: update dtoa
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:48:53 +0000 (18:48 +0000)]
cargo: update uds and libc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:47:59 +0000 (18:47 +0000)]
cargo: update a version of generic_array
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:47:18 +0000 (18:47 +0000)]
cargo: update a number of miscellaneous packages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:45:47 +0000 (18:45 +0000)]
cargo: update serde*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:44:41 +0000 (18:44 +0000)]
cargo: update darling*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:43:49 +0000 (18:43 +0000)]
cargo: update futures*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:41:30 +0000 (18:41 +0000)]
cargo: update cookie
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:38:31 +0000 (18:38 +0000)]
cargo: update tracing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:38:03 +0000 (18:38 +0000)]
cargo: update tendril
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:37:45 +0000 (18:37 +0000)]
cargo: update mio
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:36:37 +0000 (18:36 +0000)]
cargo: update async-trait
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 8 Mar 2021 18:34:51 +0000 (18:34 +0000)]
cargo: update syn
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 22:24:22 +0000 (22:24 +0000)]
utils: matches_doesnot syntax update
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 22:16:24 +0000 (22:16 +0000)]
utils: provide matches_doesnot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 11:03:27 +0000 (11:03 +0000)]
hidden: fix and "occluded" in a comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 11:00:43 +0000 (11:00 +0000)]
hidden: implement permutation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:59:11 +0000 (10:59 +0000)]
hidden: add some dbgc!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:57:25 +0000 (10:57 +0000)]
hidden: fix OccultationKind::at_all_visible (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:57:04 +0000 (10:57 +0000)]
hidden hand: drop an implemented xxx
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:56:35 +0000 (10:56 +0000)]
hidden: add some dbgc!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:54:40 +0000 (10:54 +0000)]
hidden hand: Fix/reorganise region computation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:52:18 +0000 (10:52 +0000)]
apitest: compactify a debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 7 Mar 2021 10:49:39 +0000 (10:49 +0000)]
cargo: Explicitly set fatures for reqwest
Cargo feature unifications means that if you build with --workspace it
works despite the lack of this. Pfah.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 5 Mar 2021 19:37:26 +0000 (19:37 +0000)]
utils: Fix Area (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 5 Mar 2021 19:37:14 +0000 (19:37 +0000)]
utils: Fix OldNew (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 5 Mar 2021 17:46:54 +0000 (17:46 +0000)]
dbgc!: Fix!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 4 Mar 2021 21:02:05 +0000 (21:02 +0000)]
provide dbgc!, version of dbg! which prints compactly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 3 Mar 2021 00:12:57 +0000 (00:12 +0000)]
hidden: pass &mut GPlayers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 23:46:11 +0000 (23:46 +0000)]
hidden: get rid of a drain
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 23:14:53 +0000 (23:14 +0000)]
hidden permute: move to vpid
It's going to need to guddle
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 22:48:23 +0000 (22:48 +0000)]
hidden recompute: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 22:37:38 +0000 (22:37 +0000)]
hidden: a wip comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 23:01:39 +0000 (23:01 +0000)]
hidden recompute: Use with pattern rather than Drop
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 19:18:20 +0000 (19:18 +0000)]
hidden notch: tests of the data structure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 2 Mar 2021 18:44:37 +0000 (18:44 +0000)]
hidden notch: some refactoring, variable names, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Mar 2021 19:13:51 +0000 (19:13 +0000)]
hidden notch: New Notch tracking
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 1 Mar 2021 18:24:56 +0000 (18:24 +0000)]
Revert "hidden: Change type of Occultation::pieces to contain Index"
We are going to do this differently.
This reverts commit
97d536cba692b1f0030262c168a4ec875ac1b749.
Ian Jackson [Mon, 1 Mar 2021 18:22:45 +0000 (18:22 +0000)]
hidden vpid: Make into a module
This will hide our new id management algorithm
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:47:19 +0000 (21:47 +0000)]
Prevent [un]pinning of occulting/occulted pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:45:56 +0000 (21:45 +0000)]
Use type alias OE a bit more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:42:08 +0000 (21:42 +0000)]
Implement piece_at_all_occulted and provide .._involved_in_..
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:39:20 +0000 (21:39 +0000)]
Fix confusion, "occluded" should read "occulted"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:29:36 +0000 (21:29 +0000)]
hidden: Do not occult pinned pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:29:24 +0000 (21:29 +0000)]
hidden: Clarify using some whitespace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 21:24:18 +0000 (21:24 +0000)]
hidden: Plumbing for recomputation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 20:49:44 +0000 (20:49 +0000)]
utils: provide IntoIterator for OldNew
I wanted this for a now-abandoned approach to something, but let us
keep it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 20:30:10 +0000 (20:30 +0000)]
hidden: Change type of Occultation::pieces to contain Index
Currently this is always zero.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 17:04:07 +0000 (17:04 +0000)]
updates: Use idmap.fwd
If there is no fwd id then don't send an update. Bit odd, but whatever.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:24:32 +0000 (16:24 +0000)]
Pass PieceTrait to piece_pri
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:23:44 +0000 (16:23 +0000)]
Fix some more variable names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:19:50 +0000 (16:19 +0000)]
Fix some more variable names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:13:04 +0000 (16:13 +0000)]
Fix some more variable names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:10:01 +0000 (16:10 +0000)]
Rename pto back to p
I'm finding the new name ugly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:07:11 +0000 (16:07 +0000)]
Fix some more variable names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 16:03:00 +0000 (16:03 +0000)]
hidden: Make it possible to completely hide a piece, properly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 15:58:32 +0000 (15:58 +0000)]
hidden: Make it possible to completely hide a piece
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 15:31:03 +0000 (15:31 +0000)]
otterlib: Use explicit calls to GPiece::dummy()
This makes it clearer where we are cutting this corner.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 13:38:47 +0000 (13:38 +0000)]
Some variable name corrections
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 28 Feb 2021 13:32:15 +0000 (13:32 +0000)]
PieceRenderInstructions: Rename vpid and provide new_visible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log