Refactoring.

Author: interkosmos

Makefile

@@ -21,11 +21,14 @@ $(TARGET): src/raylib.f90 src/raylib_util.f90
 	$(FC) $(FFLAGS) -c src/raylib_util.f90
 	$(AR) $(ARFLAGS) $(TARGET) raylib.o raylib_camera.o raylib_math.o raylib_util.o
 
-examples: camera castle cubes flags fly font keys map truck window
+examples: camera castle cubes flags camera3d font keys map truck window
 
 camera: $(TARGET) examples/camera.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o camera examples/camera.f90 $(TARGET) $(LDLIBS)
 
+camera3d: $(TARGET) examples/camera3d.f90
+	$(FC) $(FFLAGS) $(LDFLAGS) -o camera3d examples/camera3d.f90 $(TARGET) $(LDLIBS)
+
 castle: $(TARGET) examples/castle.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o castle examples/castle.f90 $(TARGET) $(LDLIBS)
 
@@ -35,9 +38,6 @@ cubes: $(TARGET) examples/cubes.f90
 flags: $(TARGET) examples/flags.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o flags examples/flags.f90 $(TARGET) $(LDLIBS)
 
-fly: $(TARGET) examples/fly.f90
-	$(FC) $(FFLAGS) $(LDFLAGS) -o fly examples/fly.f90 $(TARGET) $(LDLIBS)
-
 font: $(TARGET) examples/font.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o font examples/font.f90 $(TARGET) $(LDLIBS)
 
@@ -58,11 +58,12 @@ clean:
 	if [ `ls -1 *.o 2>/dev/null | wc -l` -gt 0 ];   then rm *.o; fi
 	if [ -e $(TARGET) ]; then rm $(TARGET); fi
 	if [ -e camera ]; then rm camera; fi
+	if [ -e camera3d ]; then rm camera3d; fi
 	if [ -e castle ]; then rm castle; fi
-	if [ -e cubes ];  then rm cubes; fi
-	if [ -e flags ];  then rm flags; fi
-	if [ -e fly ];    then rm fly; fi
-	if [ -e keys ];   then rm keys; fi
-	if [ -e map ];    then rm map; fi
-	if [ -e truck ];  then rm truck; fi
+	if [ -e cubes ]; then rm cubes; fi
+	if [ -e flags ]; then rm flags; fi
+	if [ -e font ]; then rm font; fi
+	if [ -e keys ]; then rm keys; fi
+	if [ -e map ]; then rm map; fi
+	if [ -e truck ]; then rm truck; fi
 	if [ -e window ]; then rm window; fi

README.md

@@ -94,10 +94,10 @@ $ ./example
 More examples can be found in `examples/`:
 
 * **camera** renders a cube in 3-D.
+* **camera3d** renders a 3-D scene, with keyboard and mouse controls.
 * **castle** renders a 3-D model loaded from file.
 * **cubes** renders waving cubes.
 * **flags** shows window flags.
-* **fly** renders a 3-D scene, with keyboard and mouse controls.
 * **font** displays text using bitmap fonts.
 * **keys** demonstrates keyboard input.
 * **map** renders a height map.

examples/fly.f90 renamed to examples/camera3d.f90

@@ -1,4 +1,4 @@
-! fly.f90
+! camera3d.f90
 !
 ! Example program that shows a 3-D scene from first-person. Based on the raylib
 ! example `core_3d_camera_first_person.c`.

examples/font.f90

@@ -26,14 +26,14 @@ program main
     call set_target_fps(60)
 
     fonts = [ &
-        load_font('share/alagard.png' // c_null_char), &
-        load_font('share/pixelplay.png' // c_null_char), &
-        load_font('share/mecha.png' // c_null_char), &
-        load_font('share/setback.png' // c_null_char), &
-        load_font('share/romulus.png' // c_null_char), &
-        load_font('share/pixantiqua.png' // c_null_char), &
-        load_font('share/alpha_beta.png' // c_null_char), &
-        load_font('share/jupiter_crash.png' // c_null_char) &
+        load_font('share/fonts/alagard.png' // c_null_char), &
+        load_font('share/fonts/pixelplay.png' // c_null_char), &
+        load_font('share/fonts/mecha.png' // c_null_char), &
+        load_font('share/fonts/setback.png' // c_null_char), &
+        load_font('share/fonts/romulus.png' // c_null_char), &
+        load_font('share/fonts/pixantiqua.png' // c_null_char), &
+        load_font('share/fonts/alpha_beta.png' // c_null_char), &
+        load_font('share/fonts/jupiter_crash.png' // c_null_char) &
     ]
 
     messages = [ character(len=72) :: &

fpm.toml

@@ -21,6 +21,11 @@ name = "camera"
 source-dir = "examples"
 main = "camera.f90"
 
+[[executable]]
+name = "camera3d"
+source-dir = "examples"
+main = "camera3d.f90"
+
 [[executable]]
 name = "castle"
 source-dir = "examples"
@@ -36,11 +41,6 @@ name = "flags"
 source-dir = "examples"
 main = "flags.f90"
 
-[[executable]]
-name = "fly"
-source-dir = "examples"
-main = "fly.f90"
-
 [[executable]]
 name = "font"
 source-dir = "examples"