Skip to content

Commit ef0dd5f

Browse files
committed
REXM: Updated examples after some renames
1 parent c7f8843 commit ef0dd5f

21 files changed

+76
-75
lines changed

examples/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,11 @@ CORE = \
538538
SHAPES = \
539539
shapes/shapes_basic_shapes \
540540
shapes/shapes_bouncing_ball \
541+
shapes/shapes_circle_sector_drawing \
541542
shapes/shapes_collision_area \
542543
shapes/shapes_colors_palette \
543544
shapes/shapes_digital_clock \
544545
shapes/shapes_double_pendulum \
545-
shapes/shapes_circle_sector_drawing \
546-
shapes/shapes_rounded_rectangle_drawing \
547546
shapes/shapes_easings_ball \
548547
shapes/shapes_easings_box \
549548
shapes/shapes_easings_rectangles \
@@ -554,6 +553,7 @@ SHAPES = \
554553
shapes/shapes_rectangle_advanced \
555554
shapes/shapes_rectangle_scaling \
556555
shapes/shapes_ring_drawing \
556+
shapes/shapes_rounded_rectangle_drawing \
557557
shapes/shapes_splines_drawing \
558558
shapes/shapes_top_down_lights
559559

@@ -606,7 +606,6 @@ MODELS = \
606606
models/models_bone_socket \
607607
models/models_box_collisions \
608608
models/models_cubicmap_rendering \
609-
models/models_textured_cube \
610609
models/models_first_person_maze \
611610
models/models_geometric_shapes \
612611
models/models_gpu_skinning \
@@ -622,6 +621,7 @@ MODELS = \
622621
models/models_rlgl_solar_system \
623622
models/models_skybox_rendering \
624623
models/models_tesseract_view \
624+
models/models_textured_cube \
625625
models/models_waving_cubes \
626626
models/models_yaw_pitch_roll
627627

@@ -630,6 +630,7 @@ SHADERS = \
630630
shaders/shaders_basic_pbr \
631631
shaders/shaders_custom_uniform \
632632
shaders/shaders_deferred_rendering \
633+
shaders/shaders_depth_rendering \
633634
shaders/shaders_eratosthenes_sieve \
634635
shaders/shaders_fog_rendering \
635636
shaders/shaders_hot_reloading \
@@ -653,7 +654,6 @@ SHADERS = \
653654
shaders/shaders_texture_tiling \
654655
shaders/shaders_texture_waves \
655656
shaders/shaders_vertex_displacement \
656-
shaders/shaders_depth_rendering \
657657
shaders/shaders_write_depth
658658

659659
AUDIO = \

examples/Makefile.Web

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,11 @@ CORE = \
538538
SHAPES = \
539539
shapes/shapes_basic_shapes \
540540
shapes/shapes_bouncing_ball \
541+
shapes/shapes_circle_sector_drawing \
541542
shapes/shapes_collision_area \
542543
shapes/shapes_colors_palette \
543544
shapes/shapes_digital_clock \
544545
shapes/shapes_double_pendulum \
545-
shapes/shapes_circle_sector_drawing \
546-
shapes/shapes_rounded_rectangle_drawing \
547546
shapes/shapes_easings_ball \
548547
shapes/shapes_easings_box \
549548
shapes/shapes_easings_rectangles \
@@ -554,6 +553,7 @@ SHAPES = \
554553
shapes/shapes_rectangle_advanced \
555554
shapes/shapes_rectangle_scaling \
556555
shapes/shapes_ring_drawing \
556+
shapes/shapes_rounded_rectangle_drawing \
557557
shapes/shapes_splines_drawing \
558558
shapes/shapes_top_down_lights
559559

@@ -606,7 +606,6 @@ MODELS = \
606606
models/models_bone_socket \
607607
models/models_box_collisions \
608608
models/models_cubicmap_rendering \
609-
models/models_textured_cube \
610609
models/models_first_person_maze \
611610
models/models_geometric_shapes \
612611
models/models_gpu_skinning \
@@ -622,6 +621,7 @@ MODELS = \
622621
models/models_rlgl_solar_system \
623622
models/models_skybox_rendering \
624623
models/models_tesseract_view \
624+
models/models_textured_cube \
625625
models/models_waving_cubes \
626626
models/models_yaw_pitch_roll
627627

@@ -630,6 +630,7 @@ SHADERS = \
630630
shaders/shaders_basic_pbr \
631631
shaders/shaders_custom_uniform \
632632
shaders/shaders_deferred_rendering \
633+
shaders/shaders_depth_rendering \
633634
shaders/shaders_eratosthenes_sieve \
634635
shaders/shaders_fog_rendering \
635636
shaders/shaders_hot_reloading \
@@ -653,7 +654,6 @@ SHADERS = \
653654
shaders/shaders_texture_tiling \
654655
shaders/shaders_texture_waves \
655656
shaders/shaders_vertex_displacement \
656-
shaders/shaders_depth_rendering \
657657
shaders/shaders_write_depth
658658

