Skip to content

Commit 8fa5f1f

Browse files
authored
[examples] Fixed shaders_game_of_life for web (#5399)
* [examples] Fixed `shaders_game_of_life` for web * Fixed image loadig for rexm
1 parent 6f7cd3a commit 8fa5f1f

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

examples/Makefile.Web

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,8 +1367,15 @@ shaders/shaders_fog_rendering: shaders/shaders_fog_rendering.c
13671367
shaders/shaders_game_of_life: shaders/shaders_game_of_life.c
13681368
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
13691369
--preload-file shaders/resources/shaders/glsl100/game_of_life.fs@resources/shaders/glsl100/game_of_life.fs \
1370+
--preload-file shaders/resources/game_of_life/acorn.png@resources/game_of_life/acorn.png \
1371+
--preload-file shaders/resources/game_of_life/breeder.png@resources/game_of_life/breeder.png \
1372+
--preload-file shaders/resources/game_of_life/glider.png@resources/game_of_life/glider.png \
1373+
--preload-file shaders/resources/game_of_life/glider_gun.png@resources/game_of_life/glider_gun.png \
1374+
--preload-file shaders/resources/game_of_life/oscillators.png@resources/game_of_life/oscillators.png \
1375+
--preload-file shaders/resources/game_of_life/puffer_train.png@resources/game_of_life/puffer_train.png \
13701376
--preload-file shaders/resources/game_of_life/r_pentomino.png@resources/game_of_life/r_pentomino.png \
1371-
--preload-file shaders/resources/game_of_life/.png@resources/game_of_life/.png
1377+
--preload-file shaders/resources/game_of_life/spaceships.png@resources/game_of_life/spaceships.png \
1378+
--preload-file shaders/resources/game_of_life/still_lifes.png@resources/game_of_life/still_lifes.png
13721379

13731380
shaders/shaders_hot_reloading: shaders/shaders_hot_reloading.c
13741381
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \

examples/shaders/shaders_game_of_life.c

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ typedef enum {
4242
// Struct to store example preset patterns
4343
typedef struct {
4444
char *name;
45-
char *fileName;
4645
Vector2 position;
4746
} PresetPattern;
4847

@@ -77,10 +76,10 @@ int main(void)
7776
const Rectangle textureOnScreen = { 0, 0, (float)windowWidth, (float)windowHeight };
7877

7978
const PresetPattern presetPatterns[] = {
80-
{ "Glider", "glider", { 0.5f, 0.5f } }, { "R-pentomino", "r_pentomino", { 0.5f, 0.5f } }, { "Acorn", "acorn", { 0.5f,0.5f } },
81-
{ "Spaceships", "spaceships", { 0.1f, 0.5f } }, { "Still lifes", "still_lifes", { 0.5f, 0.5f } }, { "Oscillators", "oscillators", { 0.5f, 0.5f } },
82-
{ "Puffer train", "puffer_train", { 0.1f, 0.5f } }, { "Glider Gun", "glider_gun", { 0.2f, 0.2f } }, { "Breeder", "breeder", { 0.1f, 0.5f } },
83-
{ "Random", "", { 0.5f, 0.5f } }
79+
{ "Glider", { 0.5f, 0.5f } }, { "R-pentomino", { 0.5f, 0.5f } }, { "Acorn", { 0.5f,0.5f } },
80+
{ "Spaceships", { 0.1f, 0.5f } }, { "Still lifes", { 0.5f, 0.5f } }, { "Oscillators", { 0.5f, 0.5f } },
81+
{ "Puffer train", { 0.1f, 0.5f } }, { "Glider Gun", { 0.2f, 0.2f } }, { "Breeder", { 0.1f, 0.5f } },
82+
{ "Random", { 0.5f, 0.5f } }
8483
};
8584

8685
const int numberOfPresets = sizeof(presetPatterns)/sizeof(presetPatterns[0]);
@@ -214,8 +213,18 @@ int main(void)
214213
Image pattern;
215214
if (preset < numberOfPresets - 1) // Preset with pattern image lo load
216215
{
217-
pattern = LoadImage(TextFormat("resources/game_of_life/%s.png", presetPatterns[preset].fileName));
218-
216+
switch (preset)
217+
{
218+
case 0: pattern = LoadImage("resources/game_of_life/glider.png"); break;
219+
case 1: pattern = LoadImage("resources/game_of_life/r_pentomino.png"); break;
220+
case 2: pattern = LoadImage("resources/game_of_life/acorn.png"); break;
221+
case 3: pattern = LoadImage("resources/game_of_life/spaceships.png"); break;
222+
case 4: pattern = LoadImage("resources/game_of_life/still_lifes.png"); break;
223+
case 5: pattern = LoadImage("resources/game_of_life/oscillators.png"); break;
224+
case 6: pattern = LoadImage("resources/game_of_life/puffer_train.png"); break;
225+
case 7: pattern = LoadImage("resources/game_of_life/glider_gun.png"); break;
226+
case 8: pattern = LoadImage("resources/game_of_life/breeder.png"); break;
227+
}
219228
BeginTextureMode(*currentWorld);
220229
ClearBackground(RAYWHITE);
221230
EndTextureMode();

0 commit comments

Comments
 (0)