Changeset 1269Tweet

Timestamp:

Apr 22, 2012, 2:31:55 AM (11 years ago)

Author:

sam

Message:

core: use operator<< instead of operator+= to append stuff to arrays,
it's a bit less confusing.

Location:

trunk

Files:

• orbital/mesh.h (modified) (3 diffs)
• src/array.h (modified) (4 diffs)
• test/tutorial/01_triangle.cpp (modified) (1 diff)
• test/tutorial/02_cube.cpp (modified) (1 diff)

trunk/orbital/mesh.h

@@ -138 +138 @@
         for (int i = 0; i < m_triidx.Count(); i += 3)
         {
-            indexlist += m_triidx[i + 0];
-            indexlist += m_triidx[i + 1];
-            indexlist += m_triidx[i + 2];
+            indexlist << m_triidx[i + 0];
+            indexlist << m_triidx[i + 1];
+            indexlist << m_triidx[i + 2];
         }
         for (int i = 0; i < m_quadidx.Count(); i += 4)
         {
-            indexlist += m_quadidx[i + 0];
-            indexlist += m_quadidx[i + 1];
-            indexlist += m_quadidx[i + 2];
-
-            indexlist += m_quadidx[i + 0];
-            indexlist += m_quadidx[i + 2];
-            indexlist += m_quadidx[i + 3];
+            indexlist << m_quadidx[i + 0];
+            indexlist << m_quadidx[i + 1];
+            indexlist << m_quadidx[i + 2];
+
+            indexlist << m_quadidx[i + 0];
+            indexlist << m_quadidx[i + 2];
+            indexlist << m_quadidx[i + 3];
         }
 
@@ -198 +198 @@
     void AppendQuad(int i1, int i2, int i3, int i4, int base)
     {
-        m_quadidx += base + i1;
-        m_quadidx += base + i2;
-        m_quadidx += base + i3;
-        m_quadidx += base + i4;
+        m_quadidx << base + i1;
+        m_quadidx << base + i2;
+        m_quadidx << base + i3;
+        m_quadidx << base + i4;
     }
 
     void AppendQuadDuplicateVerts(int i1, int i2, int i3, int i4, int base)
     {
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i1);
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i2);
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i3);
-        m_quadidx += m_vert.Count(); AppendDuplicateQuadVert(base + i4);
+        m_quadidx << m_vert.Count(); AppendDuplicateQuadVert(base + i1);
+        m_quadidx << m_vert.Count(); AppendDuplicateQuadVert(base + i2);
+        m_quadidx << m_vert.Count(); AppendDuplicateQuadVert(base + i3);
+        m_quadidx << m_vert.Count(); AppendDuplicateQuadVert(base + i4);
     }
 
     void AppendTriangle(int i1, int i2, int i3, int base)
     {
-        m_triidx += base + i1;
-        m_triidx += base + i2;
-        m_triidx += base + i3;
+        m_triidx << base + i1;
+        m_triidx << base + i2;
+        m_triidx << base + i3;
     }
 
     void AppendTriangleDuplicateVerts(int i1, int i2, int i3, int base)
     {
-        m_triidx += m_vert.Count(); AppendDuplicateQuadVert(base + i1);
-        m_triidx += m_vert.Count(); AppendDuplicateQuadVert(base + i2);
-        m_triidx += m_vert.Count(); AppendDuplicateQuadVert(base + i3);
+        m_triidx << m_vert.Count(); AppendDuplicateQuadVert(base + i1);
+        m_triidx << m_vert.Count(); AppendDuplicateQuadVert(base + i2);
+        m_triidx << m_vert.Count(); AppendDuplicateQuadVert(base + i3);
     }
 
@@ -366 +366 @@
 
         for (int i = 0; i < vlen; i++)
-            m_vert += m_vert[m_vert_cursor++];
+            m_vert << m_vert[m_vert_cursor++];
 
         for (int i = 0; i < qlen; i++)
-            m_quadidx += m_quadidx[m_quadidx_cursor++] + vlen;
+            m_quadidx << m_quadidx[m_quadidx_cursor++] + vlen;
 
         for (int i = 0; i < tlen; i++)
-            m_triidx += m_triidx[m_triidx_cursor++] + vlen;
+            m_triidx << m_triidx[m_triidx_cursor++] + vlen;
     }
 

trunk/src/array.h

@@ -41 +41 @@
     }
 
-    inline Array<T1, T2, T3> const& operator+=(Element const &x)
+    inline Array<T1, T2, T3> const& operator<<(Element const &x)
     {
         if (m_count >= m_reserved)
@@ -128 +128 @@
     }
 
-    inline Array<T1, T2> const& operator+=(Element const &x)
+    inline Array<T1, T2> const& operator<<(Element const &x)
     {
         if (m_count >= m_reserved)
@@ -211 +211 @@
     }
 
-    inline Array<T1> const& operator+=(T1 const &x)
+    inline Array<T1> const& operator<<(T1 const &x)
     {
         if (m_count >= m_reserved)
@@ -228 +228 @@
     inline void Append(T1 const &x)
     {
-        *this += x;
+        *this << x;
     }
 

trunk/test/tutorial/01_triangle.cpp

@@ -37 +37 @@
     Triangle()
     {
-        m_vertices += vec2( 0.0,  0.8);
-        m_vertices += vec2(-0.8, -0.8);
-        m_vertices += vec2( 0.8, -0.8);
+        m_vertices << vec2( 0.0,  0.8);
+        m_vertices << vec2(-0.8, -0.8);
+        m_vertices << vec2( 0.8, -0.8);
         m_ready = false;
     }

trunk/test/tutorial/02_cube.cpp

@@ -46 +46 @@
         m_mesh.Append(vec3(-1.0,  1.0, -1.0), vec3(0.0, 0.0, 1.0));
 
-        m_indices += i16vec3(0, 1, 2);
-        m_indices += i16vec3(2, 3, 0);
-        m_indices += i16vec3(1, 5, 6);
-        m_indices += i16vec3(6, 2, 1);
-        m_indices += i16vec3(7, 6, 5);
-        m_indices += i16vec3(5, 4, 7);
-        m_indices += i16vec3(4, 0, 3);
-        m_indices += i16vec3(3, 7, 4);
-        m_indices += i16vec3(4, 5, 1);
-        m_indices += i16vec3(1, 0, 4);
-        m_indices += i16vec3(3, 2, 6);
-        m_indices += i16vec3(6, 7, 3);
+        m_indices << i16vec3(0, 1, 2);
+        m_indices << i16vec3(2, 3, 0);
+        m_indices << i16vec3(1, 5, 6);
+        m_indices << i16vec3(6, 2, 1);
+        m_indices << i16vec3(7, 6, 5);
+        m_indices << i16vec3(5, 4, 7);
+        m_indices << i16vec3(4, 0, 3);
+        m_indices << i16vec3(3, 7, 4);
+        m_indices << i16vec3(4, 5, 1);
+        m_indices << i16vec3(1, 0, 4);
+        m_indices << i16vec3(3, 2, 6);
+        m_indices << i16vec3(6, 7, 3);
 
         m_ready = false;