Make all forms of Batch::append return a reference to itself

diff --git a/source/batch.cpp b/source/batch.cpp
index 741d5a49413f5f2f0538e710ffe0148aa497de25..89b8f48f4d44920d4b63a3829a44f81f9c2f44e8 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -103,10 +103,10 @@ Batch &Batch::append(unsigned i)
        return *this;
 }
 
-void Batch::append(const vector<unsigned> &ind)
+Batch &Batch::append(const vector<unsigned> &ind)
 {
        if(ind.empty())
-               return;
+               return *this;
 
        data.reserve(data.size()+ind.size()*get_index_size());
        for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
@@ -114,6 +114,8 @@ void Batch::append(const vector<unsigned> &ind)
 
        update_offset();
        dirty = true;
+
+       return *this;
 }
 
 bool Batch::can_append(PrimitiveType other_type)
@@ -126,7 +128,7 @@ bool Batch::can_append(PrimitiveType other_type)
                return true;
 }
 
-void Batch::append(const Batch &other)
+Batch &Batch::append(const Batch &other)
 {
        if(other.prim_type!=prim_type)
                throw invalid_argument("Batch::append");
@@ -141,7 +143,7 @@ void Batch::append(const Batch &other)
        }
 
        if(other.data.empty())
-               return;
+               return *this;
 
        if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
                ;
@@ -176,6 +178,8 @@ void Batch::append(const Batch &other)
 
        update_offset();
        dirty = true;
+
+       return *this;
 }
 
 void Batch::append_index(unsigned i)

diff --git a/source/batch.h b/source/batch.h
index 0d05d6d4ff39aeec2b5c7662f22254c09db2c420..10c61a289e2e5afb71e94c6049126ee4fcbfe877 100644 (file)
--- a/source/batch.h
+++ b/source/batch.h
@@ -50,9 +50,9 @@ public:
        DataType get_data_type() const { return data_type; }
 
        Batch &append(unsigned);
-       void append(const std::vector<unsigned> &);
+       Batch &append(const std::vector<unsigned> &);
        bool can_append(PrimitiveType);
-       void append(const Batch &);
+       Batch &append(const Batch &);
 private:
        void append_index(unsigned);
        virtual unsigned get_data_size() const { return data.size(); }