tweaks

Author: Bigfoot71

include/AudioDevice.hpp

@@ -18,7 +18,7 @@ class AudioDevice {
      *
      * @throws raylib::RaylibException Throws if the AudioDevice failed to initialize.
      */
-    AudioDevice(bool lateInit = false) {
+    explicit AudioDevice(bool lateInit = false) {
         if (!lateInit) {
             Init();
         }
@@ -34,7 +34,7 @@ class AudioDevice {
      *
      * @throws raylib::RaylibException Throws if the AudioDevice failed to initialize.
      */
-    void Init() {
+    static void Init()  {
         ::InitAudioDevice();
         if (!IsReady()) {
             throw RaylibException("Failed to initialize AudioDevice");
@@ -44,12 +44,12 @@ class AudioDevice {
     /**
      * Close the audio device and context.
      */
-    void Close() { ::CloseAudioDevice(); }
+    static void Close() { ::CloseAudioDevice(); }
 
     /**
      * Check if audio device has been initialized successfully.
      */
-    bool IsReady() const { return ::IsAudioDeviceReady(); }
+    static bool IsReady()  { return ::IsAudioDeviceReady(); }
 
     /**
      * Set master volume (listener).

include/AudioStream.hpp

@@ -11,7 +11,9 @@ namespace raylib {
  */
 class AudioStream : public ::AudioStream {
 public:
-    AudioStream(const ::AudioStream& music) { set(music); }
+    AudioStream(const ::AudioStream& music)
+        : ::AudioStream(music)
+    { }
 
     AudioStream(
         rAudioBuffer* buffer = nullptr,
@@ -34,7 +36,7 @@ class AudioStream : public ::AudioStream {
 
     AudioStream(const AudioStream&) = delete;
 
-    AudioStream(AudioStream&& other) {
+    AudioStream(AudioStream&& other) noexcept {
         set(other);
 
         other.buffer = nullptr;
@@ -96,7 +98,7 @@ class AudioStream : public ::AudioStream {
     /**
      * Check if any audio stream buffers requires refill
      */
-    bool IsProcessed() const { return ::IsAudioStreamProcessed(*this); }
+    [[nodiscard]] bool IsProcessed() const { return ::IsAudioStreamProcessed(*this); }
 
     /**
      * Play audio stream
@@ -125,7 +127,7 @@ class AudioStream : public ::AudioStream {
     /**
      * Check if audio stream is playing
      */
-    bool IsPlaying() const { return ::IsAudioStreamPlaying(*this); }
+    [[nodiscard]] bool IsPlaying() const { return ::IsAudioStreamPlaying(*this); }
 
     /**
      * Stop audio stream
@@ -182,7 +184,7 @@ class AudioStream : public ::AudioStream {
     /**
      * Retrieve whether or not the audio stream is ready.
      */
-    bool IsValid() const { return ::IsAudioStreamValid(*this); }
+    [[nodiscard]] bool IsValid() const { return ::IsAudioStreamValid(*this); }
 
     /**
      * Load audio stream (to stream raw audio pcm data)

include/AutomationEventList.hpp

@@ -4,14 +4,18 @@
 #include "./RaylibException.hpp"
 #include "./raylib-cpp-utils.hpp"
 #include "./raylib.hpp"
+#include <raylib.h>
 
 namespace raylib {
 /**
  * AutomationEventList management functions
  */
 class AutomationEventList : public ::AutomationEventList {
 public:
-    AutomationEventList(const ::AutomationEventList& automationEventList) { set(automationEventList); }
+    AutomationEventList(const ::AutomationEventList& automationEventList)
+        : ::AutomationEventList(automationEventList) {
+        // Nothing.
+    }
 
     /**
      * Load an empty automation events list.

include/BoundingBox.hpp

@@ -41,17 +41,17 @@ class BoundingBox : public ::BoundingBox {
     /**
      * Detect collision between two boxes
      */
-    bool CheckCollision(const ::BoundingBox& box2) const { return CheckCollisionBoxes(*this, box2); }
+    [[nodiscard]] bool CheckCollision(const ::BoundingBox& box2) const { return CheckCollisionBoxes(*this, box2); }
 
     /**
      * Detect collision between box and sphere
      */
-    bool CheckCollision(::Vector3 center, float radius) const { return CheckCollisionBoxSphere(*this, center, radius); }
+    [[nodiscard]] bool CheckCollision(::Vector3 center, float radius) const { return CheckCollisionBoxSphere(*this, center, radius); }
 
     /**
      * Detect collision between ray and bounding box
      */
-    bool CheckCollision(const ::Ray& ray) const { return GetRayCollisionBox(ray, *this).hit; }
+    [[nodiscard]] bool CheckCollision(const ::Ray& ray) const { return GetRayCollisionBox(ray, *this).hit; }
 
     /**
      * Get collision information between ray and bounding box

include/Camera2D.hpp

@@ -11,9 +11,12 @@ namespace raylib {
  */
 class Camera2D : public ::Camera2D {
 public:
-    Camera2D(const ::Camera2D& camera) { set(camera); }
+    Camera2D(const ::Camera2D& camera)
+        : ::Camera2D(camera) {
+        // Nothing.
+    }
 
-    Camera2D() {}
+    Camera2D() : ::Camera2D() {}
     Camera2D(::Vector2 offset, ::Vector2 target, float rotation = 0.0f, float zoom = 1.0f)
         : ::Camera2D{offset, target, rotation, zoom} {}
 
@@ -40,17 +43,17 @@ class Camera2D : public ::Camera2D {
     /**
      * Returns camera 2d transform matrix
      */
-    Matrix GetMatrix() const { return ::GetCameraMatrix2D(*this); }
+    [[nodiscard]] Matrix GetMatrix() const { return ::GetCameraMatrix2D(*this); }
 
     /**
      * Returns the world space position for a 2d camera screen space position
      */
-    Vector2 GetScreenToWorld(::Vector2 position) const { return ::GetScreenToWorld2D(position, *this); }
+    [[nodiscard]] Vector2 GetScreenToWorld(::Vector2 position) const { return ::GetScreenToWorld2D(position, *this); }
 
     /**
      * Returns the screen space position for a 2d world space position
      */
-    Vector2 GetWorldToScreen(::Vector2 position) const { return ::GetWorldToScreen2D(position, *this); }
+    [[nodiscard]] Vector2 GetWorldToScreen(::Vector2 position) const { return ::GetWorldToScreen2D(position, *this); }
 protected:
     void set(const ::Camera2D& camera) {
         offset = camera.offset;

include/Camera3D.hpp

@@ -11,7 +11,7 @@ namespace raylib {
  */
 class Camera3D : public ::Camera3D {
 public:
-    Camera3D(const ::Camera3D& camera) { set(camera); }
+    Camera3D(const ::Camera3D& camera) : ::Camera3D(camera) { }
 
     /**
      * Create a new Camera3D.

include/Color.hpp

@@ -36,43 +36,43 @@ class Color : public ::Color {
     /**
      * Get Color structure from hexadecimal value
      */
-    Color(unsigned int hexValue) { set(::GetColor(hexValue)); }
+    explicit Color(unsigned int hexValue) : ::Color(::GetColor(hexValue)) { }
 
-    Color(void* srcPtr, int format) { set(::GetPixelColor(srcPtr, format)); }
+    Color(void* srcPtr, int format) : ::Color(::GetPixelColor(srcPtr, format)) { }
 
     /**
      * Returns hexadecimal value for a Color
      */
-    int ToInt() const { return ::ColorToInt(*this); }
+    [[nodiscard]] int ToInt() const { return ::ColorToInt(*this); }
 
     /**
      * Returns hexadecimal value for a Color
      */
-    operator int() const { return ::ColorToInt(*this); }
+    explicit operator int() const { return ::ColorToInt(*this); }
 
-    std::string ToString() const { return TextFormat("Color(%d, %d, %d, %d)", r, g, b, a); }
+    [[nodiscard]] std::string ToString() const { return TextFormat("Color(%d, %d, %d, %d)", r, g, b, a); }
 
-    operator std::string() const { return ToString(); }
+    explicit operator std::string() const { return ToString(); }
 
     /**
      * Returns color with alpha applied, alpha goes from 0.0f to 1.0f
      */
-    Color Fade(float alpha) const { return ::Fade(*this, alpha); }
+    [[nodiscard]] Color Fade(float alpha) const { return ::Fade(*this, alpha); }
 
     /**
      * Returns Color normalized as float [0..1]
      */
-    Vector4 Normalize() const { return ::ColorNormalize(*this); }
+    [[nodiscard]] Vector4 Normalize() const { return ::ColorNormalize(*this); }
 
     /**
      * Returns Color from normalized values [0..1]
      */
-    Color(::Vector4 normalized) { set(::ColorFromNormalized(normalized)); }
+    explicit Color(::Vector4 normalized) : Color(::ColorFromNormalized(normalized)) { }
 
     /**
      * Returns HSV values for a Color
      */
-    Vector3 ToHSV() const { return ::ColorToHSV(*this); }
+    [[nodiscard]] Vector3 ToHSV() const { return ::ColorToHSV(*this); }
 
     GETTERSETTER(unsigned char, R, r)
     GETTERSETTER(unsigned char, G, g)
@@ -206,7 +206,7 @@ class Color : public ::Color {
     /**
      * Returns color with alpha applied, alpha goes from 0.0f to 1.0f
      */
-    Color Alpha(float alpha) const { return ::ColorAlpha(*this, alpha); }
+    [[nodiscard]] Color Alpha(float alpha) const { return ::ColorAlpha(*this, alpha); }
 
     Color Lerp(::Color color2, float factor) {
         return ::ColorLerp(*this, color2, factor);
@@ -215,7 +215,7 @@ class Color : public ::Color {
     /**
      * Returns src alpha-blended into dst color with tint
      */
-    Color AlphaBlend(::Color dst, ::Color tint) const { return ::ColorAlphaBlend(dst, *this, tint); }
+    [[nodiscard]] Color AlphaBlend(::Color dst, ::Color tint) const { return ::ColorAlphaBlend(dst, *this, tint); }
 
     static Color LightGray() { return LIGHTGRAY; }
     static Color Gray() { return GRAY; }

include/Font.hpp

@@ -28,9 +28,9 @@ class Font : public ::Font {
     /**
      * Retrieves the default Font.
      */
-    Font() { set(::GetFontDefault()); }
+    Font() : ::Font(::GetFontDefault()) { }
 
-    Font(const ::Font& font) { set(font); }
+    Font(const ::Font& font) : ::Font(font) { }
 
     /**
      * Loads a Font from the given file.
@@ -203,7 +203,7 @@ class Font : public ::Font {
     /**
      * Returns if the font is ready to be used.
      */
-    bool IsValid() const { return ::IsFontValid(*this); }
+    [[nodiscard]] bool IsValid() const { return ::IsFontValid(*this); }
 
     /**
      * Draw text using font and additional parameters.
@@ -286,33 +286,33 @@ class Font : public ::Font {
     /**
      * Measure string size for Font
      */
-    Vector2 MeasureText(const char* text, float fontSize, float spacing) const {
+    [[nodiscard]] Vector2 MeasureText(const char* text, float fontSize, float spacing) const {
         return ::MeasureTextEx(*this, text, fontSize, spacing);
     }
 
     /**
      * Measure string size for Font
      */
-    Vector2 MeasureText(const std::string& text, float fontSize, float spacing) const {
+    [[nodiscard]] Vector2 MeasureText(const std::string& text, float fontSize, float spacing) const {
         return ::MeasureTextEx(*this, text.c_str(), fontSize, spacing);
     }
 
     /**
      * Get index position for a unicode character on font
      */
-    int GetGlyphIndex(int character) const { return ::GetGlyphIndex(*this, character); }
+    [[nodiscard]] int GetGlyphIndex(int character) const { return ::GetGlyphIndex(*this, character); }
 
     /**
      * Create an image from text (custom sprite font)
      */
-    ::Image ImageText(const char* text, float fontSize, float spacing, ::Color tint) const {
+    [[nodiscard]] ::Image ImageText(const char* text, float fontSize, float spacing, ::Color tint) const {
         return ::ImageTextEx(*this, text, fontSize, spacing, tint);
     }
 
     /**
      * Create an image from text (custom sprite font)
      */
-    ::Image ImageText(const std::string& text, float fontSize, float spacing, ::Color tint) const {
+    [[nodiscard]] ::Image ImageText(const std::string& text, float fontSize, float spacing, ::Color tint) const {
         return ::ImageTextEx(*this, text.c_str(), fontSize, spacing, tint);
     }
 protected:

include/Gamepad.hpp

@@ -18,21 +18,25 @@ class Gamepad {
     GETTERSETTER(int, Number, number)
 
     Gamepad& operator=(const Gamepad& gamepad) {
-        set(gamepad);
+        if (this != &gamepad) {
+            set(static_cast<int>(gamepad));
+        }
         return *this;
     }
 
     Gamepad& operator=(int gamepadNumber) {
-        set(gamepadNumber);
+        if (this->number != gamepadNumber) {
+            set(gamepadNumber);
+        }
         return *this;
     }
 
-    operator int() const { return number; }
+    explicit operator int() const { return number; }
 
     /**
      * Detect if a gamepad is available
      */
-    bool IsAvailable() const { return ::IsGamepadAvailable(number); }
+    [[nodiscard]] bool IsAvailable() const { return ::IsGamepadAvailable(number); }
 
     /**
      * Detect if a gamepad is available
@@ -42,54 +46,54 @@ class Gamepad {
     /**
      * Return gamepad internal name id
      */
-    std::string GetName() const { return ::GetGamepadName(number); }
+    [[nodiscard]] std::string GetName() const { return ::GetGamepadName(number); }
 
     /**
      * Return gamepad internal name id
      */
-    operator std::string() const { return GetName(); }
+    explicit operator std::string() const { return GetName(); }
 
     /**
      * Detect if a gamepad button has been pressed once
      */
-    bool IsButtonPressed(int button) const { return ::IsGamepadButtonPressed(number, button); }
+    [[nodiscard]] bool IsButtonPressed(int button) const { return ::IsGamepadButtonPressed(number, button); }
 
     /**
      * Detect if a gamepad button is being pressed
      */
-    bool IsButtonDown(int button) const { return ::IsGamepadButtonDown(number, button); }
+    [[nodiscard]] bool IsButtonDown(int button) const { return ::IsGamepadButtonDown(number, button); }
 
     /**
      * Detect if a gamepad button has been released once
      */
-    bool IsButtonReleased(int button) const { return ::IsGamepadButtonReleased(number, button); }
+    [[nodiscard]] bool IsButtonReleased(int button) const { return ::IsGamepadButtonReleased(number, button); }
 
     /**
      * Detect if a gamepad button is NOT being pressed
      */
-    bool IsButtonUp(int button) const { return ::IsGamepadButtonUp(number, button); }
+    [[nodiscard]] bool IsButtonUp(int button) const { return ::IsGamepadButtonUp(number, button); }
 
     /**
      * Get the last gamepad button pressed
      */
-    int GetButtonPressed() const { return ::GetGamepadButtonPressed(); }
+    static int GetButtonPressed() { return ::GetGamepadButtonPressed(); }
 
     /**
      * Return gamepad axis count for a gamepad
      */
-    int GetAxisCount() const { return ::GetGamepadAxisCount(number); }
+    [[nodiscard]] int GetAxisCount() const { return ::GetGamepadAxisCount(number); }
 
     /**
      * Return axis movement value for a gamepad axis
      */
-    float GetAxisMovement(int axis) const { return ::GetGamepadAxisMovement(number, axis); }
+    [[nodiscard]] float GetAxisMovement(int axis) const { return ::GetGamepadAxisMovement(number, axis); }
 
-    int SetMappings(const std::string& mappings) { return SetGamepadMappings(mappings.c_str()); }
+    static int SetMappings(const std::string& mappings) { return SetGamepadMappings(mappings.c_str()); }
 
     /**
      * Set gamepad vibration for both motors (duration in seconds)
      */
-    void SetVibration(float leftMotor, float rightMotor, float duration) {
+    void SetVibration(float leftMotor, float rightMotor, float duration) const {
         ::SetGamepadVibration(number, leftMotor, rightMotor, duration);
     }
 protected: