mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation errors on Visual Studio

Browse Source
This commit is contained in:
Daniel Chappuis 2016-03-01 18:40:22 +01:00
parent d0481e0901
commit 41d0c60d49
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testbed/common/HeightField.cpp
View File

@ -223,7 +223,7 @@ void HeightField::generateHeightField() {
// Generate the graphics mesh to render the height field // Generate the graphics mesh to render the height field
void HeightField::generateGraphicsMesh() { void HeightField::generateGraphicsMesh() {
std::vector<uint> indices; std::vector<unsigned int> indices;
int vertexId = 0; int vertexId = 0;
for (int i=0; i<NB_POINTS_WIDTH; i++) { for (int i=0; i<NB_POINTS_WIDTH; i++) {
@ -238,10 +238,10 @@ void HeightField::generateGraphicsMesh() {
// Triangle indices // Triangle indices
if ((i < NB_POINTS_WIDTH - 1) && (j < NB_POINTS_LENGTH - 1)) { if ((i < NB_POINTS_WIDTH - 1) && (j < NB_POINTS_LENGTH - 1)) {
int v1 = vertexId; unsigned int v1 = vertexId;
int v2 = vertexId + 1; unsigned int v2 = vertexId + 1;
int v3 = vertexId + NB_POINTS_LENGTH; unsigned int v3 = vertexId + NB_POINTS_LENGTH;
int v4 = vertexId + NB_POINTS_LENGTH + 1; unsigned int v4 = vertexId + NB_POINTS_LENGTH + 1;
// First triangle // First triangle
indices.push_back(v1); indices.push_back(v1);

2
testbed/opengl-framework/src/Mesh.h
View File

@ -49,7 +49,7 @@ class Mesh : public Object3D {
// -------------------- Attributes -------------------- // // -------------------- Attributes -------------------- //
// A triplet of vertex indices for each triangle // 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) // Vertices coordinates (local space)
std::vector<Vector3> mVertices; std::vector<Vector3> mVertices;