Merge pull request #219 from RobLoach/drawing-returnthis

Make Draw() functions not return the object

Author: RobLoach

examples/textures/textures_image_drawing.cpp

@@ -33,9 +33,9 @@ int main(void) {
     // Draw one image over the other with a scaling of 1.5f
     parrots
         .Draw(cat,
-        raylib::Rectangle(0, 0, cat.GetWidth(), cat.GetHeight()),
-            raylib::Rectangle(30, 40, cat.GetWidth() * 1.5f, cat.GetHeight() * 1.5f))
-        .Crop(raylib::Rectangle(0, 50, parrots.GetWidth(), parrots.GetHeight() - 100));  // Crop resulting image
+            raylib::Rectangle(0, 0, cat.GetWidth(), cat.GetHeight()),
+            raylib::Rectangle(30, 40, cat.GetWidth() * 1.5f, cat.GetHeight() * 1.5f));
+    parrots.Crop(raylib::Rectangle(0, 50, parrots.GetWidth(), parrots.GetHeight() - 100));  // Crop resulting image
 
     // Load custom font for frawing on image
     raylib::Font font("resources/custom_jupiter_crash.png");

include/BoundingBox.hpp

@@ -38,9 +38,8 @@ class BoundingBox : public ::BoundingBox {
     /**
      * Draw a bounding box with wires
      */
-    inline BoundingBox& Draw(::Color color = {255, 255, 255, 255}) {
+    inline void Draw(::Color color = {255, 255, 255, 255}) const {
         ::DrawBoundingBox(*this, color);
-        return *this;
     }
 
     /**

include/Camera3D.hpp

@@ -126,26 +126,24 @@ class Camera3D : public ::Camera3D {
     /**
      * Draw a billboard texture.
      */
-    inline Camera3D& DrawBillboard(
+    inline void DrawBillboard(
             const ::Texture2D& texture,
             ::Vector3 center,
             float size,
-            ::Color tint = {255, 255, 255, 255}) {
+            ::Color tint = {255, 255, 255, 255}) const {
         ::DrawBillboard(*this, texture, center, size, tint);
-        return *this;
     }
 
     /**
      * Draw a billboard texture defined by source.
      */
-    inline Camera3D& DrawBillboard(
+    inline void DrawBillboard(
             const ::Texture2D& texture,
             ::Rectangle sourceRec,
             ::Vector3 center,
             ::Vector2 size,
-            ::Color tint = {255, 255, 255, 255}) {
+            ::Color tint = {255, 255, 255, 255}) const {
         ::DrawBillboardRec(*this, texture, sourceRec, center, size, tint);
-        return *this;
     }
 
  private:

include/Color.hpp

@@ -111,98 +111,82 @@ class Color : public ::Color {
         return *this;
     }
 
-    inline Color& DrawPixel(int x, int y) {
+    inline void DrawPixel(int x, int y) const {
         ::DrawPixel(x, y, *this);
-        return *this;
     }
 
     /**
      * Draw a pixel
      */
-    inline Color& DrawPixel(::Vector2 pos) {
+    inline void DrawPixel(::Vector2 pos) const {
         ::DrawPixelV(pos, *this);
-        return *this;
     }
 
     /**
      * Draw a line
      */
-    inline Color& DrawLine(int startPosX, int startPosY, int endPosX, int endPosY) {
+    inline void DrawLine(int startPosX, int startPosY, int endPosX, int endPosY) const {
         ::DrawLine(startPosX, startPosY, endPosX, endPosY, *this);
-        return *this;
     }
 
-    inline Color& DrawLine(::Vector2 startPos, ::Vector2 endPos) {
+    inline void DrawLine(::Vector2 startPos, ::Vector2 endPos) const {
         ::DrawLineV(startPos, endPos, *this);
-        return *this;
     }
 
-    inline Color& DrawLine(::Vector2 startPos, ::Vector2 endPos, float thick) {
+    inline void DrawLine(::Vector2 startPos, ::Vector2 endPos, float thick) const {
         ::DrawLineEx(startPos, endPos, thick, *this);
-        return *this;
     }
 
-    inline Color& DrawLineBezier(::Vector2 startPos, ::Vector2 endPos, float thick) {
+    inline void DrawLineBezier(::Vector2 startPos, ::Vector2 endPos, float thick) const {
         ::DrawLineBezier(startPos, endPos, thick, *this);
-        return *this;
     }
 
-    inline Color& DrawLineStrip(::Vector2 *points, int numPoints) {
+    inline void DrawLineStrip(::Vector2 *points, int numPoints) const {
         ::DrawLineStrip(points, numPoints, *this);
-        return *this;
     }
 
-    inline Color& DrawText(const std::string& text, int posX, int posY, int fontSize) {
+    inline void DrawText(const std::string& text, int posX, int posY, int fontSize) const {
         ::DrawText(text.c_str(), posX, posY, fontSize, *this);
-        return *this;
     }
 
-    inline Color& DrawText(const ::Font& font, const std::string& text, ::Vector2 position,
-            float fontSize, float spacing) {
+    inline void DrawText(const ::Font& font, const std::string& text, ::Vector2 position,
+            float fontSize, float spacing) const {
         ::DrawTextEx(font, text.c_str(), position, fontSize, spacing, *this);
-        return *this;
     }
 
-    inline Color& DrawText(
+    inline void DrawText(
             const ::Font& font,
             const std::string& text,
             ::Vector2 position,
             ::Vector2 origin,
             float rotation,
             float fontSize,
-            float spacing) {
+            float spacing) const {
         ::DrawTextPro(font, text.c_str(), position, origin, rotation, fontSize, spacing, *this);
-        return *this;
     }
 
-    inline Color& DrawRectangle(int posX, int posY, int width, int height) {
+    inline void DrawRectangle(int posX, int posY, int width, int height) const {
         ::DrawRectangle(posX, posY, width, height, *this);
-        return *this;
     }
 
-    inline Color& DrawRectangle(::Vector2 position, ::Vector2 size) {
+    inline void DrawRectangle(::Vector2 position, ::Vector2 size) const {
         ::DrawRectangleV(position, size, *this);
-        return *this;
     }
 
-    inline Color& DrawRectangle(::Rectangle rec) {
+    inline void DrawRectangle(::Rectangle rec) const {
         ::DrawRectangleRec(rec, *this);
-        return *this;
     }
 
-    inline Color& DrawRectangle(::Rectangle rec, ::Vector2 origin, float rotation) {
+    inline void DrawRectangle(::Rectangle rec, ::Vector2 origin, float rotation) const {
         ::DrawRectanglePro(rec, origin, rotation, *this);
-        return *this;
     }
 
-    inline Color& DrawRectangleLines(int posX, int posY, int width, int height) {
+    inline void DrawRectangleLines(int posX, int posY, int width, int height) const {
         ::DrawRectangleLines(posX, posY, width, height, *this);
-        return *this;
     }
 
-    inline Color& DrawRectangleLines(::Rectangle rec, float lineThick) {
+    inline void DrawRectangleLines(::Rectangle rec, float lineThick) const {
         ::DrawRectangleLinesEx(rec, lineThick, *this);
-        return *this;
     }
 
     /**

include/Font.hpp

@@ -209,61 +209,56 @@ class Font : public ::Font {
     /**
      * Draw text using font and additional parameters.
      */
-    inline Font& DrawText(const std::string& text, ::Vector2 position, float fontSize,
-            float spacing, ::Color tint = WHITE) {
+    inline void DrawText(const std::string& text, ::Vector2 position, float fontSize,
+            float spacing, ::Color tint = WHITE) const {
         ::DrawTextEx(*this, text.c_str(), position,  fontSize,  spacing,  tint);
-        return *this;
     }
 
     /**
      * Draw text using font and additional parameters.
      */
-    inline Font& DrawText(const std::string& text, int posX, int posY, float fontSize,
-            float spacing, ::Color tint = WHITE) {
+    inline void DrawText(const std::string& text, int posX, int posY, float fontSize,
+            float spacing, ::Color tint = WHITE) const {
         ::DrawTextEx(*this, text.c_str(),
             { static_cast<float>(posX), static_cast<float>(posY) },
             fontSize, spacing, tint);
-        return *this;
     }
 
-    inline Font& DrawText(
+    inline void DrawText(
             const std::string& text,
             ::Vector2 position,
             ::Vector2 origin,
             float rotation,
             float fontSize,
             float spacing,
-            ::Color tint = WHITE) {
+            ::Color tint = WHITE) const {
         ::DrawTextPro(*this, text.c_str(),
             position, origin,
             rotation, fontSize,
             spacing, tint);
-        return *this;
     }
 
     /**
      * Draw one character (codepoint)
      */
-    inline Font& DrawText(int codepoint,
+    inline void DrawText(int codepoint,
             ::Vector2 position,
             float fontSize,
-            ::Color tint = { 255, 255, 255, 255 }) {
+            ::Color tint = { 255, 255, 255, 255 }) const {
         ::DrawTextCodepoint(*this, codepoint, position, fontSize, tint);
-        return *this;
     }
 
     /**
      * Draw multiple character (codepoint)
      */
-    inline Font& DrawText(const int *codepoints,
+    inline void DrawText(const int *codepoints,
             int count, ::Vector2 position,
             float fontSize, float spacing,
-            ::Color tint = { 255, 255, 255, 255 }) {
+            ::Color tint = { 255, 255, 255, 255 }) const {
         ::DrawTextCodepoints(*this,
             codepoints, count,
             position, fontSize,
             spacing, tint);
-        return *this;
     }
 
     /**

include/Image.hpp

@@ -586,89 +586,75 @@ class Image : public ::Image {
     /**
      * Draw pixel within an image
      */
-    inline Image& DrawPixel(int posX, int posY, ::Color color = {255, 255, 255, 255}) {
+    inline void DrawPixel(int posX, int posY, ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawPixel(this, posX, posY, color);
-        return *this;
     }
 
-    inline Image& DrawPixel(::Vector2 position, ::Color color = {255, 255, 255, 255}) {
+    inline void DrawPixel(::Vector2 position, ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawPixelV(this, position, color);
-        return *this;
     }
 
-    inline Image& DrawLine(int startPosX, int startPosY, int endPosX, int endPosY,
+    inline void DrawLine(int startPosX, int startPosY, int endPosX, int endPosY,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawLine(this, startPosX, startPosY, endPosX, endPosY, color);
-        return *this;
     }
 
-    inline Image& DrawLine(::Vector2 start, ::Vector2 end, ::Color color = {255, 255, 255, 255}) {
+    inline void DrawLine(::Vector2 start, ::Vector2 end, ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawLineV(this, start, end, color);
-        return *this;
     }
 
-    inline Image& DrawCircle(int centerX, int centerY, int radius,
+    inline void DrawCircle(int centerX, int centerY, int radius,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawCircle(this, centerX, centerY, radius, color);
-        return *this;
     }
 
-    inline Image& DrawCircle(::Vector2 center, int radius,
+    inline void DrawCircle(::Vector2 center, int radius,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawCircleV(this, center, radius, color);
-        return *this;
     }
 
-    inline Image& DrawRectangle(int posX, int posY, int width, int height,
+    inline void DrawRectangle(int posX, int posY, int width, int height,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawRectangle(this, posX, posY, width, height, color);
-        return *this;
     }
 
-    inline Image& DrawRectangle(Vector2 position, Vector2 size,
+    inline void DrawRectangle(Vector2 position, Vector2 size,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawRectangleV(this, position, size, color);
-        return *this;
     }
 
-    inline Image& DrawRectangle(::Rectangle rec, ::Color color = {255, 255, 255, 255}) {
+    inline void DrawRectangle(::Rectangle rec, ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawRectangleRec(this, rec, color);
-        return *this;
     }
 
-    inline Image& DrawRectangleLines(::Rectangle rec, int thick = 1,
+    inline void DrawRectangleLines(::Rectangle rec, int thick = 1,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawRectangleLines(this, rec, thick, color);
-        return *this;
     }
 
-    inline Image& Draw(const ::Image& src, ::Rectangle srcRec, ::Rectangle dstRec,
+    inline void Draw(const ::Image& src, ::Rectangle srcRec, ::Rectangle dstRec,
             ::Color tint = {255, 255, 255, 255}) {
         ::ImageDraw(this, src, srcRec, dstRec, tint);
-        return *this;
     }
 
-    inline Image& DrawText(const std::string& text, ::Vector2 position, int fontSize,
+    inline void DrawText(const std::string& text, ::Vector2 position, int fontSize,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawText(this,
             text.c_str(),
             static_cast<int>(position.x),
             static_cast<int>(position.y),
             fontSize,
             color);
-        return *this;
     }
 
-    inline Image& DrawText(const std::string& text, int x, int y, int fontSize,
+    inline void DrawText(const std::string& text, int x, int y, int fontSize,
             ::Color color = {255, 255, 255, 255}) {
         ::ImageDrawText(this, text.c_str(), x, y, fontSize, color);
-        return *this;
     }
 
-    inline Image& DrawText(const ::Font& font, const std::string& text, ::Vector2 position,
+    inline void DrawText(const ::Font& font, const std::string& text, ::Vector2 position,
             float fontSize, float spacing, ::Color tint = {255, 255, 255, 255}) {
         ::ImageDrawTextEx(this, font, text.c_str(), position, fontSize, spacing, tint);
-        return *this;
     }
 
     /**

include/Material.hpp

@@ -98,17 +98,15 @@ class Material : public ::Material {
     /**
      * Draw a 3d mesh with material and transform
      */
-    inline const Material& DrawMesh(const ::Mesh& mesh, ::Matrix transform) const {
+    inline void DrawMesh(const ::Mesh& mesh, ::Matrix transform) const {
         ::DrawMesh(mesh, *this, transform);
-        return *this;
     }
 
     /**
      * Draw multiple mesh instances with material and different transforms
      */
-    inline const Material& DrawMesh(const ::Mesh& mesh, ::Matrix* transforms, int instances) const {
+    inline void DrawMesh(const ::Mesh& mesh, ::Matrix* transforms, int instances) const {
         ::DrawMeshInstanced(mesh, *this, transforms, instances);
-        return *this;
     }
 
  private:

include/Mesh.hpp

@@ -198,14 +198,14 @@ class Mesh : public ::Mesh {
     /**
      * Draw a 3d mesh with material and transform
      */
-    inline void Draw(const ::Material& material, const ::Matrix& transform) {
+    inline void Draw(const ::Material& material, const ::Matrix& transform) const {
         ::DrawMesh(*this, material, transform);
     }
 
     /**
      * Draw multiple mesh instances with material and different transforms
      */
-    inline void Draw(const ::Material& material, ::Matrix* transforms, int instances) {
+    inline void Draw(const ::Material& material, ::Matrix* transforms, int instances) const {
         ::DrawMeshInstanced(*this, material, transforms, instances);
     }