瀏覽代碼

core: use operator<< instead of operator+= to append stuff to arrays,

it's a bit less confusing.
legacy
Sam Hocevar sam 13 年之前
父節點
當前提交
9262efbac3
共有 3 個文件被更改,包括 19 次插入19 次删除
  1. +4
    -4
      src/array.h
  2. +3
    -3
      test/tutorial/01_triangle.cpp
  3. +12
    -12
      test/tutorial/02_cube.cpp

+ 4
- 4
src/array.h 查看文件

@@ -40,7 +40,7 @@ public:
return m_data[n]; return m_data[n];
} }


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) if (m_count >= m_reserved)
{ {
@@ -127,7 +127,7 @@ public:
return m_data[n]; return m_data[n];
} }


inline Array<T1, T2> const& operator+=(Element const &x) inline Array<T1, T2> const& operator<<(Element const &x)
{ {
if (m_count >= m_reserved) if (m_count >= m_reserved)
{ {
@@ -210,7 +210,7 @@ public:
return m_data[n]; return m_data[n];
} }


inline Array<T1> const& operator+=(T1 const &x) inline Array<T1> const& operator<<(T1 const &x)
{ {
if (m_count >= m_reserved) if (m_count >= m_reserved)
{ {
@@ -227,7 +227,7 @@ public:


inline void Append(T1 const &x) inline void Append(T1 const &x)
{ {
*this += x; *this << x;
} }


void Remove(int pos) void Remove(int pos)


+ 3
- 3
test/tutorial/01_triangle.cpp 查看文件

@@ -36,9 +36,9 @@ class Triangle : public WorldEntity
public: public:
Triangle() Triangle()
{ {
m_vertices += vec2( 0.0, 0.8); 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.8, -0.8); m_vertices << vec2( 0.8, -0.8);
m_ready = false; m_ready = false;
} }




+ 12
- 12
test/tutorial/02_cube.cpp 查看文件

@@ -45,18 +45,18 @@ public:
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.5, 1.0));
m_mesh.Append(vec3(-1.0, 1.0, -1.0), vec3(0.0, 0.0, 1.0)); 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(0, 1, 2);
m_indices += i16vec3(2, 3, 0); m_indices << i16vec3(2, 3, 0);
m_indices += i16vec3(1, 5, 6); m_indices << i16vec3(1, 5, 6);
m_indices += i16vec3(6, 2, 1); m_indices << i16vec3(6, 2, 1);
m_indices += i16vec3(7, 6, 5); m_indices << i16vec3(7, 6, 5);
m_indices += i16vec3(5, 4, 7); m_indices << i16vec3(5, 4, 7);
m_indices += i16vec3(4, 0, 3); m_indices << i16vec3(4, 0, 3);
m_indices += i16vec3(3, 7, 4); m_indices << i16vec3(3, 7, 4);
m_indices += i16vec3(4, 5, 1); m_indices << i16vec3(4, 5, 1);
m_indices += i16vec3(1, 0, 4); m_indices << i16vec3(1, 0, 4);
m_indices += i16vec3(3, 2, 6); m_indices << i16vec3(3, 2, 6);
m_indices += i16vec3(6, 7, 3); m_indices << i16vec3(6, 7, 3);


m_ready = false; m_ready = false;
} }


||||||
x
 
000:0
Loading…
取消
儲存