Commit Graph

2055 Commits

Author SHA1 Message Date
Kartik K. Agaram bc12efc6be remove stale correction code 2023-12-10 10:48:49 -08:00
Kartik K. Agaram 15aef61fd5 greatly simplify overlap detection
Exploits the knowledge that w and h are non-negative.

All it took was a question on the LÖVE Discord, which pointed me at the
technical term of AABB (axis-aligned bounding box) collision detection.
2023-12-10 10:31:45 -08:00
Kartik K. Agaram b2a22736be Merge luaML.love 2023-12-09 10:16:32 -08:00
Kartik K. Agaram ba47098e3a Merge template-live-editor 2023-12-09 10:13:58 -08:00
Kartik K. Agaram 7dfe8000bb Merge text0 2023-12-09 10:07:10 -08:00
Kartik K. Agaram c33b70efd0 Merge text.love 2023-12-09 10:06:37 -08:00
Kartik K. Agaram 67e3a43b52 Merge lines.love 2023-12-09 09:59:09 -08:00
Kartik K. Agaram 961f296131 fix a couple of asserts missed in the recent audit 2023-12-09 09:22:45 -08:00
Kartik K. Agaram 140f5d1c78 Merge luaML.love 2023-12-07 09:14:41 -08:00
Kartik K. Agaram ddd45ea5f9 Merge template-live-editor 2023-12-07 09:11:31 -08:00
Kartik K. Agaram b18b1d99f3 merge bugfix
Here it _is_ a bug that Mode can be nil.
2023-12-07 08:54:35 -08:00
Kartik K. Agaram 265fa397fa merge quasi-bug
This doesn't cause problems in this particular fork, but it's still
muddy that Mode can be nil.
2023-12-07 08:49:52 -08:00
Kartik K. Agaram ffb9add28f Merge luaML.love 2023-12-07 01:28:07 -08:00
Kartik K. Agaram 2f7445fc4d Merge template-live-editor 2023-12-07 01:25:09 -08:00
Kartik K. Agaram 730a8768f6 Merge text0 2023-12-07 01:22:19 -08:00
Kartik K. Agaram c53d6b6a7d Merge text.love 2023-12-07 01:21:18 -08:00
Kartik K. Agaram 17810bf766 Merge lines.love 2023-12-07 01:17:11 -08:00
Kartik K. Agaram 366d806515 copy correct warning message
Not really useful here, but other forks might make use of it.
2023-12-07 01:08:09 -08:00
Kartik K. Agaram c4333b8da5 minor tweaks to manual tests while pushing to all forks 2023-12-07 01:06:19 -08:00
Kartik K. Agaram f3c76eb951 Merge luaML.love 2023-12-07 01:04:10 -08:00
Kartik K. Agaram 3a7edd4dd0 Merge template-live-editor 2023-12-07 00:58:52 -08:00
Kartik K. Agaram e3c8121381 Merge text0 2023-12-07 00:51:29 -08:00
Kartik K. Agaram 23eb55f634 Merge text.love 2023-12-07 00:11:31 -08:00
Kartik K. Agaram 972b198e5f Merge lines.love 2023-12-06 23:34:24 -08:00
Kartik K. Agaram 8c97755480 hide some details within the 'warning' state
Renamed from the 'error' state.

Now we no longer overload Error_message; it's only used for actual
errors that trigger opening the source editor.

I was tempted to hide Skip_rest_of_key_events inside the 'warning' state
as well, but that isn't right. It applies to all Current_app
transitions, not just those in and out of 'warning'.
2023-12-06 22:59:24 -08:00
Kartik K. Agaram 19597e7619 redo version checks yet again
I'm starting to feel better after replacing 1 line with 20 and 2 new
bits of global state. I'm now handling two scenarios more explicitly:

* If I change Current_app within key_press, the corresponding text_input
  and key_release events go to the new app. If it's an editor it might
  insert the key, which is undesirable. Putting such handlers in
  key_release now feels overly clever, particularly since it took me
  forever to realize why I was getting stuck in an infinite loop.

* Both 'run' and 'source' can hit the version check, so we need to be
  able to transition from the 'error' app to either. Which
  necessitates yet another global bit of state: Next_app.
