added fanciest map control diagram

This commit is contained in:
Alexandre 2024-12-20 22:31:49 +01:00
parent 689266883e
commit 9743ad71c4
15 changed files with 385 additions and 33 deletions

6
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,6 @@
{
"files.associations": {
"sdl.h": "c",
"time.h": "c"
}
}

1
C_exec.sh Normal file
View File

@ -0,0 +1 @@
gcc -Wall graphing.c -lm -lSDL2 -lSDL2_image -o graphs

BIN
again

Binary file not shown.

BIN
again.cmi

Binary file not shown.

BIN
again.cmx

Binary file not shown.

View File

@ -11,7 +11,7 @@ TODO :
Random.self_init () ;; Random.self_init () ;;
let debug_all = false ;; let debug_all = false ;;
let logg = true ;; let logg = false ;;
(* ---------------------------------------------------------------------------------------------------------------------------------------------------- *) (* ---------------------------------------------------------------------------------------------------------------------------------------------------- *)
(* ---------------------------------------------------------------------------------------------------------------------------------------------------- *) (* ---------------------------------------------------------------------------------------------------------------------------------------------------- *)

BIN
again.o

Binary file not shown.

View File

@ -1,31 +1,30 @@
223.51300000000185 68.89999999999996
0 2
13 21 13 21
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
1 3 3 3 3 5 3 3 3 5 0 5 5 3 5 5 4 4 4 4 1 1 3 3 3 3 3 0 2 2 2 2 2 2 2 2 0 5 5 5 5 1
1 3 1 4 1 3 1 4 1 5 1 6 1 3 1 4 1 4 1 5 1 1 3 1 3 1 0 1 2 1 2 1 2 1 2 1 2 1 5 1 5 1
1 3 3 5 5 3 5 5 5 3 5 3 5 3 5 4 5 4 5 5 1 1 3 3 3 3 0 2 2 2 2 2 2 2 2 2 2 0 5 5 5 1
1 3 1 4 1 5 1 3 1 3 1 3 1 3 1 4 1 4 1 5 1 1 3 1 3 1 2 1 2 1 2 1 2 1 2 1 2 1 0 1 5 1
1 4 3 3 5 5 5 5 5 3 3 3 3 3 3 3 4 4 4 4 1 1 3 3 3 0 2 2 2 2 2 2 2 2 2 2 2 2 2 0 5 1
1 6 1 4 1 5 1 3 1 3 1 3 1 3 1 4 1 4 1 4 1 1 3 1 6 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 5 1
1 4 4 3 3 5 3 3 3 6 3 4 3 3 4 4 4 4 4 4 1 1 0 0 6 0 2 2 2 2 2 2 2 2 2 2 2 2 0 0 5 1
1 6 1 4 1 5 1 3 1 6 1 4 1 3 1 4 1 4 1 4 1 1 0 1 6 1 2 1 2 1 2 1 2 1 2 1 2 1 4 1 4 1
1 6 3 3 3 6 6 6 6 6 6 4 6 3 6 6 4 4 4 4 1 1 6 6 6 0 0 2 2 2 2 2 2 2 2 2 0 4 4 4 4 1
1 6 1 6 1 3 1 3 1 6 1 4 1 4 1 4 1 4 1 4 1 1 6 1 6 1 6 1 2 1 2 1 2 1 2 1 2 1 4 1 4 1
1 6 6 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 1 1 6 6 6 6 6 6 0 2 2 2 2 2 2 2 0 4 4 4 4 1
1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
7 3
3 7 2 223.80000000000092 8 17 2 69.89999999999993
7 14 3 224.63900000000177 9 5 1 70.99999999999993
6 15 3 226.0970000000018 7 18 2 73.59999999999998
10 13 3 226.3940000000016
10 7 3 226.70000000000095
5 16 3 227.55500000000183
11 14 3 227.85200000000162
4 4
6 17 0 3 1 3 3 1 5 3 0 0 2 2 2 0
10 15 1 3 1 3 0 1 7 19 1 1 0 2 2 1
5 9 2 1 0 2 3 1 11 16 2 1 0 2 0 0
11 5 3 1 1 3 2 1 11 7 3 1 1 1 3 4
1 4
1 10 2 2 5 0
1 6 4
5 4 3
7 2 2

329
graphing.c Normal file
View File

