From ad0e3f8b6d5d6ab93b2c3cab0ada90963d809ba5 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sat, 21 Apr 2012 15:08:37 +0000
Subject: [PATCH] tutorial: fix the inconsistent vertex counting.

---
 test/tutorial/02_cube.cpp | 18 +++++++++---------
 win32/01_triangle.vcxproj |  4 ++--
 win32/02_cube.vcxproj     |  2 +-
 win32/03_fractal.vcxproj  |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/tutorial/02_cube.cpp b/test/tutorial/02_cube.cpp
index 43f45446..be691e6c 100644
--- a/test/tutorial/02_cube.cpp
+++ b/test/tutorial/02_cube.cpp
@@ -35,15 +35,15 @@ public:
         m_angle = 0;
 
         /* Front vertices/colors */
-        m_mesh += vec3(-1.0, -1.0,  1.0); m_mesh += vec3(1.0, 0.0, 1.0);
-        m_mesh += vec3( 1.0, -1.0,  1.0); m_mesh += vec3(0.0, 1.0, 0.0);
-        m_mesh += vec3( 1.0,  1.0,  1.0); m_mesh += vec3(1.0, 0.5, 0.0);
-        m_mesh += vec3(-1.0,  1.0,  1.0); m_mesh += vec3(1.0, 1.0, 0.0);
+        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));
         /* Back */
-        m_mesh += vec3(-1.0, -1.0, -1.0); m_mesh += vec3(1.0, 0.0, 0.0);
-        m_mesh += vec3( 1.0, -1.0, -1.0); m_mesh += vec3(0.0, 0.5, 0.0);
-        m_mesh += vec3( 1.0,  1.0, -1.0); m_mesh += vec3(0.0, 0.5, 1.0);
-        m_mesh += vec3(-1.0,  1.0, -1.0); m_mesh += vec3(0.0, 0.0, 1.0);
+        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_indices += i16vec3(0, 1, 2);
         m_indices += i16vec3(2, 3, 0);
@@ -156,7 +156,7 @@ public:
 private:
     float m_angle;
     mat4 m_matrix;
-    Array<vec3> m_mesh;
+    Array<vec3,vec3> m_mesh;
     Array<i16vec3> m_indices;
 
     Shader *m_shader;
diff --git a/win32/01_triangle.vcxproj b/win32/01_triangle.vcxproj
index a3c5a0af..9560a9fc 100644
--- a/win32/01_triangle.vcxproj
+++ b/win32/01_triangle.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\tut01.cpp" />
+    <ClCompile Include="..\test\tutorial\01_triangle.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lolcore.vcxproj">
@@ -52,4 +52,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win32/02_cube.vcxproj b/win32/02_cube.vcxproj
index 1dce3f4a..b353b27f 100644
--- a/win32/02_cube.vcxproj
+++ b/win32/02_cube.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\tut02.cpp" />
+    <ClCompile Include="..\test\tutorial\02_cube.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lolcore.vcxproj">
diff --git a/win32/03_fractal.vcxproj b/win32/03_fractal.vcxproj
index dee92ddd..f352785e 100644
--- a/win32/03_fractal.vcxproj
+++ b/win32/03_fractal.vcxproj
@@ -27,7 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\test\tutorial\tut03.cpp" />
+    <ClCompile Include="..\test\tutorial\03_fractal.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="lolcore.vcxproj">