From 6e6693db322da2f6a08fbeacbde92f3becab0a88 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 6 Apr 2016 16:08:45 +0200 Subject: [PATCH] marges relatives --- bin/hex | Bin 47496 -> 47080 bytes src/affichage_plateau.c | 90 ++++++++++------------------------------ src/globals.h | 1 - 3 files changed, 23 insertions(+), 68 deletions(-) diff --git a/bin/hex b/bin/hex index 565776aa9aa1fb831fcd7d1175a5eb332f311e2e..2fb79e4226948962dbe9935dc6cc6e2ca613f416 100644 GIT binary patch delta 15113 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 j+S-%r, SDL_MapRGB (p->window->format, 100, 100, 100), SDL_MapRGB (p->window->format, 50, 50, 50), &(p->l)); for (int i = 0; i < NBSIDE; ++i) { - int dx = p->marge_hori + i * (p->l + 1);//(2 * rayon * cos(PI/6)); + int dx = p->marge_hori + i * (p->l + 1); for (int j = 0; j < NBSIDE; ++j) { SDL_Rect position = {dx + j * (p->l + 1) / 2, p->marge_vert + j * (1.5 * p->r)}; @@ -111,6 +109,26 @@ void Quadrille (plateau_t p) SDL_Flip (p->window); } +void define_rayon (plateau_t p) +{ + int decal_droite = 40; + p->marge_vert = p->window->h / 6; + int width = p->window->w - 2 * decal_droite; + int height = p->window->h - 2 * p->marge_vert; + int r1 = (height - (NBSIDE - 1)) / (.5 + NBSIDE * 1.5); + int r2 = width / ((3 * NBSIDE - 1) * cos (PI/6)); + if (r1 < r2) + { + p->r = r1 - r1%2; + p->marge_hori = p->window->w - decal_droite - 1.5 * (NBSIDE) * 2 * p->r * cos(PI/6); + } + else + { + p->r = r2 - r2%2; + p->marge_hori = p->window->w - decal_droite - 1.5 * (NBSIDE) * 2 * p->r * cos(PI/6); + } +} + /*Externes*/ void Affiche_hexagon (plateau_t p, int x, int y, int state) @@ -140,32 +158,14 @@ plateau_t init_plateau (SDL_Surface* window) { plateau_t p = malloc (sizeof (struct s_plateau)); p->window = window; - p->marge_hori = 40; - p->marge_vert = 40; - int width = window->w - 2 * p->marge_hori; - int height = window->h - 2 * p->marge_vert; - int r1 = (height - (NBSIDE - 1)) / (.5 + NBSIDE * 1.5); - int r2 = width / ((3 * NBSIDE - 1) * cos (PI/6)); - if (r1 < r2) - p->r = r1 - r1%2; - else - p->r = r2 - r2%2; + define_rayon(p); Quadrille (p); return p; } plateau_t actu_plateau (plateau_t p) { - p->marge_hori = 40; - p->marge_vert = 40; - int width = p->window->w - 2 * p->marge_hori; - int height = p->window->h - 2 * p->marge_vert; - int r1 = (height - (NBSIDE - 1)) / (.5 + NBSIDE * 1.5); - int r2 = width / ((3 * NBSIDE - 1) * cos (PI/6)); - if (r1 < r2) - p->r = r1 - r1%2; - else - p->r = r2 - r2%2; + define_rayon(p); Quadrille (p); return p; } @@ -174,47 +174,3 @@ void free_plateau (plateau_t p) { free (p); } - - -/*int main (int argc, char* argv[]) -{ - if (SDL_Init (SDL_INIT_VIDEO)) - fprintf (stderr, "Erreur d'inistialisation SDL : %s\n", SDL_GetError()); - - SDL_DisplayFormat() dm; - if (SDL_GetDisplayMode(0, &dm) != 0) { - SDL_Log("SDL_GetDisplayMode failed: %s", SDL_GetError()); - return 1; - } - SDL_Surface* window = SDL_SetVideoMode (DWIDTH, DHEIGHT, BPP, SDL_HWSURFACE | SDL_RESIZABLE); - SDL_FillRect (window, NULL, SDL_MapRGB(window->format, 0, 0, 0)); - SDL_Flip (window); - SDL_Color c = {100, 100, 100}; - Affiche_plateau (window, c); - - bool end = false; - - while (!end) - { - SDL_Event event; - SDL_WaitEvent (&event); - switch (event.type) - { - case SDL_VIDEORESIZE: - if (event.resize.w >= DWIDTH && event.resize.h >= DHEIGHT ) - { - window = SDL_SetVideoMode (event.resize.w, event.resize.h, BPP, SDL_HWSURFACE | SDL_RESIZABLE); - Affiche_plateau (window, c); - } - else // force la fenetre a minimum Default Size : marche moyen - window = SDL_SetVideoMode (DWIDTH, DHEIGHT, BPP, SDL_HWSURFACE | SDL_RESIZABLE); - break; - case SDL_QUIT: - end = true; - break; - } - } - SDL_FreeSurface (window); - SDL_Quit (); - return 0; -}*/ diff --git a/src/globals.h b/src/globals.h index c6f3485..8a89f05 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,7 +1,6 @@ #ifndef _GLOBALS_H_ #define _GLOBALS_H_ -//#define BPP 32 #define DWIDTH 800 #define DHEIGHT 600 #define NBSIDE 11