Added and reviewed raygui, add some missing impl Into and other smaller things.

TSnake41 · TSnake41 · commit c1695a855f61 · 2023-04-15T13:54:08.000+02:00
Raygui wasn't really safe, as it relied on "use after free" to be fine, this review made it less reliant on this undefined behavior.
diff --git a/raylib-sys/binding/binding.h b/raylib-sys/binding/binding.h
@@ -2,7 +2,6 @@
 #include "../raylib/src/rlgl.h"
 #include "../raylib/src/rcamera.h"
 
-#if 0
 #include "../raygui/src/raygui.h"
 
 typedef enum
@@ -263,5 +262,4 @@ typedef enum
     RAYGUI_ICON_253 = 253,
     RAYGUI_ICON_254 = 254,
     RAYGUI_ICON_255 = 255,
-} guiRAYGUI_ICONName;
-#endif
+} guiRAYGUI_ICONName;
diff --git a/raylib-sys/binding/rgui_wrapper.c b/raylib-sys/binding/rgui_wrapper.c
@@ -1,7 +1,7 @@
 #include "../raylib/src/raylib.h"
-//#define RAYGUI_IMPLEMENTATION
-//#define RAYGUI_SUPPORT_ICONS
+#define RAYGUI_IMPLEMENTATION
+#define RAYGUI_SUPPORT_ICONS
 #define RLGL_IMPLEMENTATION
 #define RLGL_SUPPORT_TRACELOG
-// #include "rlgl.h" // Don't include rlgl since it's in raylib
-//#include "raygui.h"
+#include "../raylib/src/rlgl.h" // Don't include rlgl since it's in raylib
+#include "../raygui/src/raygui.h"
diff --git a/raylib-sys/binding/wrapper.c b/raylib-sys/binding/wrapper.c
@@ -1,7 +1,5 @@
 #include "../raylib/src/raylib.h"
 
-#if 0
 #define RAYGUI_IMPLEMENTATION
 #define RAYGUI_SUPPORT_ICONS
