v0.2

- added merge sprites.
- fixed memory leak.
- improved speed and fluidity.

To do:
- Cycles settings.
- Sizeable map and responsive menu.
- Map editor.

Life.xcodeproj/project.pbxproj

@@ -7,11 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		6A364541194D85E60072C818 /* SDL2_image.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 6AED72B1194AB2AB00C47B6F /* SDL2_image.framework */; };
-		6A364542194D86000072C818 /* SDL2.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 6AED72AF194AB22800C47B6F /* SDL2.framework */; };
+		6A5FDDBC194D953A001B6075 /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A5FDDBA194D953A001B6075 /* SDL2_image.framework */; };
+		6A5FDDBD194D953A001B6075 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A5FDDBB194D953A001B6075 /* SDL2.framework */; };
+		6A5FDDBE194D9574001B6075 /* SDL2_image.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 6A5FDDBA194D953A001B6075 /* SDL2_image.framework */; };
+		6A5FDDBF194D9574001B6075 /* SDL2.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 6A5FDDBB194D953A001B6075 /* SDL2.framework */; };
+		6A5FDDC0194D957F001B6075 /* sprites in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6A364557194D92340072C818 /* sprites */; };
 		6AED72A7194AB16C00C47B6F /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 6AED72A6194AB16C00C47B6F /* main.c */; };
-		6AED72B0194AB22800C47B6F /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AED72AF194AB22800C47B6F /* SDL2.framework */; };
-		6AED72B2194AB2AB00C47B6F /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AED72B1194AB2AB00C47B6F /* SDL2_image.framework */; };
 		6AED72B8194AB9E700C47B6F /* sim.c in Sources */ = {isa = PBXBuildFile; fileRef = 6AED72B7194AB9E700C47B6F /* sim.c */; };
 		6AED72BB194AE63600C47B6F /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 6AED72BA194AE63600C47B6F /* menu.c */; };
 /* End PBXBuildFile section */
@@ -23,6 +24,7 @@
 			dstPath = sprites;
 			dstSubfolderSpec = 7;
 			files = (
+				6A5FDDC0194D957F001B6075 /* sprites in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -32,8 +34,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				6A364542194D86000072C818 /* SDL2.framework in Copy Files */,
-				6A364541194D85E60072C818 /* SDL2_image.framework in Copy Files */,
+				6A5FDDBE194D9574001B6075 /* SDL2_image.framework in Copy Files */,
+				6A5FDDBF194D9574001B6075 /* SDL2.framework in Copy Files */,
 			);
 			name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 1;
@@ -42,10 +44,10 @@
 
 /* Begin PBXFileReference section */
 		6A364557194D92340072C818 /* sprites */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sprites; sourceTree = "<group>"; };
+		6A5FDDBA194D953A001B6075 /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = ../../../../Library/Frameworks/SDL2_image.framework; sourceTree = "<group>"; };
+		6A5FDDBB194D953A001B6075 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../Library/Frameworks/SDL2.framework; sourceTree = "<group>"; };
 		6AED72A3194AB16C00C47B6F /* Life */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Life; sourceTree = BUILT_PRODUCTS_DIR; };
 		6AED72A6194AB16C00C47B6F /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-		6AED72AF194AB22800C47B6F /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../Library/Frameworks/SDL2.framework; sourceTree = "<group>"; };
-		6AED72B1194AB2AB00C47B6F /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = ../../../../Library/Frameworks/SDL2_image.framework; sourceTree = "<group>"; };
 		6AED72B4194AB36500C47B6F /* constante.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = constante.h; sourceTree = "<group>"; };
 		6AED72B7194AB9E700C47B6F /* sim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sim.c; sourceTree = "<group>"; };
 		6AED72B9194AB9F600C47B6F /* sim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sim.h; sourceTree = "<group>"; };
@@ -58,8 +60,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6AED72B2194AB2AB00C47B6F /* SDL2_image.framework in Frameworks */,
-				6AED72B0194AB22800C47B6F /* SDL2.framework in Frameworks */,
+				6A5FDDBC194D953A001B6075 /* SDL2_image.framework in Frameworks */,
+				6A5FDDBD194D953A001B6075 /* SDL2.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -69,8 +71,8 @@
 		6AED729A194AB16B00C47B6F = {
 			isa = PBXGroup;
 			children = (
-				6AED72B1194AB2AB00C47B6F /* SDL2_image.framework */,
-				6AED72AF194AB22800C47B6F /* SDL2.framework */,
+				6A5FDDBA194D953A001B6075 /* SDL2_image.framework */,
+				6A5FDDBB194D953A001B6075 /* SDL2.framework */,
 				6AED72A5194AB16C00C47B6F /* Life */,
 				6AED72A4194AB16C00C47B6F /* Products */,
 			);
