src/core.c

changeset 3
1efd6da2ad53
parent 2
bb2bfff31f1d
child 6
302971e8599b
     1.1 --- a/src/core.c	Mon Oct 30 17:59:37 2023 +0100
     1.2 +++ b/src/core.c	Mon Oct 30 18:09:27 2023 +0100
     1.3 @@ -142,8 +142,8 @@
     1.4      CxIterator iter = cxListIterator(asc_context.windows);
     1.5      cx_foreach(AscWindow*, w, iter) {
     1.6          if (w->id == id) {
     1.7 -            w->width = width;
     1.8 -            w->height = height;
     1.9 +            w->dimensions.width = width;
    1.10 +            w->dimensions.height = height;
    1.11              return;
    1.12          }
    1.13      }
    1.14 @@ -186,8 +186,8 @@
    1.15  void asc_window_settings_init_defaults(AscWindowSettings* settings) {
    1.16      settings->depth_size = 24;
    1.17      settings->vsync = 1;
    1.18 -    settings->width = 800;
    1.19 -    settings->height = 600;
    1.20 +    settings->dimensions.width = 800;
    1.21 +    settings->dimensions.height = 600;
    1.22      settings->fullscreen = 0;
    1.23      settings->gl_major_version = 3;
    1.24      settings->gl_minor_version = 3;
    1.25 @@ -202,8 +202,8 @@
    1.26              settings->title,
    1.27              SDL_WINDOWPOS_CENTERED,
    1.28              SDL_WINDOWPOS_CENTERED,
    1.29 -            settings->width,
    1.30 -            settings->height,
    1.31 +            settings->dimensions.width,
    1.32 +            settings->dimensions.height,
    1.33              flags
    1.34      );
    1.35      if (window->window == NULL) {
    1.36 @@ -212,7 +212,10 @@
    1.37      }
    1.38  
    1.39      window->id = SDL_GetWindowID(window->window);
    1.40 -    SDL_GetWindowSize(window->window, &window->width, &window->height);
    1.41 +    SDL_GetWindowSize(window->window,
    1.42 +            &window->dimensions.width,
    1.43 +            &window->dimensions.height
    1.44 +    );
    1.45  
    1.46      SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
    1.47      SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, settings->gl_major_version);
    1.48 @@ -280,7 +283,7 @@
    1.49  void asc_window_sync(AscWindow const* window) {
    1.50      SDL_GL_MakeCurrent(window->window, window->glctx);
    1.51      SDL_GL_SwapWindow(window->window);
    1.52 -    glViewport(0, 0, window->width, window->height);
    1.53 +    glViewport(0, 0, window->dimensions.width, window->dimensions.height);
    1.54      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
    1.55      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    1.56  }

mercurial