new images for platinum feel

This commit is contained in:
Jorj Bauer 2022-01-16 15:51:24 -05:00
parent 31d200ac68
commit a3db2e5c20
4 changed files with 64845 additions and 66396 deletions

View File

@ -110,34 +110,23 @@ void AppleUI::blit()
if (redrawDriveLatches) { if (redrawDriveLatches) {
redrawDriveLatches = false; redrawDriveLatches = false;
uint16_t xoff = 140;
uint16_t yoff = 418;
uint16_t xsize;
uint8_t ysize;
const uint8_t *img; const uint8_t *img;
xsize = LATCH_WIDTH; img = driveInserted[0] ? drive1LatchOpen : drive1LatchClosed;
ysize = LATCH_HEIGHT; g_display->drawImageOfSizeAt(img, LATCH_WIDTH, LATCH_HEIGHT, LATCH_X, LATCH1_Y);
img = driveInserted[0] ? driveLatchOpen : driveLatch;
g_display->drawImageOfSizeAt(img, xsize, ysize, xoff, yoff);
xoff += LATCH_XSPACING; img = driveInserted[1] ? drive2LatchOpen : drive2LatchClosed;
img = driveInserted[1] ? driveLatchOpen : driveLatch; g_display->drawImageOfSizeAt(img, LATCH_WIDTH, LATCH_HEIGHT, LATCH_X, LATCH2_Y);
g_display->drawImageOfSizeAt(img, xsize, ysize, xoff, yoff);
} }
if (redrawDriveActivity) { if (redrawDriveActivity) {
redrawDriveActivity = false; redrawDriveActivity = false;
// FIXME assumes the 2 drives are next to each other (same yoff)
uint16_t xoff = LED0_XPOS;
uint8_t yoff = LED0_YPOS;
for (int y=0; y<LED_HEIGHT; y++) { for (int y=0; y<LED_HEIGHT; y++) {
for (int x=0; x<LED_WIDTH; x++) { for (int x=0; x<LED_WIDTH; x++) {
g_display->drawUIPixel(x + xoff, y + yoff, driveActivity[0] ? 0xFA00 : 0x0000); g_display->drawUIPixel(x + LED_X, y + LED1_Y, driveActivity[0] ? 0xFA00 : 0x0000);
g_display->drawUIPixel(x + xoff + (LED1_XPOS-LED0_XPOS), y + yoff, driveActivity[1] ? 0xFA00 : 0x0000); g_display->drawUIPixel(x + LED_X, y + LED2_Y, driveActivity[1] ? 0xFA00 : 0x0000);
} }
} }
} }

131182
images.cpp

File diff suppressed because it is too large Load Diff

View File

@ -6,26 +6,36 @@
#define DBITMAP_HEIGHT 480 #define DBITMAP_HEIGHT 480
#define DBITMAP_WIDTH 800 #define DBITMAP_WIDTH 800
#define LATCH_HEIGHT (20*2) #define LATCH_HEIGHT 11
#define LATCH_WIDTH (43*2) #define LATCH_WIDTH 62
#define LATCH_XSPACING 340 #define LATCH_X 4
#define LATCH1_Y 67
#define LATCH2_Y 116
#define SCREENINSET_X (121)
#define SCREENINSET_Y (47)
// Spacing and positioning of elements within the DBITMAP, used by AppleUI // Spacing and positioning of elements within the DBITMAP, used by AppleUI
#define LED0_XPOS 312 #define LED_HEIGHT 9
#define LED0_YPOS 412 #define LED_WIDTH 17
#define LED1_XPOS 649 #define LED_X 48
#define LED1_YPOS 412 #define LED1_Y 68
#define LED_HEIGHT 3 #define LED2_Y 117
#define LED_WIDTH 16
// RGB // RGB
extern const uint8_t displayBitmap[]; extern const uint8_t displayBitmap[];
// RGB // RGB
extern const uint8_t driveLatch[]; extern const uint8_t drive1LatchClosed[];
// RGB // RGB
extern const uint8_t driveLatchOpen[]; extern const uint8_t drive1LatchOpen[];
// RGB
extern const uint8_t drive2LatchClosed[];
// RGB
extern const uint8_t drive2LatchOpen[];
// 10 x 11, RGBA // 10 x 11, RGBA
extern const uint8_t appleBitmap[]; extern const uint8_t appleBitmap[];

View File

@ -15,10 +15,6 @@ extern const unsigned char lcase_glyphs[256];
extern const unsigned char mousetext_glyphs[256]; extern const unsigned char mousetext_glyphs[256];
extern const unsigned char interface_glyphs[256]; extern const unsigned char interface_glyphs[256];
// ***
#define SCREENINSET_X (120)
#define SCREENINSET_Y (10)
// RGB map of each of the lowres colors // RGB map of each of the lowres colors
const uint8_t loresPixelColors[16][3] = { { 0, 0, 0 }, // black const uint8_t loresPixelColors[16][3] = { { 0, 0, 0 }, // black
{ 0xAC, 0x12, 0x4C }, // magenta { 0xAC, 0x12, 0x4C }, // magenta