2023-12-06 22:43:28 -08:00
Kartik K. Agaram 01a26cad5f redo version checks
This is still ugly, but hopefully easier to follow.
2023-12-06 20:14:24 -08:00
Kartik K. Agaram fa778f95a1 _yet another_ bugfix to the version check X-(
When I stopped running the version check before the tests I also stopped
initializing Version, which can be used in tests to watch out for font
changes across versions. As a result I started seeing a test failure
with LÖVE v12.

It looks like all manual tests pass now. And we're also printing the
warning about version checks before running tests, which can come in
handy if a new version ever causes test failures. The only thing that
makes me unhappy is the fact that we're calling the version check twice.
And oh, the fact that this part around initialization and version
management is clearly still immature.

I'll capture some desires and fragmentary thought processes around them:

* If there's an error, go to the source editor.

* But oh, don't go to source editor on some unactionable errors, so we
  include a new `Current_app` mode for them:
  * Unsupported version requires an expert. Just muddle through if you
    can or give a warning someone can send me.
  * A failing test might be spurious depending on the platform and font
    rendering scheme. So again just provide a warning someone can send
    me.

  [Source editor can be confusing for errors. Also an editor! But not
  showing the file you asked for!]

* But our framework clears the warning after running tests:
  * If someone is deep in developing a new feature and quits -> restore
    back in the source editor.

  [Perhaps `Current_app` is the wrong place for this third hacky mode,
  since we actually want to continue running. Perhaps it's orthogonal to
  `Current_app`.]

  [Ideally I wouldn't run the tests after the version check. I'd pause,
  wait for a key and then resume tests? "Muddle through" is a pain to
  orchestrate.]

* We store `Current_app` in settings. But we don't really intend to
  persist a `Current_app` of 'error'. Only the main app or 'source'
  editor.

  [Another vote against storing 'error' in `Current_app`.]

* So we need to rerun the version check after running tests to actually
  show the warning.

  [Perhaps I need to separate out the side-effect of setting `Version`
  from the side-effect of changing `Current_app`. But that's not right
  either, because I do still want to raise an error message if the
  version check fails before running tests. Which brings us back to
  wanting to run the tests after raising the version check..]

One good thing: none of the bugs so far have been about silently
ignoring test failures. I thought that might be the case for a bit,
which was unnerving.

I grew similar muddiness in Mu's bootstrap system over time, with
several surrounding modes around the core program that interacted poorly
or at least unsatisfyingly with each other. On one level it just feels
like this outer layer reflects muddy constraints in the real world. But
perhaps there's some skill I still need to learn here..

Why am I even displaying this error if we're going to try to muddle
through anyway? In (vain) hopes that someone will send me that
information. It's not terribly actionable even to me. But it's really
intended for when making changes. If a test fails then, you want to
know.

The code would be cleaner if I just threw an unrecoverable error from
the version check. Historically, the way I arrived at this solution was:
  * I used the default love.errorhandler for a while
  * I added xpcall and error recovery, but now I have situations where I
    would rather fall back on love.errorhandler. How to tell xpcall
    that?
But no, this whole line of thought is wrong. LÖVE has a precedent for
trying to muddle through on an unexpected version. And spurious test
failures don't merit a hard crash. There's some irreducible requirement
here. No point making the code simplistic when the world is complex.

Perhaps I should stop caching Version and just recompute it each time.
It's only used once so far, hardly seems worth the global.

We have two bits of irreducible complexity here:
  * If tests fail it might be a real failure, or it might not.
  * Even if it's an unexpected version, everything might be fine.
And the major remaining problem happens at the intersection of these two
bits. What if we get an unexpected version with some difference that
causes tests to fail? But this is a hypothetical and not worth thinking
about since I'll update the app fairly quickly in response to new
versions.
2023-12-06 17:34:04 -08:00
Kartik K. Agaram 278b612070 Merge luaML.love 2023-12-03 13:51:28 -08:00
Kartik K. Agaram 9649ffea61 fix a crash
Introduced by commit 0751b38932.
2023-12-03 13:43:06 -08:00
Kartik K. Agaram d7c1fe0594 Merge template-live-editor 2023-12-03 13:34:03 -08:00
Kartik K. Agaram cdbbe56519 Merge text0 2023-12-03 13:21:55 -08:00
Kartik K. Agaram 20d2b3e460 Merge text.love 2023-12-03 13:18:22 -08:00
Kartik K. Agaram 67eb28ef1c Merge lines.love 2023-12-03 13:01:49 -08:00
Kartik K. Agaram f6bc670ef6 yet another bugfix to the version check
We could now get test failures before the version check, which might be
confusing.
2023-12-03 12:30:16 -08:00
Kartik K. Agaram f37b45196a speculatively recommend new LÖVE v11.5 in all forks 2023-12-03 12:12:56 -08:00
Kartik K. Agaram 9993014904 bugfix: version check 2023-12-03 12:11:17 -08:00
Kartik K. Agaram c9b114b72f Merge luaML.love 2023-12-03 11:50:53 -08:00
Kartik K. Agaram d2f9ec29bf Merge template-live-editor 2023-12-03 11:49:05 -08:00
Kartik K. Agaram d58c733a30 Merge text0 2023-12-03 11:43:26 -08:00
Kartik K. Agaram 0ec556deec Merge text.love 2023-12-03 11:41:48 -08:00
Kartik K. Agaram df2cfb820d Merge lines.love 2023-12-03 11:25:16 -08:00
Kartik K. Agaram 0d3db19c85 clearing starty is redundant in mutations
We'll end up calling Text.redraw_all anyway, which will clear starty and
much more besides.

We'll still conservatively continue clearing starty in a few places
where there's a possibility that Text.redraw_all may not be called. This
change is riskier than most.
2023-12-03 10:32:05 -08:00
Kartik K. Agaram 8abd4eec1e Merge luaML.love 2023-12-01 22:38:07 -08:00
Kartik K. Agaram c73a1246cf Merge template-live-editor 2023-12-01 22:32:00 -08:00
Kartik K. Agaram 7bbc10fffb Merge text0 2023-12-01 22:24:42 -08:00
Kartik K. Agaram 5a2581bf71 Merge text.love 2023-12-01 22:24:03 -08:00
Kartik K. Agaram 52ffb40d79 Merge lines.love 2023-12-01 22:17:43 -08:00
Kartik K. Agaram 8399c42707 mouse button state in source editor 2023-12-01 22:07:24 -08:00
Kartik K. Agaram 120f4ccf1b Merge text.love 2023-12-01 22:06:34 -08:00