Merge pull request #205 from TokyoSU/master

Add default constructors for BoundingBox and Model

Author: RobLoach

include/BoundingBox.hpp

@@ -9,7 +9,17 @@ namespace raylib {
  * Bounding box type
  */
 class BoundingBox : public ::BoundingBox {
- public:
+public:
+    /*
+     * Set the bounding box to default: min (0, 0, 0) and max (0, 0, 0).
+     */
+    BoundingBox() {
+        set(::Vector3{ 0, 0, 0 }, ::Vector3{ 0, 0, 0 });
+    }
+
+    /*
+     * Copy a bounding box from another bounding box.
+     */
     BoundingBox(const ::BoundingBox& box) {
         set(box);
     }
@@ -68,11 +78,15 @@ class BoundingBox : public ::BoundingBox {
         return GetRayCollisionBox(ray, *this);
     }
 
- private:
+private:
     void set(const ::BoundingBox& box) {
         min = box.min;
         max = box.max;
     }
+    void set(const ::Vector3& _min, const ::Vector3& _max) {
+        min = _min;
+        max = _max;
+    }
 };
 }  // namespace raylib
 using RBoundingBox = raylib::BoundingBox;

include/Model.hpp

@@ -13,21 +13,29 @@ namespace raylib {
  * Model type
  */
 class Model : public ::Model {
- public:
+public:
+    Model() {
+    }
+
+    /*
+     * Copy a model from another model.
+     */
     Model(const ::Model& model) {
         set(model);
     }
 
+    /*
+     * Load a model from a file.
+     */
     Model(const std::string& fileName) {
-        if (!Load(fileName)) {
-            throw RaylibException("Failed to load Model from filename");
-        }
+        Load(fileName);
     }
 
+    /*
+     * Load a model from a mesh.
+     */
     Model(const ::Mesh& mesh) {
-        if (!Load(mesh)) {
-            throw RaylibException("Failed to load Model from Mesh");
-        }
+        Load(mesh);
     }
 
     ~Model() {
@@ -51,12 +59,12 @@ class Model : public ::Model {
     GETTERSETTER(::Matrix, Transform, transform)
     GETTERSETTER(int, MeshCount, meshCount)
     GETTERSETTER(int, MaterialCount, materialCount)
-    GETTERSETTER(::Mesh *, Meshes, meshes)
-    GETTERSETTER(::Material *, Materials, materials)
-    GETTERSETTER(int *, MeshMaterial, meshMaterial)
+    GETTERSETTER(::Mesh*, Meshes, meshes)
+    GETTERSETTER(::Material*, Materials, materials)
+    GETTERSETTER(int*, MeshMaterial, meshMaterial)
     GETTERSETTER(int, BoneCount, boneCount)
-    GETTERSETTER(::BoneInfo *, Bones, bones)
-    GETTERSETTER(::Transform *, BindPose, bindPose)
+    GETTERSETTER(::BoneInfo*, Bones, bones)
+    GETTERSETTER(::Transform*, BindPose, bindPose)
 
     Model& operator=(const ::Model& model) {
         set(model);
@@ -207,6 +215,9 @@ class Model : public ::Model {
      */
     bool Load(const std::string& fileName) {
         set(::LoadModel(fileName.c_str()));
+        if (!IsReady()) {
+            throw RaylibException("Failed to load Model from " + fileName);
+        }
         return IsReady();
     }
 
@@ -217,10 +228,13 @@ class Model : public ::Model {
      */
     bool Load(const ::Mesh& mesh) {
         set(::LoadModelFromMesh(mesh));
+        if (!IsReady()) {
+            throw RaylibException("Failed to load Model from Mesh");
+        }
         return IsReady();
     }
 
- private:
+private:
     void set(const ::Model& model) {
         transform = model.transform;
 

include/RaylibException.hpp

@@ -32,5 +32,6 @@ class RaylibException : public std::runtime_error {
 };
 
 }  // namespace raylib
+using RRaylibException = raylib::RaylibException;
 
 #endif  // RAYLIB_CPP_INCLUDE_RAYLIBEXCEPTION_HPP_

include/Texture.hpp

@@ -14,16 +14,19 @@ namespace raylib {
  * Texture type
  */
 class Texture : public ::Texture {
- public:
+public:
     /**
-     * Default constructor to create an empty Texture object.
+     * Default texture constructor.
      */
-    Texture(unsigned int id = 0,
-            int width = 0,
-            int height = 0,
-            int mipmaps = 0,
-            int format = 0) : ::Texture{id, width, height, mipmaps, format} {
-        // Nothing.
+    Texture() {
+        set(::Texture{0, 0, 0, 0, 0});
+    }
+	
+	/**
+     * Move/Create a texture structure manually.
+     */
+	Texture(unsigned int id, int width, int height, int mipmaps, int format) {
+        set(::Texture{id, width, height, mipmaps, format});
     }
 
     /**
@@ -39,9 +42,7 @@ class Texture : public ::Texture {
      * @throws raylib::RaylibException Throws if failed to create the texture from the given image.
      */
     Texture(const ::Image& image) {
-        if (!Load(image)) {
-            throw RaylibException("Failed to load Texture from Image");
-        }
+        Load(image);
     }
 
     /**
@@ -52,9 +53,7 @@ class Texture : public ::Texture {
      * @see LoadTextureCubemap()
      */
     Texture(const ::Image& image, int layout) {
-        if (!Load(image, layout)) {
-            throw RaylibException("Failed to load Texture from Cubemap");
-        }
+        Load(image, layout);
     }
 
     /**
@@ -63,9 +62,7 @@ class Texture : public ::Texture {
      * @throws raylib::RaylibException Throws if failed to create the texture from the given file.
      */
     Texture(const std::string& fileName) {
-        if (!Load(fileName)) {
-            throw RaylibException(TextFormat("Failed to load Texture from file: %s", fileName.c_str()));
-        }
+        Load(fileName);
     }
 
     Texture(const Texture&) = delete;
@@ -124,25 +121,31 @@ class Texture : public ::Texture {
     /**
      * Load texture from image data
      */
-    bool Load(const ::Image& image) {
+    void Load(const ::Image& image) {
         set(::LoadTextureFromImage(image));
-        return IsReady();
+        if (!IsReady()) {
+            throw RaylibException("Failed to load Texture from Image");
+        }
     }
 
     /**
      * Load cubemap from image, multiple image cubemap layouts supported
      */
-    bool Load(const ::Image& image, int layoutType) {
+    void Load(const ::Image& image, int layoutType) {
         set(::LoadTextureCubemap(image, layoutType));
-        return IsReady();
+        if (!IsReady()) {
+            throw RaylibException("Failed to load Texture from Cubemap");
+        }
     }
 
     /**
      * Load texture from file into GPU memory (VRAM)
      */
-    bool Load(const std::string& fileName) {
+    void Load(const std::string& fileName) {
         set(::LoadTexture(fileName.c_str()));
-        return IsReady();
+        if (!IsReady()) {
+            throw RaylibException("Failed to load Texture from file: " + fileName);
+        }
     }
 
     /**
@@ -306,7 +309,7 @@ class Texture : public ::Texture {
         return id != 0;
     }
 
- private:
+private:
     void set(const ::Texture& texture) {
         id = texture.id;
         width = texture.width;

include/Window.hpp

@@ -11,19 +11,16 @@ namespace raylib {
  * Window and Graphics Device Functions.
  */
 class Window {
- public:
+public:
+	Window() {
+		// need to create it manually with Init().
+	}
+	
     /**
      * Initialize window and OpenGL context.
-     *
-     * @throws raylib::RaylibException Thrown if the window failed to initiate.
      */
-    Window(int width = 800, int height = 450, const std::string& title = "raylib",
-            bool lateInit = false) {
-        if (!lateInit) {
-            if (!Init(width, height, title)) {
-                throw RaylibException("Failed to create Window");
-            }
-        }
+    Window(int width, int height, const std::string& title) {
+        Init(width, height, title);
     }
 
     /**
@@ -36,11 +33,14 @@ class Window {
     /**
      * Initializes the window.
      *
+     * @throws raylib::RaylibException Thrown if the window failed to initiate.
      * @return True or false, depending on if the Window initialized properly.
      */
-    bool Init(int width = 800, int height = 450, const std::string& title = "raylib") {
+    void Init(int width = 800, int height = 450, const std::string& title = "raylib") {
         ::InitWindow(width, height, title.c_str());
-        return IsWindowReady();
+		if (!IsWindowReady()) {
+            throw RaylibException("Failed to create Window");
+        }
     }
 
     /**

include/raymath.hpp

@@ -11,11 +11,15 @@ extern "C" {
 #ifndef RAYMATH_STATIC_INLINE
 #define RAYMATH_STATIC_INLINE
 #endif
-#pragma GCC diagnostic push
+#ifdef __GNUC__
+#pragma GCC diagnostic push // these throw a warning on visual studio, need to check if __GNUC__ is defined to use it.
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
 #include "raymath.h" // NOLINT
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
 #endif
+#endif
 #ifdef __cplusplus
 }
 #endif