Browse Source

tutorial: fix the inconsistent vertex counting.

legacy
Sam Hocevar sam 13 years ago
parent
commit
ad0e3f8b6d
4 changed files with 13 additions and 13 deletions
  1. +9
    -9
      test/tutorial/02_cube.cpp
  2. +2
    -2
      win32/01_triangle.vcxproj
  3. +1
    -1
      win32/02_cube.vcxproj
  4. +1
    -1
      win32/03_fractal.vcxproj

+ 9
- 9
test/tutorial/02_cube.cpp View File

@@ -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;


+ 2
- 2
win32/01_triangle.vcxproj View File

@@ -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>

+ 1
- 1
win32/02_cube.vcxproj View File

@@ -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">


+ 1
- 1
win32/03_fractal.vcxproj View File

@@ -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">


Loading…
Cancel
Save