Updated to raylib 5.5.

Author: interkosmos

Makefile

@@ -3,11 +3,11 @@
 
 FC      = gfortran
 AR      = ar
-FFLAGS  = -g -std=f2018 -Wall -Wno-conversion -fmax-errors=1 -fno-range-check
+FFLAGS  = -O2 -std=f2018 -Wall -Wno-conversion -fmax-errors=1 -fno-range-check
 ARFLAGS = rcs
-LDFLAGS = -L/usr/local/lib/ -I./include/
+LDFLAGS = -L/usr/local/lib
 RAYLIB  = -lraylib
-LDLIBS  = $(RAYLIB) -lGL -lpthread -lm
+LDLIBS  = $(RAYLIB) -lglfw -lGL -lpthread -lm
 TARGET  = libfortran-raylib.a
 
 .PHONY: all clean examples
@@ -21,8 +21,8 @@ $(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: bunny camera camera3d castle collision cubes explosion flags font geometric julia keys \
-          log map maze plane shapes truck window
+examples: bunny camera camera3d castle collision cubes explosion flags font \
+          geometric julia keys log map maze plane shapes ship window
 
 bunny: $(TARGET) examples/bunny.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o bunny examples/bunny.f90 $(TARGET) $(LDLIBS)
@@ -75,8 +75,8 @@ plane: $(TARGET) examples/plane.f90
 shapes: $(TARGET) examples/shapes.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o shapes examples/shapes.f90 $(TARGET) $(LDLIBS)
 
-truck: $(TARGET) examples/truck.f90
-	$(FC) $(FFLAGS) $(LDFLAGS) -o truck examples/truck.f90 $(TARGET) $(LDLIBS)
+ship: $(TARGET) examples/ship.f90
+	$(FC) $(FFLAGS) $(LDFLAGS) -o ship examples/ship.f90 $(TARGET) $(LDLIBS)
 
 window: $(TARGET) examples/window.f90
 	$(FC) $(FFLAGS) $(LDFLAGS) -o window examples/window.f90 $(TARGET) $(LDLIBS)
@@ -102,5 +102,5 @@ clean:
 	if [ -e maze ]; then rm maze; fi
 	if [ -e plane ]; then rm plane; fi
 	if [ -e shapes ]; then rm shapes; fi
-	if [ -e truck ]; then rm truck; fi
+	if [ -e ship ]; then rm ship; fi
 	if [ -e window ]; then rm window; fi

README.md

@@ -1,21 +1,22 @@
 # fortran-raylib
 
 A work-in-progress collection of interface bindings to
-[raylib](https://www.raylib.com/) 4.5/4.6/5.0/5.1, for 2-D and 3-D game
-programming in Fortran 2018.
+[raylib](https://www.raylib.com/) 5.5, for 2-D and 3-D game programming in
+Fortran 2018.
 
 ## Build Instructions
 
 Install the raylib package suitable for your operating system, or build from
-[source](https://github.com/raysan5/raylib/releases/tag/5.0):
+[source](https://github.com/raysan5/raylib/releases/tag/5.5):
 
 ```
-$ cd raylib-5.0/
+$ cd raylib-5.5/
 $ mkdir build && cd build/
 $ cmake ..
 $ make PLATFORM=PLATFORM_DESKTOP
+$ make install
 ```
-Select platform `PLATFORM_DESKTOP_SDL` for the SDL 2.0 backend instead:
+Select platform `PLATFORM_DESKTOP_SDL` for the SDL 2.0 back-end:
 
 ```
 $ make PLATFORM=PLATFORM_DESKTOP_SDL
@@ -64,7 +65,7 @@ additional platform-dependent libraries:
 
 | System          | Linker Libraries                                                                                         |
 |-----------------|----------------------------------------------------------------------------------------------------------|
-| FreeBSD         | `-lraylib -lGL -lpthread -lm`                                                                     |
+| FreeBSD         | `-lraylib -lglfw -lGL -lpthread -lm`                                                                     |
 | Linux           | `-lraylib -lGL -lm -lpthread -ldl -lrt -lX11`                                                            |
 | Linux (Wayland) | `-lraylib -lGL -lm -lpthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon`      |
 | macOS           | `-lraylib -framework OpenGL -framework Cocoa -framework IOKit -framework CoreAudio -framework CoreVideo` |
@@ -102,11 +103,13 @@ end program main
 Compile and link the example program:
 
 ```
-$ gfortran -L/usr/local/lib -I/usr/local/include -o example example.f90 \
-  libfortran-raylib.a -lraylib -lGL -lpthread -lm
+$ gfortran -L/usr/local/lib -o example example.f90 libfortran-raylib.a -lraylib -lGL -lpthread -lm
 $ ./example
 ```
 
+Depending on the build flags chosen for *raylib*, you may have to link with
+`-lglfw` additionally.
+
 ## Further Examples
 
 More examples can be found in `examples/`:
@@ -128,7 +131,7 @@ More examples can be found in `examples/`:
 * **maze** renders a 3-D maze in first-person view.
 * **plane** demonstrates pitch/yaw/roll of a 3-D model.
 * **shapes** renders basic shapes.
-* **truck** rotates a 3-D model loaded from file.
+* **ship** rotates a 3-D model loaded from file.
 * **window** opens a window with raylib.
 
 Build all examples with:
@@ -147,7 +150,7 @@ $ make examples RAYLIB=libraylib.a
 
 Some issues have to be regarded when calling raylib from Fortran:
 
-* Model loading is broken in raylib 5.0
+* Loading models in Wavefront OBJ format is broken since raylib 5.0
   ([issue](https://github.com/raysan5/raylib/issues/3576)).
 * All procedure names and dummy arguments have been converted to snake case.
 * As Fortran does not feature unsigned data types, use the compiler flag
@@ -161,7 +164,7 @@ Some issues have to be regarded when calling raylib from Fortran:
 * If a function returns `type(c_ptr)`, the result has to be converted to a
   Fortran pointer with the intrinsic subroutine `c_f_pointer()` first. C char
   pointers may be converted with utility subroutine `c_f_str_ptr()` from module
-  `raylib_util`.
+  `raylib_util`, or the intrinsic `c_f_strpointer()` (Fortran 2023).
 
 ## Licence
 

examples/castle.f90

@@ -63,7 +63,8 @@ subroutine set_model_diffuse(model, texture)
         type(material_map_type), pointer :: material_map_ptrs(:)
 
         ! We have to add 1 to the array indices as a work-around, as we can't set
-        ! the lower bounds of the pointer arrays with `c_f_pointer()`.
+        ! the lower bounds of the pointer arrays with `c_f_pointer()` yet
+        ! (new Fortran 2023 feature).
         call c_f_pointer(model%materials, material_ptrs, [ model%material_count ])
         call c_f_pointer(material_ptrs(1)%maps, material_map_ptrs, [ MATERIAL_MAP_BRDF + 1 ])
         material_map_ptrs(MATERIAL_MAP_DIFFUSE + 1)%texture = texture

examples/map.f90

@@ -72,7 +72,8 @@ subroutine set_model_diffuse(model, texture)
         type(material_map_type), pointer :: material_map_ptrs(:)
 
         ! We have to add 1 to the array indices as a work-around, as we can't set
-        ! the lower bounds of the pointer arrays with `c_f_pointer()`.
+        ! the lower bounds of the pointer arrays with `c_f_pointer()` yet
+        ! (new Fortran 2023 feature).
         call c_f_pointer(model%materials, material_ptrs, [ model%material_count ])
         call c_f_pointer(material_ptrs(1)%maps, material_map_ptrs, [ MATERIAL_MAP_BRDF + 1 ])
         material_map_ptrs(MATERIAL_MAP_DIFFUSE + 1)%texture = texture

examples/truck.f90 renamed to examples/ship.f90

@@ -1,9 +1,9 @@
-! truck.f90
+! ship.f90
 !
 ! Example program that rotates a 3-D model loaded from file. Enables VSync and
 ! MSAA4.
 !
-! Model (CC0) source: https://kenney.nl/assets/car-kit
+! Model (CC0) source: https://opengameart.org/content/lowpoly-ship-pack
 !
 ! Author:  Philipp Engel
 ! Licence: ISC
@@ -33,7 +33,7 @@ program main
     camera%fov_y      = 45.0
     camera%projection = CAMERA_PERSPECTIVE
 
-    model = load_model('share/truck.obj' // c_null_char)
+    model = load_model('share/ship.glb' // c_null_char)
 
     angle    = 0.0
     rotation = vector3_type(0.0, 1.0, 0.0)

fpm.toml

@@ -8,7 +8,7 @@ description = "Fortran 2018 ISO C binding interfaces to raylib"
 keywords = [ "graphics", "raylib" ]
 
 [build]
-link = [ "raylib", "GL", "pthread", "m" ]
+link = [ "raylib", "glfw", "GL", "pthread", "m" ]
 
 [library]
 source-dir = "src"
@@ -103,8 +103,8 @@ main = "shapes.f90"
 
 [[executable]]
 source-dir = "examples"
-name = "truck"
-main = "truck.f90"
+name = "ship"
+main = "ship.f90"
 
 [[executable]]
 source-dir = "examples"