chiark / gitweb /
Ian Jackson [Thu, 25 Mar 2021 11:02:48 +0000 (11:02 +0000)]
wasm: Provide RegionList
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:16:00 +0000 (01:16 +0000)]
serde_json: Move dependency to base, so it's common
wasm is about to want it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 01:13:09 +0000 (01:13 +0000)]
geometry: Relax Ord to PartialOrd
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:37:51 +0000 (00:37 +0000)]
wasm: Sections
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:36:02 +0000 (00:36 +0000)]
provide otter_base::Region
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:59:34 +0000 (23:59 +0000)]
move geometry to base
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 25 Mar 2021 00:00:54 +0000 (00:00 +0000)]
base: Introduce a prelude module here
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:57:08 +0000 (23:57 +0000)]
geometry: Move to new module
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 23:40:07 +0000 (23:40 +0000)]
deck: When Enabled, stack neatly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 20:30:29 +0000 (20:30 +0000)]
deck: Do update count
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 20:29:51 +0000 (20:29 +0000)]
Provide for occultation_notify_hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:56:16 +0000 (19:56 +0000)]
updates: Allow ToRecompute to return UnpreparedUpdates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:31:18 +0000 (19:31 +0000)]
updates: Provide PrepareUpdatesBuffer::spontaneous_image
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:25:52 +0000 (19:25 +0000)]
deck count: Rename ToPermute
We are going to use this to plant our hook
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:15:06 +0000 (19:15 +0000)]
hidden: Provide no-op consistency_check in not(debug_assertions)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 19:09:39 +0000 (19:09 +0000)]
Makefile: Provide more check targets
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:45:34 +0000 (18:45 +0000)]
deck: Provide counting mode for play pile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:40:51 +0000 (18:40 +0000)]
hidden: Provide active_views, more useful
This is not dangerous because we only give out non-mut reference.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:31:24 +0000 (18:31 +0000)]
deck: Refactor, ready for counting instead, make things fallible
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:24:40 +0000 (18:24 +0000)]
deck: Refactor, ready for counting instead, fix current_face
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:18:25 +0000 (18:18 +0000)]
mao: Add labels to decks
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 18:18:47 +0000 (18:18 +0000)]
deck: Add label facility, giving piece count when enabled
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:40:36 +0000 (17:40 +0000)]
hidden: Provide total ppiece count
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:37:55 +0000 (17:37 +0000)]
deck: Refactor, ready for counting instead
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:07:31 +0000 (17:07 +0000)]
deck: Refactor State
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:02:26 +0000 (17:02 +0000)]
deck: plumb goccults through to enabled
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 16:51:37 +0000 (16:51 +0000)]
hidden: Provide active_nondefault_views
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 17:00:40 +0000 (17:00 +0000)]
plumb goccults through to describe_html
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 16:00:28 +0000 (16:00 +0000)]
mao: Use outside labels
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:58:56 +0000 (15:58 +0000)]
labels: Support on outside too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:50:38 +0000 (15:50 +0000)]
labels: wip generalisation - break out method
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:39:44 +0000 (15:39 +0000)]
labels: wip generalisation - rename
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:36:35 +0000 (15:36 +0000)]
mao: Use the chequered edged ones for mao
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 15:36:18 +0000 (15:36 +0000)]
cards: add another back
The stripy ones are really awful when they overlap.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 13:37:07 +0000 (13:37 +0000)]
hidden: New displacement algorithm, improved
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 13:23:34 +0000 (13:23 +0000)]
hidden: New displacement algorithm
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:52:47 +0000 (12:52 +0000)]
hidden: Make fallible and fallback
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:52:29 +0000 (12:52 +0000)]
Pos, Area: Provide Mean and middle for T=i32
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:38:06 +0000 (12:38 +0000)]
Pos, Area: Provide Mean and middle
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:29:39 +0000 (12:29 +0000)]
hidden: Rename a local variable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:29:03 +0000 (12:29 +0000)]
hidden: Track ppiece_use_size
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:20:02 +0000 (12:20 +0000)]
hidden: Provide ipc throughout
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:15:40 +0000 (12:15 +0000)]
hidden: Rewrap arguments less madly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:11:18 +0000 (12:11 +0000)]
vpid: Provide is_empty
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:10:26 +0000 (12:10 +0000)]
vpid: Track how many pieces are in an occultation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 12:01:16 +0000 (12:01 +0000)]
hidden recalc actually do: Provide occ not just notches from closure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:45:44 +0000 (11:45 +0000)]
hidden placement: Refactor to make a place to put things
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:33:09 +0000 (11:33 +0000)]
mao: Move badgers to bottom of initial deck layout
This is prettier.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 11:32:24 +0000 (11:32 +0000)]
mao: Change badger composition
Now 3 badgers per deck, as is common.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:30:00 +0000 (02:30 +0000)]
mao: Add another badger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:20:33 +0000 (02:20 +0000)]
library: Add another badger
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:15:51 +0000 (02:15 +0000)]
mao: Add some jokers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:10:13 +0000 (02:10 +0000)]
cards: Add jokers by David Bellot
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:08:09 +0000 (02:08 +0000)]
wikimedia: Licence PD-author|* is fine
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 24 Mar 2021 02:07:36 +0000 (02:07 +0000)]
media-scraper: Tolerate * at the end of "licences" entries
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:42:24 +0000 (23:42 +0000)]
mao: Add text positions explicitly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:42:17 +0000 (23:42 +0000)]
hand: text, fix position
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:37:25 +0000 (23:37 +0000)]
hand: text seems to work in tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 23:12:39 +0000 (23:12 +0000)]
hand: wip text
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:53:01 +0000 (22:53 +0000)]
hand: Move owned to where we can reuse it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:48:52 +0000 (22:48 +0000)]
hidden: recalculate_occultation_general: tidy argument order
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:45:11 +0000 (22:45 +0000)]
hidden: recalculate_occultation_general: tidy argument formatting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:38:59 +0000 (22:38 +0000)]
hidden: Abolish now-unused log_visible
This is only used as part of log_vanilla. Don't pass it separately.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:23:43 +0000 (19:23 +0000)]
hidden: When one of the occultations is Visible, show it
We don't defer to the caller's log_visible here. (That is actually
misnamed.) The caller may have generated that from the old
occultation state.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 23 Mar 2021 22:31:22 +0000 (22:31 +0000)]
hidden: Show sensible messages on occultation
Do not assume the most occulted is not visible. It might not be!
The previous code was all wrong.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:13:34 +0000 (19:13 +0000)]
mao: Adjust hand positions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:06:42 +0000 (19:06 +0000)]
mao: Fix brown hand y to be where orange is
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:06:20 +0000 (19:06 +0000)]
mao: Make hands smaller
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:03:48 +0000 (19:03 +0000)]
mao: Play with a double deck for now for perf reasons
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 19:00:20 +0000 (19:00 +0000)]
mao: Provide a whole deck
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:56:11 +0000 (18:56 +0000)]
Area: Fix overlaps
This never worked properly.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:39:52 +0000 (18:39 +0000)]
mao: Tune the game
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:08:39 +0000 (18:08 +0000)]
deck: Fix ui activation sense
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 18:03:51 +0000 (18:03 +0000)]
mao: Provide a pickup deck
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:37:35 +0000 (03:37 +0000)]
hidden: note a bug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:26:52 +0000 (03:26 +0000)]
Tidy up, remove some warning suppressions
Ian Jackson [Mon, 22 Mar 2021 03:25:41 +0000 (03:25 +0000)]
deck: Implement ui_operation
This is most of the actual functionality
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:17:52 +0000 (03:17 +0000)]
Rectangle: Break out region() from hand.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:10:20 +0000 (03:10 +0000)]
deck: Insist that it must be a rectangle
We need this for the occultation region
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 03:03:57 +0000 (03:03 +0000)]
deck: Change names from "active" to "enabled"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:47:55 +0000 (02:47 +0000)]
deck: Skeleton
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:47:43 +0000 (02:47 +0000)]
pieces: Fix a style problem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:37:34 +0000 (02:37 +0000)]
Hand: Make colour be ColourSpec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:26:21 +0000 (02:26 +0000)]
cards: Make them be occultable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:25:16 +0000 (02:25 +0000)]
mao: Get rid of the silly two-backed card
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:18:50 +0000 (02:18 +0000)]
mao: Add some hands
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:16:33 +0000 (02:16 +0000)]
shapelib: Support occultation by back
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:16:03 +0000 (02:16 +0000)]
mao: Rename the file to match convention
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 02:14:29 +0000 (02:14 +0000)]
Make PieceTrait load occult return an Arc for occult
That will save cloning, in case it's expensive.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:59:23 +0000 (01:59 +0000)]
shapelib refactoring: transpose with the Arc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:52:08 +0000 (01:52 +0000)]
shapelib refactoring: Make OccData an enum
But we want to transpose with the Arc
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:50:24 +0000 (01:50 +0000)]
shapelib refactoring: Do occult calculation later
It is going to want to look at back
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:45:18 +0000 (01:45 +0000)]
shapelib refactoring: Make back an Arc, so we can hand out clones
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:44:50 +0000 (01:44 +0000)]
traits: Sprinkle another Sync
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:35:37 +0000 (01:35 +0000)]
shapelib: Show things better when they are occulted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:30:17 +0000 (01:30 +0000)]
cards: Give them backs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 21 Mar 2021 23:56:21 +0000 (23:56 +0000)]
shapelib: Honour "back" parameter for card backs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:25:23 +0000 (01:25 +0000)]
shapelib refactoring: Pass vpid to svg_face
We're going to need this when this starts to be able to call other
implementors of OccultedPieceTrait.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 01:08:58 +0000 (01:08 +0000)]
shapelib: Style: Remove some spurious spaces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 22 Mar 2021 00:57:01 +0000 (00:57 +0000)]
shapelib: Implement load_occult for ItemSpec
Nothing calls this yet, but we will soon, ourselves.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log