-#include "../raygui/src/raygui.h"
-#endif
+#include "../raygui/src/raygui.h"
diff --git a/raylib-sys/build.rs b/raylib-sys/build.rs
@@ -189,7 +189,7 @@ fn gen_bindings() {
         .clang_arg("-I../raylib/src")
         .clang_arg("-std=c99")
         .clang_arg(plat);
-        //.parse_callbacks(Box::new(bindgen::CargoCallbacks));
+    //.parse_callbacks(Box::new(bindgen::CargoCallbacks));
 
     if platform == Platform::Desktop && os == PlatformOS::Windows {
         // odd workaround for booleans being broken
@@ -295,7 +295,7 @@ fn cp_raylib() -> String {
 
     let mut options = fs_extra::dir::CopyOptions::new();
     options.skip_exist = true;
-    fs_extra::dir::copy("raylib", &out, &options)
+    fs_extra::dir::copy("raylib", out, &options)
         .unwrap_or_else(|_| panic!("failed to copy raylib source to {}", out.to_string_lossy()));
 
     out.join("raylib").to_string_lossy().to_string()
@@ -307,7 +307,7 @@ fn cp_raygui() -> String {
 
     let mut options = fs_extra::dir::CopyOptions::new();
     options.skip_exist = true;
-    fs_extra::dir::copy("raygui", &out, &options)
+    fs_extra::dir::copy("raygui", out, &options)
         .unwrap_or_else(|_| panic!("failed to copy raygui source to {}", out.to_string_lossy()));
 
     out.join("raygui").to_string_lossy().to_string()
diff --git a/raylib-sys/raygui b/raylib-sys/raygui
@@ -0,0 +1 @@
+Subproject commit 1d9fd31074ce9ab06391e934cd4bc351475924d1
diff --git a/raylib-sys/src/camera.rs b/raylib-sys/src/camera.rs
@@ -1,6 +1,6 @@
 use std::mem::transmute;
 
-use super::{Matrix, Camera3D, CameraProjection};
+use super::{Camera3D, CameraProjection, Matrix};
 use mint::Vector3;
 
 impl Camera3D {
@@ -10,9 +10,9 @@ impl Camera3D {
     /// Create a perspective camera.
     /// fovy is in degrees
     pub fn perspective(
-        position: Vector3<f32>,
-        target: Vector3<f32>,
-        up: Vector3<f32>,
+        position: impl Into<Vector3<f32>>,
+        target: impl Into<Vector3<f32>>,
+        up: impl Into<Vector3<f32>>,
         fovy: f32,
     ) -> Camera3D {
         Camera3D {
@@ -26,9 +26,9 @@ impl Camera3D {
     /// Create a orthographic camera.
     /// fovy is in degrees
     pub fn orthographic(
-        position: Vector3<f32>,
-        target: Vector3<f32>,
-        up: Vector3<f32>,
+        position: impl Into<Vector3<f32>>,
+        target: impl Into<Vector3<f32>>,
+        up: impl Into<Vector3<f32>>,
         fovy: f32,
     ) -> Camera3D {
         let mut c = Self::perspective(position, target, up, fovy);
@@ -37,11 +37,11 @@ impl Camera3D {
     }
 
     pub fn forward(&self) -> Vector3<f32> {
-        unsafe { super::GetCameraForward(self as *const _ as *mut _).into() }
+        unsafe { super::GetCameraForward(self as *const _ as *mut _) }
     }
 
     pub fn up(&self) -> Vector3<f32> {
-        unsafe { super::GetCameraUp(self as *const _ as *mut _).into() }
+        unsafe { super::GetCameraUp(self as *const _ as *mut _) }
     }
 
     pub fn move_forward(&mut self, distance: f32, in_world_plane: bool) {
diff --git a/raylib-sys/src/color.rs b/raylib-sys/src/color.rs
@@ -70,13 +70,13 @@ impl Color {
     /// Returns color normalized as float [0..1]
     #[inline]
     pub fn color_normalize(&self) -> Vector4<f32> {
-        unsafe { crate::ColorNormalize(*self).into() }
+        unsafe { crate::ColorNormalize(*self) }
     }
 
     /// Returns HSV values for a Color
     #[inline]
     pub fn color_to_hsv(&self) -> Vector3<f32> {
-        unsafe { crate::ColorToHSV(*self).into() }
+        unsafe { crate::ColorToHSV(*self) }
     }
 
     /// Returns a Color from HSV values
@@ -90,7 +90,7 @@ impl Color {
     /// assert_eq!(Color::color_from_normalized(Vector4 { x: 1.0, y: 1.0, z: 1.0, w: 1.0 }), Color::new(255, 255, 255, 255));
     /// ```
     #[inline]
-    pub fn color_from_normalized(normalized: Vector4<f32>) -> Color {
+    pub fn color_from_normalized(normalized: impl Into<Vector4<f32>>) -> Color {
         unsafe { crate::ColorFromNormalized(normalized.into()) }
     }
 
diff --git a/raylib-sys/src/math.rs b/raylib-sys/src/math.rs
@@ -18,19 +18,18 @@ impl Rectangle {
 
     /// Checks collision between circle and rectangle.
     #[inline]
-    pub fn check_collision_circle_rec(&self, center: Vector2, radius: f32) -> bool {
+    pub fn check_collision_circle_rec(&self, center: impl Into<Vector2>, radius: f32) -> bool {
         unsafe { crate::CheckCollisionCircleRec(center.into(), radius, *self) }
     }
 
     /// Gets the overlap between two colliding rectangles.
     /// ```rust
     /// use raylib::prelude::*;
-    /// fn main() {
-    ///    let r1 = Rectangle::new(0.0, 0.0, 10.0, 10.0);
-    ///    let r2 = Rectangle::new(20.0, 20.0, 10.0, 10.0);
-    ///    assert_eq!(None, r1.get_collision_rec(&r2));
-    ///    assert_eq!(Some(r1), r1.get_collision_rec(&r1));
-    /// }
+    ///
+    /// let r1 = Rectangle::new(0.0, 0.0, 10.0, 10.0);
+    /// let r2 = Rectangle::new(20.0, 20.0, 10.0, 10.0);
+    /// assert_eq!(None, r1.get_collision_rec(&r2));
+    /// assert_eq!(Some(r1), r1.get_collision_rec(&r1));
     /// ```
     #[inline]
     pub fn get_collision_rec(&self, other: Rectangle) -> Option<Rectangle> {
@@ -40,7 +39,7 @@ impl Rectangle {
 
     /// Checks if point is inside rectangle.
     #[inline]
-    pub fn check_collision_point_rec(&self, point: Vector2) -> bool {
+    pub fn check_collision_point_rec(&self, point: impl Into<Vector2>) -> bool {
         unsafe { crate::CheckCollisionPointRec(point.into(), *self) }
     }
 }
@@ -54,7 +53,11 @@ impl BoundingBox {
 
     /// Detects collision between box and sphere.
     #[inline]
-    pub fn check_collision_box_sphere(&self, center_sphere: Vector3, radius_sphere: f32) -> bool {
+    pub fn check_collision_box_sphere(
+        &self,
+        center_sphere: impl Into<Vector3>,
+        radius_sphere: f32,
+    ) -> bool {
         unsafe { crate::CheckCollisionBoxSphere(*self, center_sphere.into(), radius_sphere) }
     }
 
diff --git a/raylib/src/audio.rs b/raylib/src/audio.rs
@@ -425,10 +425,8 @@ impl<'bind, 'a> AudioStream<'bind, 'a> {
     /// Updates audio stream buffers with data.
     #[inline]
     pub fn update_audio_stream<T: AudioSample>(&mut self, data: &[T]) {
-        assert_eq!(self.sampleSize as usize, core::mem::size_of::<T>() * 8);
+        assert_eq!(self.0.sampleSize as usize, core::mem::size_of::<T>() * 8);
 
-        unsafe {
-            ffi::UpdateAudioStream(self.0, data.as_ptr() as _, data.len() as i32);
-        }
+        unsafe { ffi::UpdateAudioStream(self.0, data.as_ptr() as _, data.len() as i32) }
     }
 }
diff --git a/raylib/src/core/camera.rs b/raylib/src/core/camera.rs
@@ -1,6 +1,6 @@
 //! Utility code for using Raylib [`Camera3D`] and [`Camera2D`]
 use super::RaylibHandle;
-use crate::ffi::{self, Vector3, Camera3D, CameraMode};
+use crate::ffi::{self, Camera3D, CameraMode, Vector3};
 
 impl RaylibHandle<'_> {
     /// Updates camera position for selected mode.
diff --git a/raylib/src/core/file.rs b/raylib/src/core/file.rs
@@ -2,8 +2,8 @@
 use core::slice;
 use std::ffi::CStr;
 
-use crate::ffi;
 use super::RaylibHandle;
+use crate::ffi;
 
 impl<'a> RaylibHandle<'a> {
     /// Checks if a file has been dropped into the window.
diff --git a/raylib/src/core/shaders.rs b/raylib/src/core/shaders.rs
@@ -239,7 +239,8 @@ pub trait RaylibShader: AsRef<ffi::Shader> + AsMut<ffi::Shader> {
     #[inline]
     fn get_shader_location_attrib(&self, attrib_name: &str) -> Option<i32> {
         let c_attrib_name = CString::new(attrib_name).ok()?;
-        let attrib = unsafe { ffi::GetShaderLocationAttrib(*self.as_ref(), c_attrib_name.as_ptr()) };
+        let attrib =
+            unsafe { ffi::GetShaderLocationAttrib(*self.as_ref(), c_attrib_name.as_ptr()) };
 
         (attrib >= 0).then_some(attrib)
     }
diff --git a/raylib/src/core/text.rs b/raylib/src/core/text.rs
@@ -230,18 +230,18 @@ impl<'a, 'bind> Font<'bind, 'a> {
     ) -> Result<Font<'bind, 'a>, String> {
         let f = unsafe {
             let mut f = std::mem::zeroed::<Font>();
-            f.baseSize = base_size;
+            f.0.baseSize = base_size;
             f.set_chars(chars);
 
             let atlas = ffi::GenImageFontAtlas(
-                f.glyphs,
+                f.0.glyphs,
                 &mut f.0.recs,
-                f.baseSize,
-                f.glyphCount,
+                f.0.baseSize,
+                f.0.glyphCount,
                 padding,
                 pack_method,
             );
-            f.texture = ffi::LoadTextureFromImage(atlas);
+            f.0.texture = ffi::LoadTextureFromImage(atlas);
             ffi::UnloadImage(atlas);
             f
         };
@@ -254,21 +254,21 @@ impl<'a, 'bind> Font<'bind, 'a> {
     /// Sets the character data on the current Font.
     pub fn set_chars(&mut self, chars: &[ffi::GlyphInfo]) {
         unsafe {
-            self.glyphCount = chars.len() as i32;
-            let data_size = self.glyphCount as usize * std::mem::size_of::<ffi::GlyphInfo>();
+            self.0.glyphCount = chars.len() as i32;
+            let data_size = self.0.glyphCount as usize * std::mem::size_of::<ffi::GlyphInfo>();
             let ci_arr_ptr = libc::malloc(data_size); // raylib frees this data in UnloadFont
             ptr::copy(
                 chars.as_ptr(),
                 ci_arr_ptr as *mut ffi::GlyphInfo,
                 chars.len(),
             );
-            self.glyphs = ci_arr_ptr as *mut ffi::GlyphInfo;
+            self.0.glyphs = ci_arr_ptr as *mut ffi::GlyphInfo;
         }
     }
 
     /// Sets the texture on the current Font, and takes ownership of `tex`.
     pub fn set_texture(&mut self, tex: Texture2D) {
-        self.texture = tex.0;
+        self.as_mut().texture = tex.0;
         std::mem::forget(tex); // UnloadFont will also unload the texture
     }
 }
diff --git a/raylib/src/core/texture.rs b/raylib/src/core/texture.rs
@@ -87,7 +87,7 @@ impl Image {
 
     #[inline]
     pub fn format(&self) -> PixelFormat {
-        let i: u32 = self.format as u32;
+        let i: u32 = self.0.format as u32;
         unsafe { std::mem::transmute(i) }
     }
 
@@ -123,7 +123,7 @@ impl Image {
     pub fn get_image_data(&self) -> RaylibBuffer<Color> {
         unsafe {
             let image_data = ffi::LoadImageColors(self.0);
-            let image_data_len = (self.width * self.height) as usize;
+            let image_data_len = (self.0.width * self.0.height) as usize;
 
             RaylibBuffer::new(image_data as _, image_data_len).unwrap()
         }
diff --git a/raylib/src/lib.rs b/raylib/src/lib.rs
@@ -54,12 +54,12 @@ Permission is granted to anyone to use this software for any purpose, including
 //!     }
 //! }
 //! ```
-pub mod core;
 pub mod audio;
 pub mod buffer;
+pub mod core;
 pub mod ease;
 pub mod prelude;
-//pub mod rgui;
+pub mod rgui;
 
 #[macro_use]
 pub(crate) mod macros;
@@ -69,4 +69,4 @@ pub mod ffi {
     pub use raylib_sys::*;
 }
 
-pub use crate::core::init;
+pub use crate::core::init;
diff --git a/raylib/src/macros.rs b/raylib/src/macros.rs
@@ -31,21 +31,6 @@ macro_rules! impl_wrapper {
             }
         }
 
-        impl std::ops::Deref for $name {
-            type Target = $t;
-            #[inline]
-            fn deref(&self) -> &Self::Target {
-                &self.$rawfield
-            }
-        }
-
-        impl std::ops::DerefMut for $name {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut Self::Target {
-                &mut self.$rawfield
-            }
-        }
-
         impl $name {
             /// returns the unwrapped raylib-sys object
             pub fn to_raw(self) -> $t {
@@ -97,21 +82,6 @@ macro_rules! impl_wrapper_bounded {
             }
         }
 
-        impl<'bind, $lt> std::ops::Deref for $name<'bind, $lt> {
-            type Target = $t;
-            #[inline]
-            fn deref(&self) -> &Self::Target {
-                &self.$rawfield
-            }
-        }
-
-        impl<'bind, $lt> std::ops::DerefMut for $name<'bind, $lt> {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut Self::Target {
-                &mut self.$rawfield
-            }
-        }
-
         impl<'bind, $lt> $name<'bind, $lt> {
             /// returns the unwrapped raylib-sys object
             pub fn to_raw(self) -> $t {
@@ -146,8 +116,8 @@ macro_rules! make_bound_thin_wrapper {
     ($name:ident, $t:ty, $dropfunc:expr, $binding:ty) => {
         #[repr(transparent)]
         #[derive(Debug)]
-        pub struct $name<'bind: 'a, 'a>(pub(crate) $t, pub std::marker::PhantomData<&'a Self>, pub std::marker::PhantomData<&'bind $binding>);
+        pub struct $name<'bind: 'a, 'a>(pub(crate) $t, pub(crate) std::marker::PhantomData<&'a Self>, pub(crate) std::marker::PhantomData<&'bind $binding>);
 
         crate::impl_wrapper_bounded!($name, $t, $dropfunc, 0, 'a);
     };
-}
+}
diff --git a/raylib/src/rgui/safe.rs b/raylib/src/rgui/safe.rs

Original file line number	Diff line number	Diff line change
`@@ -425,10 +425,8 @@ impl<'bind, 'a> AudioStream<'bind, 'a> {`
`425`	`425`	`/// Updates audio stream buffers with data.`
`426`	`426`	`#[inline]`
`427`	`427`	`pub fn update_audio_stream<T: AudioSample>(&mut self, data: &[T]) {`
`428`		`- assert_eq!(self.sampleSize as usize, core::mem::size_of::<T>() * 8);`
	`428`	`+ assert_eq!(self.0.sampleSize as usize, core::mem::size_of::<T>() * 8);`
`429`	`429`
`430`		`- unsafe {`
`431`		`- ffi::UpdateAudioStream(self.0, data.as_ptr() as _, data.len() as i32);`
`432`		`- }`
	`430`	`+ unsafe { ffi::UpdateAudioStream(self.0, data.as_ptr() as _, data.len() as i32) }`
`433`	`431`	`}`
`434`	`432`	`}`