From 41d0c60d49661ddc4c7b78a4cf4714d4e5af3c4b Mon Sep 17 00:00:00 2001
From: Daniel Chappuis <chappuis.daniel@gmail.com>
Date: Tue, 1 Mar 2016 18:40:22 +0100
Subject: [PATCH] Fix compilation errors on Visual Studio

---
 testbed/common/HeightField.cpp      | 10 +++++-----
 testbed/opengl-framework/src/Mesh.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testbed/common/HeightField.cpp b/testbed/common/HeightField.cpp
index a22f8cf0..58dc6af4 100644
--- a/testbed/common/HeightField.cpp
+++ b/testbed/common/HeightField.cpp
@@ -223,7 +223,7 @@ void HeightField::generateHeightField() {
 // Generate the graphics mesh to render the height field
 void HeightField::generateGraphicsMesh() {
 
-    std::vector<uint> indices;
+    std::vector<unsigned int> indices;
     int vertexId = 0;
 
     for (int i=0; i<NB_POINTS_WIDTH; i++) {
@@ -238,10 +238,10 @@ void HeightField::generateGraphicsMesh() {
             // Triangle indices
             if ((i < NB_POINTS_WIDTH - 1) && (j < NB_POINTS_LENGTH - 1)) {
 
-                int v1 = vertexId;
-                int v2 = vertexId + 1;
-                int v3 = vertexId + NB_POINTS_LENGTH;
-                int v4 = vertexId + NB_POINTS_LENGTH + 1;
+                unsigned int v1 = vertexId;
+                unsigned int v2 = vertexId + 1;
+                unsigned int v3 = vertexId + NB_POINTS_LENGTH;
+                unsigned int v4 = vertexId + NB_POINTS_LENGTH + 1;
 
                 // First triangle
                 indices.push_back(v1);
diff --git a/testbed/opengl-framework/src/Mesh.h b/testbed/opengl-framework/src/Mesh.h
index 92e5d144..68fc43ff 100644
--- a/testbed/opengl-framework/src/Mesh.h
+++ b/testbed/opengl-framework/src/Mesh.h
@@ -49,7 +49,7 @@ class Mesh : public Object3D {
         // -------------------- Attributes -------------------- //
 
         // A triplet of vertex indices for each triangle
-        std::vector<std::vector<uint> > mIndices;
+        std::vector<std::vector<unsigned int> > mIndices;
 
         // Vertices coordinates (local space)
         std::vector<Vector3> mVertices;