@@ -106,9 +108,9 @@
 			buildConfigurationList = 6AED72AC194AB16C00C47B6F /* Build configuration list for PBXNativeTarget "Life" */;
 			buildPhases = (
 				6AED729F194AB16C00C47B6F /* Sources */,
-				6AED72A0194AB16C00C47B6F /* Frameworks */,
 				6AED72A1194AB16C00C47B6F /* Copy Files */,
 				6A36454C194D87C60072C818 /* CopyFiles */,
+				6AED72A0194AB16C00C47B6F /* Frameworks */,
 			);
 			buildRules = (
 			);

Life/constante.h

@@ -17,10 +17,23 @@
 #define NB_BLOCS 12
 #define LARGEUR_ECRAN TAILLE_BLOC*NB_BLOCS
 #define HAUTEUR_ECRAN TAILLE_BLOC*NB_BLOCS
-#define CYCLES 20
-#define WAIT 0
+#define CYCLES 24
+#define WAIT 100
 #define MAXMAP (NB_BLOCS*NB_BLOCS)
+#define SHEETSIZE 16
 
 enum {HAUT, BAS, GAUCHE, DROITE};
 
+typedef struct Sprites Sprites;
+struct Sprites {
+    SDL_Surface *menu;
+    SDL_Surface *arrow;
+    SDL_Surface *cell;
+    SDL_Surface *deadcell;
+    SDL_Surface *alivecell;
+    SDL_Surface *cellsheet;
+    SDL_Surface *icon;
+    SDL_Rect clip[SHEETSIZE];
+};
+
 #endif

Life/main.c

@@ -11,6 +11,8 @@
 #include "menu.h"
 #include "sim.h"
 
