#define RTG_INIT_ERR(a) { printf(a); *data->running = 0; }
-uint8_t busy = 0, rtg_on = 0, rtg_initialized = 0;
+//#define DEBUG_RAYLIB_RTG
+
+#ifdef DEBUG_RAYLIB_RTG
+#define DEBUG printf
+#else
+#define DEBUG(...)
+#endif
+
+uint8_t busy = 0, rtg_on = 0, rtg_initialized = 0, emulator_exiting = 0;
extern uint8_t *rtg_mem;
extern uint32_t framebuffer_addr;
extern uint32_t framebuffer_addr_adj;
dstscale.x = dstscale.y = 0;
dstscale.width = width;
dstscale.height = height;
- scale_x = 1.0f;
- scale_y = 1.0f;
- origin.x = 0.0f;
- origin.y = 0.0f;
- if (dstscale.height * 2 < GetScreenHeight()) {
+ if (dstscale.height * 2 <= GetScreenHeight()) {
if (width == 320) {
if (GetScreenHeight() == 720) {
dstscale.width = 960;
} else if (GetScreenHeight() == 1080) {
dstscale.width = 1440;
dstscale.height = 1080;
+ } else if (GetScreenHeight() == 1200) {
+ dstscale.width = 1600;
+ dstscale.height = 1200;
}
} else {
- while (dstscale.height < GetScreenHeight()) {
+ while (dstscale.height + height <= GetScreenHeight()) {
dstscale.height += height;
dstscale.width += width;
}
}
- scale_x = dstscale.width / (float)width;
- scale_y = dstscale.height / (float)height;
+ } else if (dstscale.width > GetScreenWidth() || dstscale.height > GetScreenHeight()) {
+ if (dstscale.height > GetScreenHeight()) {
+ DEBUG("[H > SH]\n");
+ DEBUG("Adjusted width from %d to", (int)dstscale.width);
+ dstscale.width = dstscale.width * ((float)GetScreenHeight() / (float)height);
+ DEBUG("%d.\n", (int)dstscale.width);
+ DEBUG("Adjusted height from %d to", (int)dstscale.height);
+ dstscale.height = GetScreenHeight();
+ DEBUG("%d.\n", (int)dstscale.height);
+ }
+ if (dstscale.width > GetScreenWidth()) {
+ // First scaling attempt failed, do not double adjust, re-adjust
+ dstscale.width = width;
+ dstscale.height = height;
+ DEBUG("[W > SW]\n");
+ DEBUG("Adjusted height from %d to", (int)dstscale.height);
+ dstscale.height = dstscale.height * ((float)GetScreenWidth() / (float)width);
+ DEBUG("%d.\n", (int)dstscale.height);
+ DEBUG("Adjusted width from %d to", (int)dstscale.width);
+ dstscale.width = GetScreenWidth();
+ DEBUG("%d.\n", (int)dstscale.width);
+ }
}
+ scale_x = dstscale.width / (float)width;
+ scale_y = dstscale.height / (float)height;
+
+ origin.x = (dstscale.width - GetScreenWidth()) * 0.5;
+ origin.y = (dstscale.height - GetScreenHeight()) * 0.5;
+
while (1) {
if (rtg_on) {
BeginDrawing();
reinit = 1;
goto shutdown_raylib;
}
- /*if (!rtg_on) {
+ if (emulator_exiting) {
goto shutdown_raylib;
- }*/
+ }
}
rtg_initialized = 0;
}
}
- printf ("Updated mouse cursor data.\n");
-
while (rtg_on && !updating_screen)
usleep(0);
cursor_image_updated = 1;
mouse_cursor_w = w;
mouse_cursor_h = h;
- if (memcmp(src, old_mouse_data, (w / 8 * h)) != 0) {
- printf("New cursor data.\n");
+ if (memcmp(src, old_mouse_data, (w / 8 * h)) != 0)
new_cursor_data = 1;
- } else {
- printf("No new cursor data.\n");
- }
if (old_mouse_w != w || old_mouse_h != h || new_cursor_data) {
- printf("Set new %dx%d mouse cursor image.\n", mouse_cursor_w, mouse_cursor_h);
old_mouse_w = w;
old_mouse_h = h;
update_mouse_cursor(src);