diff options
| author | Dan Halbert <halbert@halwitz.org> | 2017-11-21 17:19:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 17:19:02 -0500 |
| commit | 26862f8a52b321f28d7e4940969685323d6d7854 (patch) | |
| tree | 979f81d0487047fcf5aeb14effe1d86ec745a370 | |
| parent | 27d5f27831abfa4df928423ccf75baf2dd0ff6a7 (diff) | |
| parent | 1276ce59c33338e9dee604068092af067c25e5f2 (diff) | |
Merge pull request #453 from pewpew-game/stage
Fix display orientation for _stage module
| -rw-r--r-- | shared-module/_stage/Layer.c | 34 | ||||
| -rw-r--r-- | shared-module/_stage/Text.c | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/shared-module/_stage/Layer.c b/shared-module/_stage/Layer.c index 3315ac69e..4c9c46d7c 100644 --- a/shared-module/_stage/Layer.c +++ b/shared-module/_stage/Layer.c @@ -47,8 +47,8 @@ uint16_t get_layer_pixel(layer_obj_t *layer, int16_t x, uint16_t y) { uint8_t tx = x >> 4; uint8_t ty = y >> 4; - frame = layer->map[(tx * layer->width + ty) >> 1]; - if (ty & 0x01) { + frame = layer->map[(ty * layer->width + tx) >> 1]; + if (tx & 0x01) { frame &= 0x0f; } else { frame >>= 4; @@ -60,41 +60,41 @@ uint16_t get_layer_pixel(layer_obj_t *layer, int16_t x, uint16_t y) { y &= 0x0f; // Rotate the image. - uint8_t tx = x; // Temporary variable for swapping. + uint8_t ty = y; // Temporary variable for swapping. switch (layer->rotation) { case 1: // 90 degrees clockwise - x = 15 - y; - y = tx; + y = 15 - x; + x = ty; break; case 2: // 180 degrees - x = 15 - tx; - y = 15 - y; + y = 15 - ty; + x = 15 - x; break; case 3: // 90 degrees counter-clockwise - x = y; - y = 15 - tx; + y = x; + x = 15 - ty; break; case 4: // 0 degrees, mirrored - y = 15 - y; + x = 15 - x; break; case 5: // 90 degrees clockwise, mirrored - x = y; - y = tx; + y = x; + x = ty; break; case 6: // 180 degrees, mirrored - x = 15 - tx; + y = 15 - ty; break; case 7: // 90 degrees counter-clockwise, mirrored - x = 15 - y; - y = 15 - tx; + y = 15 - x; + x = 15 - ty; break; default: // 0 degrees break; } // Get the value of the pixel. - uint8_t pixel = layer->graphic[(frame << 7) + (x << 3) + (y >> 1)]; - if (y & 0x01) { + uint8_t pixel = layer->graphic[(frame << 7) + (y << 3) + (x >> 1)]; + if (x & 0x01) { pixel &= 0x0f; } else { pixel >>= 4; diff --git a/shared-module/_stage/Text.c b/shared-module/_stage/Text.c index 6c451bf38..307f9bbfa 100644 --- a/shared-module/_stage/Text.c +++ b/shared-module/_stage/Text.c @@ -59,8 +59,8 @@ uint16_t get_text_pixel(text_obj_t *text, int16_t x, uint16_t y) { y &= 0x07; // Get the value of the pixel. - uint8_t pixel = text->font[(c << 4) + (x << 1) + (y >> 2)]; - pixel = ((pixel >> ((y & 0x03) << 1)) & 0x03) + color_offset; + uint8_t pixel = text->font[(c << 4) + (y << 1) + (x >> 2)]; + pixel = ((pixel >> ((x & 0x03) << 1)) & 0x03) + color_offset; // Convert to 16-bit color using the palette. return text->palette[pixel << 1] | text->palette[(pixel << 1) + 1] << 8; |