@ -0,0 +1,329 @@
#include <stdio.h>
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include <math.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
int width = 800 ;
int height = 500 ;
int offset = 25 ;
int wside = 15 ;
int map_size = 64 ;
int min(int x, int y) {
if(x < y) {
return x;
}
return y ;
}
int max(int x, int y) {
if(x > y) {
return x;
}
return y ;
}
int int_of_string(char* s) {
int i = 0;
int res = 0 ;
while(s[i] != '\0' && (int)(s[i]) >= 48 && (int)(s[i]) <= 57) {
res = res*10 + (int)(s[i]) - 48 ;
i += 1;
}
return res ;
}
int truncated_float_of_string(char* s) {
int i = 0;
int res = 0 ;
while(s[i] != '\0' && s[i] != '.') {
res = res*10 + (int)(s[i]) - 48 ;
i += 1;
}
return res ;
}
char* input_line(FILE* ptr) {
char* res = malloc(sizeof(char)*256) ;
int i = 0 ;
char c = fgetc(ptr) ;
while(c != EOF && c != '\n') {
res[i] = c;
i += 1;
c = fgetc(ptr) ;
}
res[i] = '\0' ;
return res;
}
void flush_line(FILE* ptr) {
char c = fgetc(ptr) ;
while(c != EOF && c != '\n') {
c = fgetc(ptr);
}
}
int input_int(FILE* ptr) {
int res = 0 ;
char c = '0' ;
while(c != EOF && (int)c >= 48 && (int)c <= 57) {
res = 10*res + (int)c - 48 ;
c = fgetc(ptr);
}
return res ;
}
void updateRenderer(SDL_Renderer* renderer) {
SDL_RenderPresent(renderer);
}
void setRendererColor(SDL_Renderer* renderer, int r, int g, int b, int a) {
SDL_SetRenderDrawColor(renderer, r, g, b, a);
}
void resetRenderer(SDL_Renderer* renderer) {
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
SDL_RenderClear(renderer);
}
void refreshRenderer(SDL_Renderer* renderer) {
resetRenderer(renderer);
updateRenderer(renderer);
}
void drawRectToRenderer(SDL_Renderer* renderer, SDL_Rect* rect, int R, int G, int B, int A) {
SDL_SetRenderDrawColor(renderer, R, G, B, A);
SDL_RenderFillRect(renderer, rect);
}
void placeRectToRenderer(SDL_Renderer* renderer, int X, int Y, int W, int H, int R, int G, int B, int A) {
SDL_Rect rect;
rect.x = X;
rect.y = Y;
rect.w = W;
rect.h = H;
SDL_SetRenderDrawColor(renderer, R, G, B, A);
SDL_RenderFillRect(renderer, &rect);
}
void placeRectToRendererNoColor(SDL_Renderer* renderer, int X, int Y, int W, int H) {
SDL_Rect rect;
rect.x = X;
rect.y = Y;
rect.w = W;
rect.h = H;
SDL_RenderFillRect(renderer, &rect);
}
void drawCircleToRenderer(SDL_Renderer * renderer, int32_t centreX, int32_t centreY, int32_t radius) {
const int32_t diameter = (radius * 2);
int32_t x = (radius - 1);
int32_t y = 0;
int32_t tx = 1;
int32_t ty = 1;
int32_t error = (tx - diameter);
while (x >= y)
{
// each of the following renders an octant of the circle
SDL_RenderDrawPoint(renderer, centreX + x, centreY - y);
SDL_RenderDrawPoint(renderer, centreX + x, centreY + y);
SDL_RenderDrawPoint(renderer, centreX - x, centreY - y);
SDL_RenderDrawPoint(renderer, centreX - x, centreY + y);
SDL_RenderDrawPoint(renderer, centreX + y, centreY - x);
SDL_RenderDrawPoint(renderer, centreX + y, centreY + x);
SDL_RenderDrawPoint(renderer, centreX - y, centreY - x);
SDL_RenderDrawPoint(renderer, centreX - y, centreY + x);
if (error <= 0)
{
++y;
error += ty;
ty += 2;
}
if (error > 0)
{
--x;
tx += 2;
error += (tx - diameter);
}
}
}
int get_data(char* filename, int** board, bool* ended) {
// if board has been modified //
FILE* ptr = fopen(filename, "r") ;
int cur_t = input_int(ptr) ;
char ignored = '0' ;
flush_line(ptr);
flush_line(ptr);
int maze_w = input_int(ptr) ;
int maze_h = input_int(ptr) ;
board[cur_t%map_size][0] = 0 ;
board[cur_t%map_size][1] = 0 ;
board[cur_t%map_size][2] = 0 ;
board[cur_t%map_size][3] = 0 ;
for(int w = 0; w < maze_w; w++) {
for(int h = 0; h < maze_h; h++) {
int tile = input_int(ptr) ;
//fprintf(stderr, "%d ", tile) ;
if(tile >= 3) {
board[cur_t%map_size][tile-3] += 1;
}
}
ignored = fgetc(ptr); // \n
//fprintf(stderr, "\n") ;
}
int nbombs = input_int(ptr) ;
for(int k = 0; k < nbombs; k++) {
flush_line(ptr);
}
int nplayers = input_int(ptr) ;
if(nplayers == 1) {
*ended = true ;
}
fprintf(stderr, "(%d, %d, %d, %d, %d)\n", cur_t, maze_w, maze_h, nbombs, nplayers);
fclose(ptr) ;
return cur_t ;
}
int convex_pt(int a, int b, float theta) {
return (a + (int)((b - a) * theta)) ;
}
void playerActions() {
SDL_Event event;
while(SDL_PollEvent(&event)) {
switch (event.type) {
case SDL_QUIT:
break;
case SDL_KEYDOWN:
switch (event.key.keysym.sym) {
case SDLK_t:
exit(1);
break;
}
}
}
}
void update_graph(SDL_Renderer* renderer, int** board, int current_time) {
resetRenderer(renderer) ;
placeRectToRenderer(renderer, offset, offset, width - 2*offset, height - 2*offset, 128, 128, 128, 255) ;
placeRectToRenderer(renderer, offset + wside, offset + wside, width - 2*(offset + wside), height - 2*(offset + wside), 255, 255, 255, 255) ;
playerActions();
int max_val = 0 ;
for(int k = 0; k < map_size; k++) {
for(int l = 0; l < 4; l++) {
max_val = max(max_val, board[k][l]) ;
}
}
int left_x = offset + wside ;
int bot_y = offset + wside ;
int right_x = width - 2*(offset + wside) ;
int top_y = height - 2*(offset + wside) ;
int borned = min(map_size, current_time) ;
int x_size = 1+(right_x - left_x)/borned ;
int y_size = 1+(top_y - bot_y)/(1+max_val) ;
for(int t0 = 0; t0 < borned; t0++) {
for(int pl = 0; pl < 4; pl++) {
int t = (t0 + max(0, current_time - map_size +1))%map_size ;
//int t = t0 ;
int xc = convex_pt(left_x, right_x, ((float)(t0))/((float)(borned))) ;
int yc = convex_pt(bot_y, top_y, 1.0f - ((float)(max(0, board[t][pl])))/((float)(max_val+1))) ;
//drawCircleToRenderer(renderer, xc, yc, 10) ;
placeRectToRenderer(renderer, xc, yc-y_size+offset+wside, x_size, y_size, 255*(pl==0||pl==3), 255*(pl>=2), 255*(pl==1), 96) ;
}
}
updateRenderer(renderer) ;
}
bool can_pass() {
FILE* ptr = fopen("signal.txt", "r") ;
bool cp = false ;
if(fgetc(ptr) == '1') {
FILE* pptr = fopen("signal.txt", "w") ;
fprintf(pptr, "0") ;
fclose(pptr);
cp = true ;
}
fclose(ptr) ;
return cp ;
}
int main(int argc, char** argv) {
fprintf(stderr, "|||||||||||||||| ENTER ||||||||||||||||\n") ;
if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
fprintf(stderr, "error initializing SDL: %s\n", SDL_GetError());
}
SDL_Window* win = SDL_CreateWindow("statistics because why not :)", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, 0);
Uint32 render_flags = SDL_RENDERER_ACCELERATED;
SDL_Renderer* rend = SDL_CreateRenderer(win, -1, render_flags);
SDL_SetRenderDrawBlendMode(rend, SDL_BLENDMODE_BLEND);
int** board = malloc(sizeof(int*)*map_size) ;
for(int k = 0; k < 128; k++) {
board[k] = malloc(sizeof(int)*4);
for(int l = 0; l < 4; l++) {
board[k][l] = (-1) ;
}
}
bool game_ended = false ;
int last_time = (-1) ;
usleep(250000);
//int cur_time = get_data("entrees.txt", board, &game_ended) ;
//assert(false);
while(!game_ended) {
while(!can_pass()) {
}
int cur_time = get_data("entrees.txt", board, &game_ended) ;
//fprintf(stderr, "%d %d %d\n", last_time, cur_time, game_ended) ;
if(cur_time != last_time) {
update_graph(rend, board, cur_time) ;
last_time = cur_time ;
}
}
fprintf(stderr, "|||||||||||||||| QUIT ||||||||||||||||\n") ;
for(int k = 0; k < 128; k++) {
free(board[k]);
}
free(board);
SDL_DestroyRenderer(rend);
SDL_DestroyWindow(win);
SDL_Quit();
return 0;
}