+static void initSprites(Sprites *Sprites);
+
 int main(int argc, const char * argv[])
 {
     if (SDL_Init(SDL_INIT_VIDEO) == -1) {
@@ -19,16 +21,17 @@ int main(int argc, const char * argv[])
     }
     int choice = 0;
     SDL_Window *ecran;
-    SDL_Surface *screen, *icon;
+    SDL_Surface *screen;
+    Sprites Sprites;
     ecran = SDL_CreateWindow("LIFE", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, LARGEUR_ECRAN, HAUTEUR_ECRAN, SDL_WINDOW_SHOWN);
     screen = SDL_GetWindowSurface(ecran);
-    icon = IMG_Load("sprites/icon.png");
-    SDL_SetWindowIcon(ecran, icon);
+    initSprites(&Sprites);
+    SDL_SetWindowIcon(ecran, Sprites.icon);
     while (choice == 0) {
-        choice = menu(ecran, screen);
+        choice = menu(&Sprites, ecran, screen);
         switch (choice) {
             case 1:
-                sim(ecran, screen, CYCLES);
+                sim(&Sprites, ecran, screen, CYCLES);
                 choice = 0;
                 break;
             case 2:
@@ -43,3 +46,22 @@ int main(int argc, const char * argv[])
     return EXIT_SUCCESS;
 }
 
+static void initSprites(Sprites *Sprites)
+{
+    Sprites->cell = IMG_Load("sprites/cell.png");
+    Sprites->alivecell = IMG_Load("sprites/alivecell.png");
+    Sprites->deadcell = IMG_Load("sprites/deadcell.png");
+    Sprites->cellsheet = IMG_Load("sprites/cellsheet.png");
+    Sprites->menu = IMG_Load("sprites/menu.png");
+    Sprites->arrow = IMG_Load("sprites/arrow.png");
+    Sprites->icon = IMG_Load("sprites/icon.png");
+    
+    for (int i = 0; i < SHEETSIZE; i++)
+    {
+        Sprites->clip[i].x = (i%(SHEETSIZE/4))*TAILLE_BLOC;
+        Sprites->clip[i].y = (i/(SHEETSIZE/4))*TAILLE_BLOC;
+        Sprites->clip[i].h = Sprites->clip[i].w = TAILLE_BLOC;
+    }
+    
+}
+

Life/menu.c

@@ -12,21 +12,22 @@
 
 static void eventChoice(int* choice, int* running, int* current);
 
-int menu(SDL_Window *ecran, SDL_Surface *screen)
+int menu(Sprites *Sprites, SDL_Window *ecran, SDL_Surface *screen)
 {
     int running = 1, choice = 0, current = 1;
     SDL_Rect select, position, element1 = {4,7}, element2={5,9};
-    SDL_Surface *menu = NULL, *arrow = NULL, *wall = NULL;
-    menu = IMG_Load("sprites/menu.png");
-    arrow = IMG_Load("sprites/arrow.png");
-    wall = IMG_Load("sprites/wall.png");
     while (running) {
+        for (int i = 0 ; i < MAXMAP ; i++)
+        {
+            position.x = i%NB_BLOCS * TAILLE_BLOC;
+            position.y = i/NB_BLOCS * TAILLE_BLOC;
+            SDL_BlitSurface(Sprites->cell, NULL, screen, &position);
+        }
         position.x = position.y = 0;
-        SDL_BlitSurface(wall, NULL, screen, &position);
-        SDL_BlitSurface(menu, NULL, screen, &position); // Affiche le menu
+        SDL_BlitSurface(Sprites->menu, NULL, screen, &position); 
         (current == 1) ? (select.x = element1.x * TAILLE_BLOC) : (select.x = element2.x * TAILLE_BLOC);
         (current == 1) ? (select.y = element1.y * TAILLE_BLOC) : (select.y = element2.y * TAILLE_BLOC);
-        SDL_BlitSurface(arrow, NULL, screen, &select);
+        SDL_BlitSurface(Sprites->arrow, NULL, screen, &select);
         SDL_UpdateWindowSurface(ecran);
         eventChoice(&choice, &running, &current);
     }

Life/menu.h

@@ -9,6 +9,6 @@
 #ifndef Life_menu_h
 #define Life_menu_h
 
-int menu(SDL_Window *ecran, SDL_Surface *screen);
+int menu(Sprites *Sprites, SDL_Window *ecran, SDL_Surface *screen);
 
 #endif

Life/sim.c

@@ -11,19 +11,20 @@
 #include "sim.h"
 
 static void randmap(Cell map[]);
-static void drawmap(SDL_Surface *screen, Cell map[]);
+static void drawmap(Sprites *Sprites, SDL_Surface *screen, Cell map[]);
 static void eventWatch();
 static void next(Cell map[]);
-static void drawCell(SDL_Surface *screen, SDL_Rect position, Cell Cell);
-//static void blitSprite(int orig, SDL_Surface *screen, SDL_Rect position);
+static void drawCell(Sprites *Sprites, SDL_Surface *screen, SDL_Rect position, Cell Cell);
+static void refreshCells(Cell map[]);
 
-void sim(SDL_Window *ecran, SDL_Surface *screen, int cycles)
+void sim(Sprites *Sprites, SDL_Window *ecran, SDL_Surface *screen, int cycles)
 {
     Cell map[MAXMAP];
     randmap(map);
     int remaining = cycles;
     while (remaining != 0){
-        drawmap(screen, map);
+        refreshCells(map);
+        drawmap(Sprites, screen, map);
         SDL_UpdateWindowSurface(ecran);
         eventWatch(&remaining);
         SDL_Delay(WAIT);
@@ -39,19 +40,18 @@ static void randmap(Cell map[])
         map[i].x = i%NB_BLOCS;
         map[i].y = i/NB_BLOCS;
         map[i].type = rand()%2;
-        map[i].voisines = 0;
     }
 }
 
-static void drawmap(SDL_Surface *screen, Cell map[])
+static void drawmap(Sprites *Sprites, SDL_Surface *screen, Cell map[])
 {
-    SDL_Rect position;
+    SDL_Rect position = {0,0};
     SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 255, 255, 255));
     for (int i = 0 ; i < MAXMAP ; i++)
     {
             position.x = map[i].x * TAILLE_BLOC;
             position.y = map[i].y * TAILLE_BLOC;
-            drawCell(screen, position, map[i]);
+            drawCell(Sprites, screen, position, map[i]);
     }
 }
 
@@ -94,58 +94,77 @@ static void eventWatch()
 
 static void next(Cell map[])
 {
-    for (int i = 0 ; i < MAXMAP ; i++)
-    {
-        map[i].voisines = 0;
-        map[i].voisines = i%NB_BLOCS == 0 ? map[i].voisines : (map[i-1].type == 1 ? ++map[i].voisines : map[i].voisines);
-        map[i].voisines = i%(NB_BLOCS) == 11 ? map[i].voisines : (map[i+1].type == 1 ? ++map[i].voisines : map[i].voisines);
-        map[i].voisines = i-NB_BLOCS < 0 ? map[i].voisines : (map[i-NB_BLOCS].type == 1 ? ++map[i].voisines : map[i].voisines);
-        map[i].voisines = i+NB_BLOCS > MAXMAP ? map[i].voisines : (map[i+NB_BLOCS].type == 1 ? ++map[i].voisines : map[i].voisines);
-    }
-    
     for (int i = 0 ; i < MAXMAP ; i++)
     {
         map[i].type = map[i].type == 1 ? (map[i].voisines == 2 || map[i].voisines == 3 ? 1 : 2) : (map[i].voisines == 3 ? 1 : 0);
     }
 }
 
-static void drawCell(SDL_Surface *screen, SDL_Rect position, Cell Cell)
+static void drawCell(Sprites *Sprites, SDL_Surface *screen, SDL_Rect position, Cell Cell)
 {
-    SDL_Surface *cell = NULL, *deadcell = NULL, *alivecell = NULL;
-    cell = IMG_Load("sprites/cell.png");
-    alivecell = IMG_Load("sprites/alivecell.png");
-    deadcell = IMG_Load("sprites/deadcell.png");
-    
     if (Cell.type == 0)
-        SDL_BlitSurface(cell, NULL, screen, &position);
+        SDL_BlitSurface(Sprites->cell, NULL, screen, &position);
     else if (Cell.type == 2)
-        SDL_BlitSurface(deadcell, NULL, screen, &position);
+        SDL_BlitSurface(Sprites->deadcell, NULL, screen, &position);
     else {
-        SDL_BlitSurface(alivecell, NULL, screen, &position);
+        //SDL_BlitSurface(Sprites->alivecell, NULL, screen, &position);
+        SDL_BlitSurface(Sprites->cellsheet, &Sprites->clip[Cell.clip], screen, &position);
     }
 }
 
-/*static void blitSprite(int orig, SDL_Surface *screen, SDL_Rect position)
+static void refreshCells(Cell map[])
 {
-    SDL_Surface *cellsheet;
-    cellsheet = IMG_Load("sprites/cellsheet.png");
-    
-    SDL_Rect clip[9];
-    clip[0].x = clip[0].y = 0;
-    clip[1].x = 34;clip[1].y = 0;
-    clip[2].x = 68;clip[2].y = 0;
-    clip[3].x = 0;clip[3].y = 34;
-    clip[4].x = clip[4].y = 34;
-    clip[5].x = 68;clip[5].y = 34;
-    clip[6].x = 0;clip[6].y = 68;
-    clip[7].x = 34;clip[7].y = 68;
-    clip[8].x = clip[8].y = 68;
-    for (int i = 0; i > 9; i++)
-        clip[i].h = clip[i].w = 34;
-    
-    SDL_BlitSurface(cellsheet, &clip[orig], screen, &position);
+    for (int i = 0; i < MAXMAP; i++)
+    {
+        
+        // CELL.near
+        for (int j = 0; j < 4; j++)
+        {
+            map[i].near[j] = false;
+        }
+        map[i].near[TOP] = i-NB_BLOCS < 0 ? false : (map[i-NB_BLOCS].type == 1 ? true : false);
+        map[i].near[LEFT] = i%NB_BLOCS == 0 ? false : (map[i-1].type == 1 ? true : false);
+        map[i].near[RIGHT] = i%NB_BLOCS == 11 ? false : (map[i+1].type == 1 ? true : false);
+        map[i].near[LOW] = i+NB_BLOCS > MAXMAP ? false : (map[i+NB_BLOCS].type == 1 ? true : false);
+        
+        //CELL.voisines
+        map[i].voisines = 0;
+        for (int j = 0; j < 4; j ++)
+        {
+            map[i].voisines = map[i].near[j] == true ? ++map[i].voisines : map[i].voisines;
+        }
+        
+        // CELL.clip
+        map[i].clip = 0;
+        switch (map[i].voisines)
+        {
+            case 1:
+                map[i].clip = map[i].near[TOP] ? 10 : (map[i].near[RIGHT] ? 11 : (map[i].near[LOW] ? 12 : 13));
+                break;
+            case 2:
+                if (map[i].near[TOP])
+                    map[i].clip = map[i].near[RIGHT] ? 9 : (map[i].near[LOW] ? 8 : 7);
+                else if (map[i].near[RIGHT])
+                    map[i].clip = map[i].near[LOW] ? 6 : 5;
+                else
+                    map[i].clip = 4;
+                break;
+            case 3:
+                if (!map[i].near[TOP])
+                    map[i].clip = 0;
+                else if (!map[i].near[RIGHT])
+                    map[i].clip = 1;
+                else if (!map[i].near[LOW])
+                    map[i].clip = 2;
+                else
+                    map[i].clip = 3;
+                break;
+            case 4:
+                map[i].clip = 14;
+                break;
+            case 0:
+                map[i].clip = 15;
+                break;
+        }
+    }
 }
-
-static void switchType(Cell map[])
-{
-}*/

Life/sim.h

@@ -9,9 +9,10 @@
 #ifndef Life_sim_h
 #define Life_sim_h
 
-void sim(SDL_Window *ecran, SDL_Surface *screen, int cycles);
+void sim(Sprites *Sprites, SDL_Window *ecran, SDL_Surface *screen, int cycles);
 
 enum {CELL, ALIVE, DEAD};
+enum { TOP, RIGHT, LOW, LEFT};
 
 typedef struct Cell Cell;
 struct Cell
@@ -20,6 +21,8 @@ struct Cell
     int y;
     int type;
     int voisines;
+    bool near[4];
+    int clip;
 };
 
 #endif