Forráskód Böngészése

[examples] Fixed `shaders_game_of_life` for web (#5399)

* [examples] Fixed `shaders_game_of_life` for web

* Fixed image loadig for rexm
Jordi Santonja 2 napja
szülő
commit
8fa5f1fe2c
2 módosított fájl, 24 hozzáadás és 8 törlés
  1. 8 1
      examples/Makefile.Web
  2. 16 7
      examples/shaders/shaders_game_of_life.c

+ 8 - 1
examples/Makefile.Web

@@ -1367,8 +1367,15 @@ shaders/shaders_fog_rendering: shaders/shaders_fog_rendering.c
 shaders/shaders_game_of_life: shaders/shaders_game_of_life.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
     --preload-file shaders/resources/shaders/glsl100/game_of_life.fs@resources/shaders/glsl100/game_of_life.fs \
+    --preload-file shaders/resources/game_of_life/acorn.png@resources/game_of_life/acorn.png \
+    --preload-file shaders/resources/game_of_life/breeder.png@resources/game_of_life/breeder.png \
+    --preload-file shaders/resources/game_of_life/glider.png@resources/game_of_life/glider.png \
+    --preload-file shaders/resources/game_of_life/glider_gun.png@resources/game_of_life/glider_gun.png \
+    --preload-file shaders/resources/game_of_life/oscillators.png@resources/game_of_life/oscillators.png \
+    --preload-file shaders/resources/game_of_life/puffer_train.png@resources/game_of_life/puffer_train.png \
     --preload-file shaders/resources/game_of_life/r_pentomino.png@resources/game_of_life/r_pentomino.png \
-    --preload-file shaders/resources/game_of_life/.png@resources/game_of_life/.png
+    --preload-file shaders/resources/game_of_life/spaceships.png@resources/game_of_life/spaceships.png \
+    --preload-file shaders/resources/game_of_life/still_lifes.png@resources/game_of_life/still_lifes.png
 
 shaders/shaders_hot_reloading: shaders/shaders_hot_reloading.c
 	$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \

+ 16 - 7
examples/shaders/shaders_game_of_life.c

@@ -42,7 +42,6 @@ typedef enum {
 // Struct to store example preset patterns
 typedef struct {
     char *name;
-    char *fileName;
     Vector2 position;
 } PresetPattern;
 
@@ -77,10 +76,10 @@ int main(void)
     const Rectangle textureOnScreen = { 0, 0, (float)windowWidth, (float)windowHeight };
 
     const PresetPattern presetPatterns[] = {
-        { "Glider", "glider", { 0.5f, 0.5f } }, { "R-pentomino", "r_pentomino", { 0.5f, 0.5f } }, { "Acorn", "acorn", { 0.5f,0.5f } },
-        { "Spaceships", "spaceships", { 0.1f, 0.5f } }, { "Still lifes", "still_lifes", { 0.5f, 0.5f } }, { "Oscillators", "oscillators", { 0.5f, 0.5f } },
-        { "Puffer train", "puffer_train", { 0.1f, 0.5f } }, { "Glider Gun", "glider_gun", { 0.2f, 0.2f } }, { "Breeder", "breeder", { 0.1f, 0.5f } },
-        { "Random", "", { 0.5f, 0.5f } }
+        { "Glider", { 0.5f, 0.5f } }, { "R-pentomino", { 0.5f, 0.5f } }, { "Acorn", { 0.5f,0.5f } },
+        { "Spaceships", { 0.1f, 0.5f } }, { "Still lifes", { 0.5f, 0.5f } }, { "Oscillators", { 0.5f, 0.5f } },
+        { "Puffer train", { 0.1f, 0.5f } }, { "Glider Gun", { 0.2f, 0.2f } }, { "Breeder", { 0.1f, 0.5f } },
+        { "Random", { 0.5f, 0.5f } }
     };
     
     const int numberOfPresets = sizeof(presetPatterns)/sizeof(presetPatterns[0]);
@@ -214,8 +213,18 @@ int main(void)
             Image pattern;
             if (preset < numberOfPresets - 1)   // Preset with pattern image lo load
             {
-                pattern = LoadImage(TextFormat("resources/game_of_life/%s.png", presetPatterns[preset].fileName));
-                
+                switch (preset)
+                {
+                    case 0: pattern = LoadImage("resources/game_of_life/glider.png"); break;
+                    case 1: pattern = LoadImage("resources/game_of_life/r_pentomino.png"); break;
+                    case 2: pattern = LoadImage("resources/game_of_life/acorn.png"); break;
+                    case 3: pattern = LoadImage("resources/game_of_life/spaceships.png"); break;
+                    case 4: pattern = LoadImage("resources/game_of_life/still_lifes.png"); break;
+                    case 5: pattern = LoadImage("resources/game_of_life/oscillators.png"); break;
+                    case 6: pattern = LoadImage("resources/game_of_life/puffer_train.png"); break;
+                    case 7: pattern = LoadImage("resources/game_of_life/glider_gun.png"); break;
+                    case 8: pattern = LoadImage("resources/game_of_life/breeder.png"); break;
+                }
                 BeginTextureMode(*currentWorld);
                     ClearBackground(RAYWHITE);
                 EndTextureMode();