summaryrefslogtreecommitdiff
path: root/apps/plugins/puzzles/README.rockbox
diff options
context:
space:
mode:
authorFranklin Wei <franklin@rockbox.org>2024-08-11 23:34:57 -0400
committerFranklin Wei <franklin@rockbox.org>2024-08-16 16:31:28 -0400
commitea0e3704a8aacf87f20ba87e3b33bc4b3966c731 (patch)
tree8db0a329800cffd661f6a80767ce2f956eb57ab8 /apps/plugins/puzzles/README.rockbox
parent903e8c5b32285e50907e6525388162bd459cbef8 (diff)
downloadrockbox-ea0e3704a8aacf87f20ba87e3b33bc4b3966c731.tar.gz
rockbox-ea0e3704a8aacf87f20ba87e3b33bc4b3966c731.zip
puzzles: resync with upstream 262f709.
This is the first resync with a fully unmodified upstream repo. This includes a new scanline polygon renderer in the upstream puzzles distribution. This allows us to get rid of the monstrosity of a polygon renderer we had been shipping in rockbox.c. Change-Id: I23628c74bb5ff7a9e7932bf16d68a1c867c49969
Diffstat (limited to 'apps/plugins/puzzles/README.rockbox')
-rw-r--r--apps/plugins/puzzles/README.rockbox26
1 files changed, 7 insertions, 19 deletions
diff --git a/apps/plugins/puzzles/README.rockbox b/apps/plugins/puzzles/README.rockbox
index 117383eacb..c7ecc540a1 100644
--- a/apps/plugins/puzzles/README.rockbox
+++ b/apps/plugins/puzzles/README.rockbox
@@ -4,11 +4,6 @@ Introduction
4This is the readme for the Rockbox port of Simon Tatham's Portable 4This is the readme for the Rockbox port of Simon Tatham's Portable
5Puzzle Collection. 5Puzzle Collection.
6 6
7The upstream version used is subject to change, as it should be
8relatively trivial to update it to a newer version. Simply copying the
9upstream repo's contents into src/ and running genhelp.sh ought to do
10it (watch out for API changes, though!).
11
12Source structure 7Source structure
13================ 8================
14 9
@@ -44,16 +39,8 @@ to Untangle and Palisade). These divergent changes complicated
44maintenance of this port, as merge conflicts often arose when upstream 39maintenance of this port, as merge conflicts often arose when upstream
45changes to these games conflicted with our changes. To remedy this, I 40changes to these games conflicted with our changes. To remedy this, I
46sent most of these patches back upstream in summer 2024, and since 41sent most of these patches back upstream in summer 2024, and since
47then, Simon has merged the majority of them into his tree. 42then, Simon has merged them into his repo. We are now able to run with
48 43a fully unmodified puzzles source tree.
49This leaves us with a very small set of places where our branch of the
50puzzles source diverges from Simon's. That branch lives here:
51
52https://github.com/built1n/puzzles/tree/rockbox-devel
53
54Notably, there are several hacks which work around Rockbox's lack of a
55proper polygon filling algorithm. Eliminating this deficiency would
56enable us to use a totally unmodified upstream source tree.
57 44
58Maintenance 45Maintenance
59=========== 46===========
@@ -62,7 +49,7 @@ Simon's upstream tree sees continued development. The port is
62structured so that integrating new upstream versions is 49structured so that integrating new upstream versions is
63straightforward: all the upstream sources live in the src/ 50straightforward: all the upstream sources live in the src/
64subdirectory; all of the Rockbox frontend lives in the root 51subdirectory; all of the Rockbox frontend lives in the root
65apps/pluginspuzzles/ directory. 52apps/plugins/puzzles/ directory.
66 53
67The `resync.sh' shell script automates the resyncing process. It 54The `resync.sh' shell script automates the resyncing process. It
68copies the upstream sources (point it to a local copy of the 55copies the upstream sources (point it to a local copy of the
@@ -77,9 +64,7 @@ The LZ4 library and GCC are necessary as well.
77Wishlist 64Wishlist
78======== 65========
79 66
80- Proper polygon filling algorithm. The current algorithm is a hack 67- Nothing!
81 that uses overdrawn triangles. This will enable us to eliminate the
82 last of the Rockbox-specific modifications.
83 68
84Kudos to Simon (duh), and Frank, for telling me about it. 69Kudos to Simon (duh), and Frank, for telling me about it.
85 70
@@ -120,3 +105,6 @@ Implement user preferences menu. Introduced "Mosaic".
120 105
121August 2024: Resync to ee5e327 (branched from Simon's 106August 2024: Resync to ee5e327 (branched from Simon's
1221c1899e). Changes default Map stipple size to "Small". 1071c1899e). Changes default Map stipple size to "Small".
108
109August 2024: Resync to Simon's 262f709 (unmodified). Uses new scanline
110polygon filling algorithm. Updates drawing API.