BIN
graphs Executable file

Binary file not shown.

View File

@ -73,6 +73,7 @@ except ModuleNotFoundError:
playsound = lambda _:() playsound = lambda _:()
from threading import Thread from threading import Thread
import sys import sys
import time
def attente(vitesse): def attente(vitesse):
return TEMPS_BASE * 0.9**vitesse return TEMPS_BASE * 0.9**vitesse
@ -486,6 +487,8 @@ Y_STEP_CLAIMS = 40
X_LARGEUR_EMPIRES = 60 X_LARGEUR_EMPIRES = 60
Y_LARGEUR_EMPIRES = 180 Y_LARGEUR_EMPIRES = 180
TIME_FACTOR = 100
def decision(programme, indiceJoueur, plateau, plateauCouleur, bombes, joueurs, powerups, instant): def decision(programme, indiceJoueur, plateau, plateauCouleur, bombes, joueurs, powerups, instant):
with open("entrees.txt", "w") as entrees: with open("entrees.txt", "w") as entrees:
print(instant, file=entrees) print(instant, file=entrees)
@ -514,28 +517,39 @@ def decision(programme, indiceJoueur, plateau, plateauCouleur, bombes, joueurs,
elif os.name =="nt": elif os.name =="nt":
#os.system('type entrees.txt | python '+programme[2:]+ ' >sortie.txt') #os.system('type entrees.txt | python '+programme[2:]+ ' >sortie.txt')
subprocess.run('type entrees.txt | python '+programme[2:]+ ' >sortie.txt', shell=True) subprocess.run('type entrees.txt | python '+programme[2:]+ ' >sortie.txt', shell=True)
with open("sortie.txt", "r") as sortie: with open("sortie.txt", "r") as sortie:
direction, b = sortie.readline().split() direction, b = sortie.readline().split()
action = int(b) action = int(b)
with open("signal.txt", "w") as sign:
print("1", file=sign)
return int(direction), action return int(direction), action
def graphing():
subprocess.run("./graphs")
def simulation(strategies): def simulation(strategies):
def pas_de_jeu(): def pas_de_jeu():
if len(joueurs) - joueurs.count(None) > 0: if len(joueurs) - joueurs.count(None) > 0:
#st = time.time()
evenement = evenements.pop(0) evenement = evenements.pop(0)
if evenement[0]>TEMPS_PARTIE: if evenement[0]>TEMPS_PARTIE:
return return
#print('---------', file=sys.stderr)
execute_evenement(evenements, evenement, plateau, plateauCouleur, bombes, joueurs, powerups, pieges) execute_evenement(evenements, evenement, plateau, plateauCouleur, bombes, joueurs, powerups, pieges)
affiche_plateau(canvas, plateau, plateauCouleur, bombes, joueurs, powerups) affiche_plateau(canvas, plateau, plateauCouleur, bombes, joueurs, powerups)
affiche_infos(canvasInfosJoueurs, joueurs, plateauCouleur) affiche_infos(canvasInfosJoueurs, joueurs, plateauCouleur)
affiche_empires(canvasInfosJoueurs, joueurs, plateauCouleur) # very laggy for some reason # not anymore affiche_empires(canvasInfosJoueurs, joueurs, plateauCouleur) # very laggy for some reason # not anymore
temps = int((evenements[0][0]-evenement[0])/3*200) temps = int(1000*(evenements[0][0]-evenement[0])/TIME_FACTOR)
#print(temps) #print(1000*(evenements[0][0]-evenement[0])/TIME_FACTOR, " <--> ", temps)
# not here
if temps != 0: if temps != 0:
#print('+++++++++', file=sys.stderr)
fenetre.after(temps, pas_de_jeu) fenetre.after(temps, pas_de_jeu)
#en = time.time()
#print("------------------- : ", en-st)
else: else:
canvas.pack()
pas_de_jeu() pas_de_jeu()
dimensions = 13,21 dimensions = 13,21
@ -564,6 +578,8 @@ def simulation(strategies):
canvasInfosJoueurs = Canvas(width = LARGEUR_INFOS, height=len(joueurs)*HAUTEUR_JOUEUR) canvasInfosJoueurs = Canvas(width = LARGEUR_INFOS, height=len(joueurs)*HAUTEUR_JOUEUR)
canvasInfosJoueurs.pack() canvasInfosJoueurs.pack()
(Thread(target=graphing)).start()
pas_de_jeu() pas_de_jeu()

BIN
main.cmi

Binary file not shown.

BIN
main.cmo

Binary file not shown.

1
signal.txt Normal file
View File

@ -0,0 +1 @@
0

View File

@ -1 +1 @@
2 1 4 0