From 91e99d9a0e864cf399133d4e59d4d7951d1bbd0a Mon Sep 17 00:00:00 2001
From: maberet <maberet@turing.local.isima.fr>
Date: Thu, 23 Jun 2022 14:00:22 +0200
Subject: [PATCH] =?UTF-8?q?=20Propagation=20du=20feu=20op=C3=A9rationelle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
travail_de_groupe/chef_oeuvre/src/fire.c | 10 ----------
travail_de_groupe/chef_oeuvre/src/main.c | 3 +--
travail_de_groupe/chef_oeuvre/src/render.c | 5 +----
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/travail_de_groupe/chef_oeuvre/src/fire.c b/travail_de_groupe/chef_oeuvre/src/fire.c
index 3082b79..6aa8593 100644
--- a/travail_de_groupe/chef_oeuvre/src/fire.c
+++ b/travail_de_groupe/chef_oeuvre/src/fire.c
@@ -55,7 +55,6 @@ listchainfire_t startFire(listchainfire_t listFire,int numberFire, int mapSize){
xFire= rand()%mapSize;
yFire= rand()%mapSize;
- printf("xf:%d,yf:%d\n",xFire,yFire);
fire.x= xFire;
fire.y= yFire;
fire.state=1;
@@ -135,7 +134,6 @@ void travelFire(listchainfire_t listFire){
printf("x:%d,y:%d\n",(listTemporary->fire).x,(listTemporary->fire).y);
listTemporary=listTemporary->next;
}
- //freeListFire(listTemporary);
}
void readFapFromFile(char * filename){
@@ -185,9 +183,6 @@ void nextFire(listchainfire_t listFire){
else if ((pMedium<=probability)&&(probability<pStrong)){(listTemporary->fire).state=STRONG;}
else {(listTemporary->fire).state=SPREAD;}
- printf("%d %d\n", probability, state);
- printf("%d %d %d %d\n", pDead, pSparkle, pMedium, pStrong);
-
listTemporary=listTemporary->next;
}
}
@@ -197,8 +192,6 @@ listchainfire_t probabilitySpreadFire( listchainfire_t listFire, listchainfire_t
fire_t fire;
probability= rand()%4;
- printf("proba:%d\n", probability);
- printf("listfire1: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y);
if((probability==0)&&((listTemporary->fire).x+1<MAPSIZE)){fire.state=1;
fire.x=(listTemporary->fire).x+1;
@@ -220,8 +213,6 @@ listchainfire_t probabilitySpreadFire( listchainfire_t listFire, listchainfire_t
fire.y=(listTemporary->fire).y;
listFire=insertAheadFire(fire,listFire);
}
- printf("listtemp1: x%d,y%d\n",(listTemporary->fire).x,(listTemporary->fire).y);
- printf("listfire2: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y);
return listFire;
}
@@ -232,7 +223,6 @@ listchainfire_t spreadFire (listchainfire_t listFire){
if ((listTemporary->fire).state==4){
listFire=probabilitySpreadFire(listFire, listTemporary);
- printf("listfire ajout: x%d,y%d\n",(listFire->fire).x,(listFire->fire).y);
}
listTemporary=listTemporary->next;
}
diff --git a/travail_de_groupe/chef_oeuvre/src/main.c b/travail_de_groupe/chef_oeuvre/src/main.c
index 2ce91a5..71aadad 100644
--- a/travail_de_groupe/chef_oeuvre/src/main.c
+++ b/travail_de_groupe/chef_oeuvre/src/main.c
@@ -10,9 +10,8 @@ int main(){
readMapFromFile("map.txt");
readFapFromFile("markov.txt");
fireList = startFire(fireList,10,MAPSIZE);
- travelFire(fireList);
- nextFire(fireList);
nextFire(fireList);
nextFire(fireList);
+
mainLoop();
}
\ No newline at end of file
diff --git a/travail_de_groupe/chef_oeuvre/src/render.c b/travail_de_groupe/chef_oeuvre/src/render.c
index 1d56816..f6ee6f6 100644
--- a/travail_de_groupe/chef_oeuvre/src/render.c
+++ b/travail_de_groupe/chef_oeuvre/src/render.c
@@ -348,18 +348,15 @@ void mainLoop(){
delta = (a - b);
if (delta > 1000/FPS_TO_GET){
timer += delta;
- printf("timer : %d\n", (int)timer%1000);
b = a;
- printf("fps : %f", 1000/delta);
switch (gameState){
case MENU:
drawMenu();
break;
case GAME:
- if ((int)timer % 1000 == 0){
+ if ((int)timer % 100 == 0){
nextFire(fireList);
fireList=spreadFire(fireList);
- printf("after spread fire : x%d,y%d\n",(fireList->fire).x,(fireList->fire).y);
}
drawGame();
break;
--
GitLab