deltaphc · IoIxD · Dec 13, 2023 · Dec 13, 2023 · Dec 14, 2023 · Jun 2, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,8 +8,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -26,31 +26,7 @@ jobs:
         run: git submodule init; git submodule update
       - name: Install alsa, udev, glfw3, sdl, and wayland
         run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libglfw3-dev libwayland-dev libsdl2-dev
-      - name: Run doc tests with all features (this also compiles README examples)
-        run: cargo test --doc --all-features
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ubuntu-latest-cargo-build-stable-${{ hashFiles('**/Cargo.toml') }}
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
-      - name: Setup git submodules
-        run: git submodule init; git submodule update
-      - name: Install alsa, udev, glfw3, sdl, and wayland
-        run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libglfw3-dev libwayland-dev libsdl2-dev
-      - name: Run clippy
-        run: cargo clippy --workspace --all-targets --all-features
-      - name: Check format
-        run: cargo fmt --all -- --check
+      - name: Clone latest GLFW3
+        run: git clone https://github.com/glfw/glfw; cd glfw; mkdir build; cd build; cmake ..; make -j$(nproc); sudo make install; cd ../..;
+      - name: Run doc tests (this also compiles README examples)
+        run: cargo test --doc
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-/target
+target
 **/*.rs.bk
 Cargo.lock
 /.vscode

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "raylib-sys/raylib"]
 	path = raylib-sys/raylib
 	url = https://github.com/raysan5/raylib
+	commit = "5.5"
+	shallow = true
+[submodule "raylib-sys/binding/rlImGui"]
+	path = raylib-sys/binding/rlImGui
+	url = https://github.com/raylib-extras/rlImGui/
+	commit = "7864355"
diff --git a/README.md b/README.md
@@ -1,12 +1,3 @@
-<p align="center">
-
-![rust](https://img.shields.io/badge/rust-1.77+-orange.svg?style=flat-square&logo=rust)
-[![crates.io](https://img.shields.io/crates/v/raylib.svg?style=flat-square)](https://crates.io/crates/raylib)
-[![docs](https://docs.rs/raylib/badge.svg)](https://docs.rs/raylib)
-[![discord](https://img.shields.io/discord/426912293134270465)](https://discord.gg/VkzNHUE)
-
-</p>
-
 <table border="0">
 <tr>
 <td>
@@ -18,7 +9,7 @@
 
 # raylib-rs
 
-raylib-rs is a Rust binding for [raylib](http://www.raylib.com/) 5.0. It currently targets the _stable_ Rust toolchain, version 1.78 or higher.
+raylib-rs is a Rust binding for [raylib](http://www.raylib.com/) 5.5. It currently targets Rust toolchain version 1.78 or higher.
 
 Please checkout the showcase directory to find usage examples!
 
@@ -47,7 +38,6 @@ Most development happens over at: https://github.com/raylib-rs/raylib-rs
 | ------ | ------------------ | ------------------ | ------------------ | --------------     | ------- |
 | core   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:     |
 | rgui   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | ❔                 | :x:     |
-| physac | :construction:     | :construction:     | :construction:     | ❔                 | :x:     |
 | rlgl   | :heavy_check_mark: | :x:                | :x:                | ❔                 | :x:     |
 
 ## Build Dependencies
@@ -59,7 +49,7 @@ Follow instructions for building raylib for your platform [here](https://github.
 
 ```toml
 [dependencies]
-raylib = { version = "5.0" }
+raylib = { version = "5.5" }
 ```
 
 2. Start coding!
@@ -82,6 +72,18 @@ fn main() {
 }
 ```
 
+### NixOS
+
+To use raylib-rs on NixOS there's a provided nix-shell file `shell.nix` at the root of the repo that should get you up and running, which can be used like so:
+
+`nix-shell ./shell.nix`
+
+You'll also need to enable the Wayland feature on the raylib crate: 
+
+`cargo add raylib -F wayland`
+
+Contributions are welcome to improve or fix the shell.nix!
+
 # Tech Notes
 
 - Structs holding resources have RAII/move semantics, including: `Image`, `Texture2D`, `RenderTexture2D`, `Font`, `Mesh`, `Shader`, `Material`, and `Model`.
@@ -107,53 +109,7 @@ fn main() {
 
 ## Cross-compiling using `cross`
 
-The [@rust-embedded](https://github.com/rust-embedded) project provides a handy tool called [`cross`](https://github.com/rust-embedded/cross) that uses docker to cross-compile any cargo project to one of their many [supported platforms](https://github.com/rust-embedded/cross#supported-targets). This tool makes it easy to cross-compile `raylib-rs` for binary distribution (in cases where you are producing a pre-compiled game for example).
-
-### Anything to Windows
-
-Cross-compiling from other platforms to Windows is the simplest. Just build your project with this command instead of the usual `cargo build`:
-
-```sh
-cross build --target x86_64-pc-windows-gnu --release
-```
-
-It should be noted that the resulting exe will likely not run under `wine` due to an issue with Raylib's audio handling.
-
-### Anything to Linux
-
-Cross-compiling from any platform to Linux, or from Linux to Linux requires a little extra work since `raylib-sys` has some system dependencies not provided by `cross`. This following example assumes you are compiling for `x86_64-unknown-linux-gnu`, but it can be any Linux-y triple.
-
-Firstly, a custom build container must be defined. The following `Dockerfile` is the minimum setup for compiling `raylib-sys`:
-
-```Dockerfile
-FROM rustembedded/cross:x86_64-unknown-linux-gnu-0.2.1
-
-RUN apt-get update -y
-RUN apt-get install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev -y
-```
-
-With the image defined, build it locally with:
-
-```sh
-docker build -t raylib_rs_env .
-```
-
-This will produce a local docker image called `raylib_rs_env` which `cross` will use instead of the default Linux image(s). To tell `cross` to use this image, create a `Cross.toml` file beside your `Cargo.toml`, and add the following (remembering to change things to suit your setup):
-
-```toml
-[target.x86_64-unknown-linux-gnu]
-image = "raylib_rs_env"
-```
-
-The Linux build can now be produced with:
-
-```sh
-cross build --target x86_64-unknown-linux-gnu --release
-```
-
-# MacOS / Darwin / IOS
-
-`cross` does not support cross-compilation to any of Apple's operating systems as of now. Keep an eye on their repository in case this ever changes.
+Cross compiling with raylib-rs can be made easier with cross. [See more on the wiki](https://github.com/raylib-rs/raylib-rs/wiki/Cross%E2%80%90compiling-using-cross)
 
 # Extras
 
@@ -164,14 +120,6 @@ cross build --target x86_64-unknown-linux-gnu --release
 
 The raylib-test crate tests the bindings by opening a window, and checking the results of various functions. It requires nightly to use.
 
-# Future Goals
-
-- Port raylib examples over to Rust.
-- More tests.
-- More platform testing.
-- Even more testing.
-- Physac port?
-
 # Contribution & Support
 
 All contributions are welcome. Chat about raylib on [discord](https://discord.gg/VkzNHUE)
diff --git a/find_unimplemented.py b/find_unimplemented.py
@@ -0,0 +1,86 @@
+import os
+
+# Functions we won't implement.
+wont_impl = [
+    # We have this implemented in a C file so it's not caught.
+    "SetTraceLogCallback",
+    # UTF-8 functions
+    "GetCodepointNext",
+    "GetCodepointPrevious",
+    "CodepointToUTF8",
+    "LoadUTF8",
+    "UnloadUTF8",
+    # Text functions
+    "TextCopy",
+    "TextIsEqual",
+    "TextLength",
+    "TextFormat",
+    "TextSubtext",
+    "TextReplace",
+    "TextInsert",
+    "TextJoin",
+    "TextSplit",
+    "TextAppend",
+    "TextFindIndex",
+    "TextToUpper",
+    "TextToLower",
+    "TextToPascal",
+    "TextToSnake",
+    "TextToCamel",
+    "TextToInteger",
+    "TextToFloat",
+    # file functions
+    "LoadFileData",
+	"UnloadFileData",
+	"SaveFileData",
+	"LoadFileText",
+	"UnloadFileText",
+	"SaveFileText",
+	"FileExists",
+	"DirectoryExists",
+	"GetFileExtension",
+	"GetFileName",
+	"GetFileNameWithoutExt",
+	"GetDirectoryPath",
+	"GetPrevDirectoryPath",
+	"GetWorkingDirectory",
+	"MakeDirectory",
+	"ChangeDirectory",
+	"IsFileNameValid",
+	"GetFileModTime",
+	"ComputeCRC32",
+	"ComputeMD5",
+	"ComputeSHA1",
+    # Misc functions that aren't needed.
+    "MemRealloc",
+]
+
+
+def file_find(lib, src, dest, opener):
+    print("=====",lib,"=====")
+
+    files = os.scandir(dest)
+    src_files = []
+
+    for file in files:  
+        if file.is_file(follow_symlinks=True):
+            f = open(file.path)
+            src_files.append("\n".join(f.readlines()))
+
+    d = open(src)
+    lines = list(filter(lambda f: f.startswith(opener),d.readlines()))
+
+    for line in lines:
+        func_name = list(filter(lambda f: "(" in f, line.split(" ")))[0].split("(")[0].replace("*","")
+
+        in_a_file = False
+        for file in src_files:
+            if func_name in wont_impl or "ffi::"+func_name in file:
+                in_a_file = True
+                break
+        if not in_a_file:
+            print("- [ ] "+func_name)
+    print("")
+
+file_find("Raylib","./raylib-sys/raylib/src/raylib.h", "./raylib/src/core/", "RLAPI")
+file_find("Raygui","./raylib-sys/binding/raygui.h","./raylib/src/rgui", "    RAYGUIAPI")
diff --git a/raylib-sys/Cargo.toml b/raylib-sys/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "raylib-sys"
-version = "5.0.1"
-authors = ["DeltaPHC <phclem@protonmail.com>"]
+version = "5.5.1"
+authors = ["raylib-rs team <https://github.com/raylib-rs/raylib-rs>"]
 license = "Zlib"
 description = "Raw FFI bindings for Raylib"
 documentation = "https://docs.rs/raylib-sys"
@@ -11,25 +11,41 @@ categories = ["external-ffi-bindings"]
 edition = "2018"
 exclude = ["raylib/examples/*", "raylib/projects/*", "raylib/templates/*"]
 
+[dependencies]
+imgui = { version = "0.12.0", optional = true, features = [] }
+imgui-sys = { version = "0.12.0", optional = true }
+
 [build-dependencies]
-fs_extra = "1.2"
-cmake = "0.1.49"
+cmake = "0.1.51"
 cc = "1.0"
-bindgen = "0.69.0"
+bindgen = "0.70"
 
 [features]
-default = []
-# Build Raylib headless for docs. Up to you to link
-#nobuild = []
-
+# Build Raylib headless for docs/esoteric platforms. Up to you to link.
+nobuild = []
+# Generate bindings automatically.
+# You can turn this off if you wanna go into the source and put in your own bindings.rs, which is
+# useful since bindgen doesn't work on esoteric platforms.
+bindgen = []
 # Build for wayland on linux. Should fix #119
 wayland = []
+# Bindgen is default
+default = ["bindgen"]
 
 # OpenGL stuff, intended for fixing #122
 opengl_33 = []
 opengl_21 = []
 # opengl_11 = [] I couldn't get this one working, the others were fine in my limited testing (unsure about wayland compatibility)
 opengl_es_20 = []
+opengl_es_30 = []
+sdl = []
+
+# Allow disabling screenshots and gifs on f12
+noscreenshot = []
+nogif = []
 
 # config.h's SUPPORT_CUSTOM_FRAME_CONTROL
 custom_frame_control = []
+
+# ImGui support
+imgui = ["dep:imgui", "dep:imgui-sys"]
diff --git a/raylib-sys/binding/.gitattributes b/raylib-sys/binding/.gitattributes
@@ -0,0 +1,3 @@
+rlImGui/** linguist-vendored
+imgui/** linguist-vendored
+raygui.h linguist-vendored
diff --git a/raylib-sys/binding/binding.h b/raylib-sys/binding/binding.h
@@ -2,6 +2,7 @@
 #include "../raylib/src/rlgl.h"
 #include "utils_log.h"
 
+
 typedef enum
 {
     RAYGUI_ICON_NONE = 0,

diff --git a/raylib-sys/binding/imgui/decoy/imgui.h b/raylib-sys/binding/imgui/decoy/imgui.h
@@ -0,0 +1,11 @@
+/* Decoy imgui.h because bindgen can't actually (and shouldn't actually) bind a
+ * C++ file*/
+
+#ifndef IMGUI_DECOY
+#define IMGUI_DECOY
+
+#define IMGUI_IMPL_API
+typedef struct ImVec2 ImVec2;
+typedef struct ImGuiContext ImGuiContext;
+
+#endif