diff options
Diffstat (limited to 'apps/plugins/puzzles/README.rockbox')
-rw-r--r-- | apps/plugins/puzzles/README.rockbox | 26 |
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 | |||
4 | This is the readme for the Rockbox port of Simon Tatham's Portable | 4 | This is the readme for the Rockbox port of Simon Tatham's Portable |
5 | Puzzle Collection. | 5 | Puzzle Collection. |
6 | 6 | ||
7 | The upstream version used is subject to change, as it should be | ||
8 | relatively trivial to update it to a newer version. Simply copying the | ||
9 | upstream repo's contents into src/ and running genhelp.sh ought to do | ||
10 | it (watch out for API changes, though!). | ||
11 | |||
12 | Source structure | 7 | Source structure |
13 | ================ | 8 | ================ |
14 | 9 | ||
@@ -44,16 +39,8 @@ to Untangle and Palisade). These divergent changes complicated | |||
44 | maintenance of this port, as merge conflicts often arose when upstream | 39 | maintenance of this port, as merge conflicts often arose when upstream |
45 | changes to these games conflicted with our changes. To remedy this, I | 40 | changes to these games conflicted with our changes. To remedy this, I |
46 | sent most of these patches back upstream in summer 2024, and since | 41 | sent most of these patches back upstream in summer 2024, and since |
47 | then, Simon has merged the majority of them into his tree. | 42 | then, Simon has merged them into his repo. We are now able to run with |
48 | 43 | a fully unmodified puzzles source tree. | |
49 | This leaves us with a very small set of places where our branch of the | ||
50 | puzzles source diverges from Simon's. That branch lives here: | ||
51 | |||
52 | https://github.com/built1n/puzzles/tree/rockbox-devel | ||
53 | |||
54 | Notably, there are several hacks which work around Rockbox's lack of a | ||
55 | proper polygon filling algorithm. Eliminating this deficiency would | ||
56 | enable us to use a totally unmodified upstream source tree. | ||
57 | 44 | ||
58 | Maintenance | 45 | Maintenance |
59 | =========== | 46 | =========== |
@@ -62,7 +49,7 @@ Simon's upstream tree sees continued development. The port is | |||
62 | structured so that integrating new upstream versions is | 49 | structured so that integrating new upstream versions is |
63 | straightforward: all the upstream sources live in the src/ | 50 | straightforward: all the upstream sources live in the src/ |
64 | subdirectory; all of the Rockbox frontend lives in the root | 51 | subdirectory; all of the Rockbox frontend lives in the root |
65 | apps/pluginspuzzles/ directory. | 52 | apps/plugins/puzzles/ directory. |
66 | 53 | ||
67 | The `resync.sh' shell script automates the resyncing process. It | 54 | The `resync.sh' shell script automates the resyncing process. It |
68 | copies the upstream sources (point it to a local copy of the | 55 | copies the upstream sources (point it to a local copy of the |
@@ -77,9 +64,7 @@ The LZ4 library and GCC are necessary as well. | |||
77 | Wishlist | 64 | Wishlist |
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 | ||
84 | Kudos to Simon (duh), and Frank, for telling me about it. | 69 | Kudos to Simon (duh), and Frank, for telling me about it. |
85 | 70 | ||
@@ -120,3 +105,6 @@ Implement user preferences menu. Introduced "Mosaic". | |||
120 | 105 | ||
121 | August 2024: Resync to ee5e327 (branched from Simon's | 106 | August 2024: Resync to ee5e327 (branched from Simon's |
122 | 1c1899e). Changes default Map stipple size to "Small". | 107 | 1c1899e). Changes default Map stipple size to "Small". |
108 | |||
109 | August 2024: Resync to Simon's 262f709 (unmodified). Uses new scanline | ||
110 | polygon filling algorithm. Updates drawing API. | ||