Update raylib

Author: RobLoach

include/Camera3D.hpp

@@ -37,12 +37,12 @@ class Camera3D : public ::Camera3D {
     }
 
     Camera3D(::Vector3 positionValue, ::Vector3 targetValue, ::Vector3 upValue,
-            float fovyValue = 0, int typeValue = 0) {
+            float fovyValue = 0, int projectionValue = 0) {
         position = positionValue;
         target = targetValue;
         up = upValue;
         fovy = fovyValue;
-        type = typeValue;
+        projection = projectionValue;
     }
 
     Camera3D() {}
@@ -51,7 +51,7 @@ class Camera3D : public ::Camera3D {
     GETTERSETTER(::Vector3, Target, target)
     GETTERSETTER(::Vector3, Up, up)
     GETTERSETTER(float, Fovy, fovy)
-    GETTERSETTER(int, Type, type)
+    GETTERSETTER(int, Projection, projection)
 
     Camera3D& operator=(const ::Camera3D& camera) {
         set(camera);
@@ -171,7 +171,7 @@ class Camera3D : public ::Camera3D {
         target = camera.target;
         up = camera.up;
         fovy = camera.fovy;
-        type = camera.type;
+        projection = camera.projection;
     }
 };
 

include/Material.hpp

@@ -60,7 +60,8 @@ class Material : public ::Material {
 
     GETTERSETTER(::Shader, Shader, shader)
     GETTERSETTER(::MaterialMap*, Maps, maps)
-    GETTERSETTER(float*, Params, params)
+    // TODO(RobLoach): Resolve the Material params being a float[4].
+    //GETTERSETTER(const float*, Params, params)
 
     Material& operator=(const ::Material& material) {
         set(material);
@@ -89,7 +90,10 @@ class Material : public ::Material {
     inline void set(const ::Material& material) {
         shader = material.shader;
         maps = material.maps;
-        params = material.params;
+        params[0] = material.params[0];
+        params[1] = material.params[1];
+        params[2] = material.params[2];
+        params[3] = material.params[3];
     }
 };
 }  // namespace raylib

include/Matrix.hpp

@@ -116,36 +116,6 @@ class Matrix : public ::Matrix {
             && m15 == other.m15;
     }
 
-    /**
-     * Set a custom projection matrix (replaces internal projection matrix)
-     */
-    inline Matrix& SetProjection() {
-        ::SetMatrixProjection(*this);
-        return *this;
-    }
-
-    /**
-     * Set a custom modelview matrix (replaces internal modelview matrix)
-     */
-    inline Matrix& SetModelview() {
-        ::SetMatrixModelview(*this);
-        return *this;
-    }
-
-    /**
-     * Get internal modelview matrix
-     */
-    static Matrix GetModelview() {
-        return ::GetMatrixModelview();
-    }
-
-    /**
-     * Get internal projection matrix
-     */
-    static Matrix GetProjection() {
-        return ::GetMatrixProjection();
-    }
-
 #ifndef RAYLIB_CPP_NO_MATH
     /**
      * Returns the trace of the matrix (sum of the values along the diagonal)

include/Mouse.hpp

@@ -87,10 +87,6 @@ class Mouse {
         return ::GetMouseWheelMove();
     }
 
-    static inline int GetCursor() {
-        return ::GetMouseCursor();
-    }
-
     static inline void SetCursor(int cursor) {
         ::SetMouseCursor(cursor);
     }

include/Shader.hpp

@@ -43,10 +43,6 @@ class Shader : public ::Shader {
         locs = Locs;
     }
 
-    Shader() {
-        set(GetShaderDefault());
-    }
-
     Shader(const std::string& vsFileName, const std::string& fsFileName) {
         set(::LoadShader(vsFileName.c_str(), fsFileName.c_str()));
     }
@@ -55,10 +51,6 @@ class Shader : public ::Shader {
         return ::LoadShader(vsFileName.c_str(), fsFileName.c_str());
     }
 
-    static ::Shader LoadCode(const std::string& vsCode, const std::string& fsCode) {
-        return ::LoadShaderCode(vsCode.c_str(), fsCode.c_str());
-    }
-
     GETTERSETTER(unsigned int, Id, id)
     GETTERSETTER(int*, Locs, locs)
 
@@ -137,22 +129,6 @@ class Shader : public ::Shader {
         return *this;
     }
 
-    ::TextureCubemap GenTextureCubemap(const ::Texture2D& panorama, int size, int format) const {
-        return ::GenTextureCubemap(*this, panorama, size, format);
-    }
-
-    ::TextureCubemap GenTextureIrradiance(const ::Texture2D& panorama, int size) const {
-        return ::GenTextureIrradiance(*this, panorama, size);
-    }
-
-    ::TextureCubemap GenTexturePrefilter(const ::Texture2D& panorama, int size) const {
-        return ::GenTexturePrefilter(*this, panorama, size);
-    }
-
-    ::Texture2D GenTextureBRDF(int size) const {
-        return ::GenTextureBRDF(*this, size);
-    }
-
  protected:
     inline void set(const ::Shader& shader) {
         id = shader.id;

include/Texture.hpp

@@ -39,14 +39,19 @@ class Texture : public ::Texture {
         set(texture);
     }
 
-    Texture() {
-        set(::GetTextureDefault());
-    }
-
     Texture(const ::Image& image) {
         LoadFromImage(image);
     }
 
+    /**
+     * Load cubemap from image, multiple image cubemap layouts supported.
+     *
+     * @see LoadTextureCubemap()
+     */
+    Texture(const ::Image& image, int layout) {
+        LoadCubemap(image, layout);
+    }
+
     /**
      * Load texture from file into GPU memory (VRAM)
      */
@@ -86,7 +91,7 @@ class Texture : public ::Texture {
     /**
      * Load cubemap from image, multiple image cubemap layouts supported
      */
-    void LoadTextureCubemap(const ::Image& image, int layoutType) {
+    void LoadCubemap(const ::Image& image, int layoutType) {
         set(::LoadTextureCubemap(image, layoutType));
     }
 
@@ -235,14 +240,6 @@ class Texture : public ::Texture {
         return ::GetPixelDataSize(width, height, format);
     }
 
-    /**
-     * Define default texture used to draw shapes
-     */
-    inline Texture& SetShapes(::Rectangle source) {
-        ::SetShapesTexture(*this, source);
-        return *this;
-    }
-
  protected:
     inline void set(const ::Texture& texture) {
         id = texture.id;

include/Vector4.hpp

@@ -148,8 +148,8 @@ class Vector4 : public ::Vector4 {
         return ::QuaternionFromAxisAngle(axis, angle);
     }
 
-    static Vector4 FromEuler(const float roll, const float pitch, const float yaw) {
-        return ::QuaternionFromEuler(roll, pitch, yaw);
+    static Vector4 FromEuler(const float yaw, const float pitch, const float roll) {
+        return ::QuaternionFromEuler(yaw, pitch, roll);
     }
 
     static Vector4 FromEuler(const ::Vector3& vector3) {

include/VrSimulator.hpp

@@ -31,20 +31,15 @@
 namespace raylib {
 class VrSimulator {
  public:
-    VrSimulator() {
-        Init();
-    }
-
-    VrSimulator(::VrDeviceInfo info, ::Shader distortion) {
-        Init();
-        Set(info, distortion);
+    VrSimulator(::VrDeviceInfo& info) {
+        Init(info);
     }
 
     /**
      * Init VR simulator for selected device parameters
      */
-    inline void Init() {
-        InitVrSimulator();
+    inline void Init(::VrDeviceInfo info) {
+        InitVrSimulator(info);
     }
 
     /**
@@ -78,27 +73,11 @@ class VrSimulator {
         return *this;
     }
 
-    /**
-     * Set stereo rendering configuration parameters
-     */
-    inline VrSimulator& Set(::VrDeviceInfo info, ::Shader distortion) {
-        ::SetVrConfiguration(info, distortion);
-        return *this;
-    }
-
-    /**
-     * Enable/Disable VR experience
-     */
-    inline VrSimulator& Toggle() {
-        ::ToggleVrMode();
-        return *this;
-    }
-
     /**
      * Begin VR simulator stereo rendering
      */
-    inline VrSimulator& BeginDrawing() {
-        ::BeginVrDrawing();
+    inline VrSimulator& BeginDrawing(::RenderTexture2D& target) {
+        ::BeginVrDrawing(target);
         return *this;
     }
 
@@ -116,6 +95,13 @@ class VrSimulator {
     inline void Close() {
         ::CloseVrSimulator();
     }
+
+    /**
+     * Get stereo rendering configuration parameters
+     */
+    inline VrStereoConfig GetConfig(VrDeviceInfo& device) {
+        return GetVrConfig(device);
+    }
 };
 }  // namespace raylib