659659
AUDIO = \
@@ -793,6 +793,9 @@ shapes/shapes_basic_shapes: shapes/shapes_basic_shapes.c
793793
shapes/shapes_bouncing_ball: shapes/shapes_bouncing_ball.c
794794
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
795795

796+
shapes/shapes_circle_sector_drawing: shapes/shapes_circle_sector_drawing.c
797+
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
798+
796799
shapes/shapes_collision_area: shapes/shapes_collision_area.c
797800
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
798801

@@ -805,12 +808,6 @@ shapes/shapes_digital_clock: shapes/shapes_digital_clock.c
805808
shapes/shapes_double_pendulum: shapes/shapes_double_pendulum.c
806809
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
807810

808-
shapes/shapes_circle_sector_drawing: shapes/shapes_circle_sector_drawing.c
809-
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
810-
811-
shapes/shapes_rounded_rectangle_drawing: shapes/shapes_rounded_rectangle_drawing.c
812-
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
813-
814811
shapes/shapes_easings_ball: shapes/shapes_easings_ball.c
815812
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
816813

@@ -841,6 +838,9 @@ shapes/shapes_rectangle_scaling: shapes/shapes_rectangle_scaling.c
841838
shapes/shapes_ring_drawing: shapes/shapes_ring_drawing.c
842839
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
843840

841+
shapes/shapes_rounded_rectangle_drawing: shapes/shapes_rounded_rectangle_drawing.c
842+
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
843+
844844
shapes/shapes_splines_drawing: shapes/shapes_splines_drawing.c
845845
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
846846

@@ -1043,10 +1043,6 @@ models/models_cubicmap_rendering: models/models_cubicmap_rendering.c
10431043
--preload-file models/resources/cubicmap.png@resources/cubicmap.png \
10441044
--preload-file models/resources/cubicmap_atlas.png@resources/cubicmap_atlas.png
10451045

1046-
models/models_textured_cube: models/models_textured_cube.c
1047-
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1048-
--preload-file models/resources/cubicmap_atlas.png@resources/cubicmap_atlas.png
1049-
10501046
models/models_first_person_maze: models/models_first_person_maze.c
10511047
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
10521048
--preload-file models/resources/cubicmap.png@resources/cubicmap.png \
@@ -1116,6 +1112,10 @@ models/models_skybox_rendering: models/models_skybox_rendering.c
11161112
models/models_tesseract_view: models/models_tesseract_view.c
11171113
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
11181114

1115+
models/models_textured_cube: models/models_textured_cube.c
1116+
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1117+
--preload-file models/resources/cubicmap_atlas.png@resources/cubicmap_atlas.png
1118+
11191119
models/models_waving_cubes: models/models_waving_cubes.c
11201120
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
11211121

@@ -1157,6 +1157,10 @@ shaders/shaders_deferred_rendering: shaders/shaders_deferred_rendering.c
11571157
--preload-file shaders/resources/shaders/glsl100/deferred_shading.vs@resources/shaders/glsl100/deferred_shading.vs \
11581158
--preload-file shaders/resources/shaders/glsl100/deferred_shading.fs@resources/shaders/glsl100/deferred_shading.fs
11591159

1160+
shaders/shaders_depth_rendering: shaders/shaders_depth_rendering.c
1161+
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1162+
--preload-file shaders/resources/shaders/glsl100/depth.fs@resources/shaders/glsl100/depth.fs
1163+
11601164
shaders/shaders_eratosthenes_sieve: shaders/shaders_eratosthenes_sieve.c
11611165
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
11621166
--preload-file shaders/resources/shaders/glsl100/eratosthenes.fs@resources/shaders/glsl100/eratosthenes.fs
@@ -1245,7 +1249,7 @@ shaders/shaders_shadowmap_rendering: shaders/shaders_shadowmap_rendering.c
12451249
--preload-file shaders/resources/shaders/glsl100/shadowmap.vs@resources/shaders/glsl100/shadowmap.vs \
12461250
--preload-file shaders/resources/shaders/glsl100/shadowmap.fs@resources/shaders/glsl100/shadowmap.fs \
12471251
--preload-file shaders/resources/models/robot.glb@resources/models/robot.glb \
1248-
--preload-file shaders/shaders_shadowmap_rendering.png@shaders_shadowmap_rendering.png
1252+
--preload-file shaders/shaders_shadowmap.png@shaders_shadowmap.png
12491253

12501254
shaders/shaders_shapes_textures: shaders/shaders_shapes_textures.c
12511255
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
@@ -1287,10 +1291,6 @@ shaders/shaders_vertex_displacement: shaders/shaders_vertex_displacement.c
12871291
--preload-file shaders/resources/shaders/glsl100/vertex_displacement.vs@resources/shaders/glsl100/vertex_displacement.vs \
12881292
--preload-file shaders/resources/shaders/glsl100/vertex_displacement.fs@resources/shaders/glsl100/vertex_displacement.fs
12891293

