Changeset 1326Tweet

Timestamp:

May 1, 2012, 4:11:32 PM (9 years ago)

Author:

sam

Message:

core: rename Array::Append() to Array::Push() for brevity and arbitrary
personal taste.

Location:

trunk

Files:

• orbital/mesh.h (modified) (3 diffs)
• orbital/particlesystem.h (modified) (1 diff)
• src/array.h (modified) (8 diffs)
• test/tutorial/02_cube.cpp (modified) (1 diff)
• test/unit/array.cpp (modified) (3 diffs)

trunk/orbital/mesh.h

@@ -253 +253 @@
         Array<vec3,vec3,u8vec4> vertexlist;
         for (int i = 0; i < m_vert.Count(); i++)
-            vertexlist.Append(m_vert[i].m1,
-                              m_vert[i].m2,
-                              (u8vec4)(m_vert[i].m3 * 255.f));
+            vertexlist.Push(m_vert[i].m1,
+                            m_vert[i].m2,
+                            (u8vec4)(m_vert[i].m3 * 255.f));
 
         Array<uint16_t> indexlist;
@@ -310 +310 @@
     void AppendQuadVert(vec3 const &coord)
     {
-        m_vert.Append(coord, vec3(0.f, 1.f, 0.f), m_color);
+        m_vert.Push(coord, vec3(0.f, 1.f, 0.f), m_color);
     }
 
     void AppendDuplicateQuadVert(int i)
     {
-        m_vert.Append(m_vert[i].m1, vec3(0.f, 1.f, 0.f), m_vert[i].m3);
+        m_vert.Push(m_vert[i].m1, vec3(0.f, 1.f, 0.f), m_vert[i].m3);
     }
 
@@ -552 +552 @@
         Array<vec2> table;
         for (int i = 0; i <= ndivisions; i++)
-            table.Append(vec2(std::sin(pi * 2 / ndivisions * i) + 1e-5f,
-                              std::cos(pi * 2 / ndivisions * i) + 1e-5f));
+            table.Push(vec2(std::sin(pi * 2 / ndivisions * i) + 1e-5f,
+                            std::cos(pi * 2 / ndivisions * i) + 1e-5f));
 
         for (int j = 0; j <= ndivisions / 2; j++)

trunk/orbital/particlesystem.h

@@ -21 +21 @@
 
         for (int i = 0; i < 200; i++)
-            m_particles.Append(vec3(0), vec3(0), RandF(0.f, 2.f));
+            m_particles.Push(vec3(0), vec3(0), RandF(0.f, 2.f));
     }
 

trunk/src/array.h

@@ -81 +81 @@
     }
 
-    inline void Append(T const &x)
+    inline void Push(T const &x)
     {
         *this << x;
@@ -188 +188 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
-                       T5 const &m5, T6 const &m6, T7 const &m7, T8 const &m8)
+    inline void Push(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
+                     T5 const &m5, T6 const &m6, T7 const &m7, T8 const &m8)
     {
         if (this->m_count >= this->m_reserved)
@@ -226 +226 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
-                       T5 const &m5, T6 const &m6, T7 const &m7)
+    inline void Push(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
+                     T5 const &m5, T6 const &m6, T7 const &m7)
     {
         if (this->m_count >= this->m_reserved)
@@ -262 +262 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
-                       T5 const &m5, T6 const &m6)
+    inline void Push(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
+                     T5 const &m5, T6 const &m6)
     {
         if (this->m_count >= this->m_reserved)
@@ -295 +295 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
-                       T5 const &m5)
+    inline void Push(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4,
+                     T5 const &m5)
     {
         if (this->m_count >= this->m_reserved)
@@ -326 +326 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4)
+    inline void Push(T1 const &m1, T2 const &m2, T3 const &m3, T4 const &m4)
     {
         if (this->m_count >= this->m_reserved)
@@ -353 +353 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2, T3 const &m3)
+    inline void Push(T1 const &m1, T2 const &m2, T3 const &m3)
     {
         if (this->m_count >= this->m_reserved)
@@ -378 +378 @@
 {
 public:
-    inline void Append(T1 const &m1, T2 const &m2)
+    inline void Push(T1 const &m1, T2 const &m2)
     {
         if (this->m_count >= this->m_reserved)

trunk/test/tutorial/02_cube.cpp

@@ -36 +36 @@
 
         /* Front vertices/colors */
-        m_mesh.Append(vec3(-1.0, -1.0,  1.0), vec3(1.0, 0.0, 1.0));
-        m_mesh.Append(vec3( 1.0, -1.0,  1.0), vec3(0.0, 1.0, 0.0));
-        m_mesh.Append(vec3( 1.0,  1.0,  1.0), vec3(1.0, 0.5, 0.0));
-        m_mesh.Append(vec3(-1.0,  1.0,  1.0), vec3(1.0, 1.0, 0.0));
+        m_mesh.Push(vec3(-1.0, -1.0,  1.0), vec3(1.0, 0.0, 1.0));
+        m_mesh.Push(vec3( 1.0, -1.0,  1.0), vec3(0.0, 1.0, 0.0));
+        m_mesh.Push(vec3( 1.0,  1.0,  1.0), vec3(1.0, 0.5, 0.0));
+        m_mesh.Push(vec3(-1.0,  1.0,  1.0), vec3(1.0, 1.0, 0.0));
         /* Back */
-        m_mesh.Append(vec3(-1.0, -1.0, -1.0), vec3(1.0, 0.0, 0.0));
-        m_mesh.Append(vec3( 1.0, -1.0, -1.0), vec3(0.0, 0.5, 0.0));
-        m_mesh.Append(vec3( 1.0,  1.0, -1.0), vec3(0.0, 0.5, 1.0));
-        m_mesh.Append(vec3(-1.0,  1.0, -1.0), vec3(0.0, 0.0, 1.0));
+        m_mesh.Push(vec3(-1.0, -1.0, -1.0), vec3(1.0, 0.0, 0.0));
+        m_mesh.Push(vec3( 1.0, -1.0, -1.0), vec3(0.0, 0.5, 0.0));
+        m_mesh.Push(vec3( 1.0,  1.0, -1.0), vec3(0.0, 0.5, 1.0));
+        m_mesh.Push(vec3(-1.0,  1.0, -1.0), vec3(0.0, 0.0, 1.0));
 
         m_indices << i16vec3(0, 1, 2);

trunk/test/unit/array.cpp

@@ -28 +28 @@
     {
         Array<int> a;
-        a.Append(0);
-        a.Append(1);
-        a.Append(2);
-        a.Append(3);
+        a.Push(0);
+        a.Push(1);
+        a.Push(2);
+        a.Push(3);
 
         LOLUNIT_ASSERT_EQUAL(a[0], 0);
@@ -42 +42 @@
     {
         Array<int> a;
-        a.Append(0);
-        a.Append(1);
-        a.Append(2);
-        a.Append(3);
+        a.Push(0);
+        a.Push(1);
+        a.Push(2);
+        a.Push(3);
 
         Array<int> b = a;
@@ -58 +58 @@
     {
         Array<int, long, float, double, unsigned, char, bool, void *> a;
-        a.Append(1, 2, 3.f, 4.0, 5, 'a', true, 0);
+        a.Push(1, 2, 3.f, 4.0, 5, 'a', true, 0);
 
         LOLUNIT_ASSERT_EQUAL(a[0].m1, 1);