6502/erc-c
1
0
Fork 0
mirror of https://github.com/pevans/erc-c.git synced 2024-12-21 08:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Add ability to set logical size of window at any time

Browse Source 
We also removed the scale field, as the screen does not expect to manage
its own logical coordinates in SDL.

Additionally, we added an xcoords and ycoords function to the screen
externs so that you don't have to "know" that screen has those as
fields.
This commit is contained in:
Peter Evans 2017-12-20 16:44:24 -06:00
parent f31fcd9c37
commit b1c146c62d
3 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/vm_screen.h
View File

@ -22,11 +22,12 @@ typedef struct {
int xcoords;
int ycoords;
int scale;
} vm_screen;
extern int vm_screen_add_window(vm_screen *);
extern int vm_screen_add_window(vm_screen *, int, int);
extern void vm_screen_set_logical_coords(vm_screen *, int, int);
extern int vm_screen_xcoords(vm_screen *);
extern int vm_screen_ycoords(vm_screen *);
extern int vm_screen_init();
extern void vm_screen_finish();
extern void vm_screen_refresh(vm_screen *);

4
src/main.c
View File

@ -97,13 +97,13 @@ main(int argc, char **argv)
exit(1);
}
screen = vm_screen_create(320, 240, 2);
screen = vm_screen_create();
if (screen == NULL) {
fprintf(stderr, "Screen creation failed!\n");
exit(1);
}
if (!vm_screen_add_window(screen)) {
if (!vm_screen_add_window(screen, 640, 480)) {
fprintf(stderr, "Window creation failed!\n");
exit(1);
}

52
src/vm_screen.c
View File

@ -33,7 +33,7 @@ vm_screen_finish()
* Return a new screen. We also set the color to black.
*/
vm_screen *
vm_screen_create(int xcoords, int ycoords, int scale)
vm_screen_create()
{
vm_screen *screen;
@ -43,9 +43,8 @@ vm_screen_create(int xcoords, int ycoords, int scale)
exit(1);
}
screen->xcoords = xcoords;
screen->ycoords = ycoords;
screen->scale = scale;
screen->xcoords = 0;
screen->ycoords = 0;
screen->window = NULL;
screen->render = NULL;
@ -57,12 +56,26 @@ vm_screen_create(int xcoords, int ycoords, int scale)
return screen;
}
int
vm_screen_add_window(vm_screen *screen)
void
vm_screen_set_logical_coords(vm_screen *screen, int xcoords, int ycoords)
{
SDL_CreateWindowAndRenderer(screen->xcoords * screen->scale,
screen->ycoords * screen->scale,
0, &screen->window, &screen->render);
screen->xcoords = xcoords;
screen->ycoords = ycoords;
// We allow you to set the x and y coordinates in absence of a
// screen renderer, but it's kind of pointless without one.
if (screen->render) {
SDL_RenderSetLogicalSize(screen->render,
screen->xcoords,
screen->ycoords);
}
}
int
vm_screen_add_window(vm_screen *screen, int width, int height)
{
SDL_CreateWindowAndRenderer(
width, height, 0, &screen->window, &screen->render);
if (screen->window == NULL || screen->render == NULL) {
log_critical("Could not create window: %s", SDL_GetError());
@ -72,9 +85,12 @@ vm_screen_add_window(vm_screen *screen)
// We plan to draw onto a surface that is xcoords x ycoords in area,
// regardless of the actual size of the window.
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
SDL_RenderSetLogicalSize(screen->render,
screen->xcoords,
screen->ycoords);
// We default to a logical coordinate system of exactly the given
// width and height. For emulated systems like the Apple II, this
// will not be correct, and the underlying machine system will rerun
// the set_logical_coords function with different values.
vm_screen_set_logical_coords(screen, width, height);
vm_screen_set_color(screen, 0, 0, 0, 0);
SDL_RenderClear(screen->render);
@ -82,6 +98,18 @@ vm_screen_add_window(vm_screen *screen)
return OK;
}
int
vm_screen_xcoords(vm_screen *screen)
{
return screen->xcoords;
}
int
vm_screen_ycoords(vm_screen *screen)
{
return screen->ycoords;
}
/*
* Free the contents of a screen.
*/