1290-
shaders/shaders_depth_rendering: shaders/shaders_depth_rendering.c
1291-
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1292-
--preload-file shaders/resources/shaders/glsl100/depth.fs@resources/shaders/glsl100/depth.fs
1293-
12941294
shaders/shaders_write_depth: shaders/shaders_write_depth.c
12951295
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
12961296
--preload-file shaders/resources/shaders/glsl100/write_depth.fs@resources/shaders/glsl100/write_depth.fs

examples/models/models_animation_playing.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [models] example - animation
3+
* raylib [models] example - animation playing
44
*
55
* Example complexity rating: [★★☆☆] 2/4
66
*
@@ -33,7 +33,7 @@ int main(void)
3333
const int screenWidth = 800;
3434
const int screenHeight = 450;
3535

36-
InitWindow(screenWidth, screenHeight, "raylib [models] example - animation");
36+
InitWindow(screenWidth, screenHeight, "raylib [models] example - animation playing");
3737

3838
// Define the camera to look into our 3d world
3939
Camera camera = { 0 };

examples/models/models_cubicmap_rendering.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [models] example - cubicmap
3+
* raylib [models] example - cubicmap rendering
44
*
55
* Example complexity rating: [★★☆☆] 2/4
66
*
@@ -25,7 +25,7 @@ int main(void)
2525
const int screenWidth = 800;
2626
const int screenHeight = 450;
2727

28-
InitWindow(screenWidth, screenHeight, "raylib [models] example - cubicmap");
28+
InitWindow(screenWidth, screenHeight, "raylib [models] example - cubicmap rendering");
2929

3030
// Define the camera to look into our 3d world
3131
Camera camera = { 0 };

examples/models/models_heightmap_rendering.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [models] example - heightmap
3+
* raylib [models] example - heightmap rendering
44
*
55
* Example complexity rating: [★☆☆☆] 1/4
66
*
@@ -25,7 +25,7 @@ int main(void)
2525
const int screenWidth = 800;
2626
const int screenHeight = 450;
2727

28-
InitWindow(screenWidth, screenHeight, "raylib [models] example - heightmap");
28+
InitWindow(screenWidth, screenHeight, "raylib [models] example - heightmap rendering");
2929

3030
// Define our custom camera to look into our 3d world
3131
Camera camera = { 0 };

examples/models/models_textured_cube.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [models] example - draw cube texture
3+
* raylib [models] example - textured cube
44
*
55
* Example complexity rating: [★★☆☆] 2/4
66
*
@@ -33,7 +33,7 @@ int main(void)
3333
const int screenWidth = 800;
3434
const int screenHeight = 450;
3535

36-
InitWindow(screenWidth, screenHeight, "raylib [models] example - draw cube texture");
36+
InitWindow(screenWidth, screenHeight, "raylib [models] example - textured cube");
3737

3838
// Define the camera to look into our 3d world
3939
Camera camera = { 0 };

examples/shaders/shaders_deferred_rendering.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [shaders] example - deferred render
3+
* raylib [shaders] example - deferred rendering
44
*
55
* Example complexity rating: [★★★★] 4/4
66
*
@@ -67,7 +67,7 @@ int main(void)
6767
const int screenWidth = 800;
6868
const int screenHeight = 450;
6969

70-
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - deferred render");
70+
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - deferred rendering");
7171

7272
Camera camera = { 0 };
7373
camera.position = (Vector3){ 5.0f, 4.0f, 5.0f }; // Camera position

examples/shaders/shaders_depth_rendering.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [shaders] example - view depth
3+
* raylib [shaders] example - depth rendering
44
*
55
* Example complexity rating: [★★★☆] 3/4
66
*
@@ -36,7 +36,7 @@ int main(void)
3636
const int screenWidth = 800;
3737
const int screenHeight = 450;
3838

39-
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - view depth");
39+
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - depth rendering");
4040

4141
// Init camera
4242
Camera camera = { 0 };

examples/shaders/shaders_eratosthenes_sieve.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [shaders] example - eratosthenes
3+
* raylib [shaders] example - eratosthenes sieve
44
*
55
* Example complexity rating: [★★★☆] 3/4
66
*
@@ -45,7 +45,7 @@ int main(void)
4545
const int screenWidth = 800;
4646
const int screenHeight = 450;
4747

48-
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - eratosthenes");
48+
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - eratosthenes sieve");
4949

5050
RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight);
5151

examples/shaders/shaders_hybrid_rendering.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************************
22
*
3-
* raylib [shaders] example - hybrid render
3+
* raylib [shaders] example - hybrid rendering
44
*
55
* Example complexity rating: [★★★★] 4/4
66
*
@@ -55,7 +55,7 @@ int main(void)
5555
const int screenWidth = 800;
5656
const int screenHeight = 450;
5757

58-
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - hybrid render");
58+
InitWindow(screenWidth, screenHeight, "raylib [shaders] example - hybrid rendering");
5959

6060
// This Shader calculates pixel depth and color using raymarch
6161
Shader shdrRaymarch = LoadShader(0, TextFormat("resources/shaders/glsl%i/hybrid_raymarch.fs", GLSL_VERSION));

0 commit comments

Comments
 (0)