Skip to content

Commit 4f9b933

Browse files
committed
REXM: Update examples; text_unicode_emojis requires additional resources on Web
1 parent ca33d49 commit 4f9b933

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

examples/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,14 @@ TEXT = \
604604
text/text_writing_anim
605605

606606
MODELS = \
607+
models/models_animation_gpu_skinning \
607608
models/models_animation_playing \
608609
models/models_billboard_rendering \
609610
models/models_bone_socket \
610611
models/models_box_collisions \
611612
models/models_cubicmap_rendering \
612613
models/models_first_person_maze \
613614
models/models_geometric_shapes \
614-
models/models_animation_gpu_skinning \
615615
models/models_heightmap_rendering \
616616
models/models_loading \
617617
models/models_loading_gltf \

examples/Makefile.Web

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,14 @@ TEXT = \
604604
text/text_writing_anim
605605

606606
MODELS = \
607+
models/models_animation_gpu_skinning \
607608
models/models_animation_playing \
608609
models/models_billboard_rendering \
609610
models/models_bone_socket \
610611
models/models_box_collisions \
611612
models/models_cubicmap_rendering \
612613
models/models_first_person_maze \
613614
models/models_geometric_shapes \
614-
models/models_animation_gpu_skinning \
615615
models/models_heightmap_rendering \
616616
models/models_loading \
617617
models/models_loading_gltf \
@@ -1019,8 +1019,11 @@ text/text_sprite_fonts: text/text_sprite_fonts.c
10191019
text/text_unicode_emojis: text/text_unicode_emojis.c
10201020
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
10211021
--preload-file text/resources/dejavu.fnt@resources/dejavu.fnt \
1022+
--preload-file text/resources/dejavu.png@resources/dejavu.png \
10221023
--preload-file text/resources/noto_cjk.fnt@resources/noto_cjk.fnt \
1023-
--preload-file text/resources/symbola.fnt@resources/symbola.fnt
1024+
--preload-file text/resources/noto_cjk.png@resources/noto_cjk.png \
1025+
--preload-file text/resources/symbola.fnt@resources/symbola.fnt \
1026+
--preload-file text/resources/symbola.png@resources/symbola.png
10241027

10251028
text/text_unicode_ranges: text/text_unicode_ranges.c
10261029
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
@@ -1030,6 +1033,12 @@ text/text_writing_anim: text/text_writing_anim.c
10301033
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
10311034

10321035
# Compile MODELS examples
1036+
models/models_animation_gpu_skinning: models/models_animation_gpu_skinning.c
1037+
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1038+
--preload-file models/resources/models/gltf/greenman.glb@resources/models/gltf/greenman.glb \
1039+
--preload-file models/resources/shaders/glsl100/skinning.vs@resources/shaders/glsl100/skinning.vs \
1040+
--preload-file models/resources/shaders/glsl100/skinning.fs@resources/shaders/glsl100/skinning.fs
1041+
10331042
models/models_animation_playing: models/models_animation_playing.c
10341043
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
10351044
--preload-file models/resources/models/iqm/guy.iqm@resources/models/iqm/guy.iqm \
@@ -1063,12 +1072,6 @@ models/models_first_person_maze: models/models_first_person_maze.c
10631072
models/models_geometric_shapes: models/models_geometric_shapes.c
10641073
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM)
10651074

1066-
models/models_animation_gpu_skinning: models/models_animation_gpu_skinning.c
1067-
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
1068-
--preload-file models/resources/models/gltf/greenman.glb@resources/models/gltf/greenman.glb \
1069-
--preload-file models/resources/shaders/glsl100/skinning.vs@resources/shaders/glsl100/skinning.vs \
1070-
--preload-file models/resources/shaders/glsl100/skinning.fs@resources/shaders/glsl100/skinning.fs
1071-
10721075
models/models_heightmap_rendering: models/models_heightmap_rendering.c
10731076
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) \
10741077
--preload-file models/resources/heightmap.png@resources/heightmap.png

examples/text/text_unicode_emojis.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ int main(void)
169169
// Load the font resources
170170
// NOTE: fontAsian is for asian languages,
171171
// fontEmoji is the emojis and fontDefault is used for everything else
172-
Font fontDefault = LoadFont("resources/dejavu.fnt");
173-
Font fontAsian = LoadFont("resources/noto_cjk.fnt");
174-
Font fontEmoji = LoadFont("resources/symbola.fnt");
172+
Font fontDefault = LoadFont("resources/dejavu.fnt"); // Requires "resources/dejavu.png"
173+
Font fontAsian = LoadFont("resources/noto_cjk.fnt"); // Requires "resources/noto_cjk.png"
174+
Font fontEmoji = LoadFont("resources/symbola.fnt"); // Requires "resources/symbola.png"
175175

176176
Vector2 hoveredPos = { 0.0f, 0.0f };
177177
Vector2 selectedPos = { 0.0f, 0.0f };

tools/rexm/examples_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Example elements validated:
137137
| models_heightmap_rendering |||||||||||||||
138138
| models_skybox_rendering |||||||||||||||
139139
| models_textured_cube |||||||||||||||
140-
| models_gpu_skinning |||||||||||||||
140+
| models_animation_gpu_skinning |||||||||||||||
141141
| models_bone_socket |||||||||||||||
142142
| models_tesseract_view |||||||||||||||
143143
| shaders_basic_lighting |||||||||||||||

0 commit comments

Comments
 (0)