Fixes for MSVC

daw42 · May 3, 2018 · 3d23376 · 3d23376
1 parent ed7488f
commit 3d23376
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,10 @@ set (CMAKE_CXX_STANDARD 11)
 
 project (GLSLCOOKBOOK)
 
+if(MSVC)
+  add_definitions(/DNOMINMAX)
+endif()
+
 find_package( glm CONFIG REQUIRED )
 find_package( glfw3 CONFIG REQUIRED )
 find_package( OpenGL REQUIRED )

diff --git a/chapter01/main.cpp b/chapter01/main.cpp
@@ -6,6 +6,8 @@
 #include "scenebasic_uniform.h"
 #include "scenebasic_uniformblock.h"
 
+#include <memory>
+
 static std::map< std::string, std::string > sceneData = {
 		{"basic", "Basic scene."},
 		{"basic-attrib", "Prints active attributes."},

diff --git a/chapter07/frustum.cpp b/chapter07/frustum.cpp
@@ -108,7 +108,7 @@ void Frustum::render() const
 
 void Frustum::deleteBuffers() {
     if( ! buffers.empty() ) {
-        glDeleteBuffers( buffers.size(), buffers.data() );
+        glDeleteBuffers( (GLsizei)buffers.size(), buffers.data() );
         buffers.clear();
     }
 

diff --git a/chapter08/main.cpp b/chapter08/main.cpp
@@ -6,6 +6,8 @@
 #include "scenewood.h"
 #include "scenenoise.h"
 
+#include <memory>
+
 std::map<std::string, std::string> sceneInfo = {
 		{ "noise", "just display the raw noise texture" },
 		{ "decay", "decay of a teapot" },

diff --git a/chapter09/main.cpp b/chapter09/main.cpp
@@ -6,6 +6,8 @@
 #include "scenesmoke.h"
 #include "scenewave.h"
 
+#include <memory>
+
 std::map<std::string, std::string> sceneInfo = {
 		{ "fire", "particles simulating fire" },
 		{ "particles", "a fountain of particles" },

diff --git a/chapter10/main.cpp b/chapter10/main.cpp
@@ -4,6 +4,8 @@
 #include "sceneparticles.h"
 #include "sceneedge.h"
 
+#include <memory>
+
 std::map<std::string, std::string> sceneInfo = {
         { "particles", "Simple particle simulation" },
         { "mandelbrot", "Mandelbrot set with compute shader" },

diff --git a/ingredients/glslprogram.cpp b/ingredients/glslprogram.cpp
@@ -225,7 +225,7 @@ void GLSLProgram::findUniformLocations() {
 
     GLenum properties[] = {GL_NAME_LENGTH, GL_TYPE, GL_LOCATION, GL_BLOCK_INDEX};
 
-    for( GLuint i = 0; i < numUniforms; ++i ) {
+    for( GLint i = 0; i < numUniforms; ++i ) {
       GLint results[4];
       glGetProgramResourceiv(handle, GL_UNIFORM, i, 4, properties, 4, NULL, results);
 

diff --git a/ingredients/objmesh.cpp b/ingredients/objmesh.cpp
@@ -302,8 +302,8 @@ void ObjMesh::ObjMeshData::toGlMesh(GlMeshData & data) {
                 data.tangents.push_back( tang.w );
             }
 
-            data.faces.push_back(vIdx);
-            vertexMap[vertStr] = vIdx;
+            data.faces.push_back((GLuint)vIdx);
+            vertexMap[vertStr] = (GLuint)vIdx;
         } else {
             data.faces.push_back(it->second);
         }

diff --git a/ingredients/objmesh.h b/ingredients/objmesh.h
@@ -7,6 +7,7 @@
 #include <vector>
 #include <glm/glm.hpp>
 #include <string>
+#include <memory>
 
 class ObjMesh : public TriangleMesh {
 private:

diff --git a/ingredients/torus.cpp b/ingredients/torus.cpp
@@ -22,11 +22,11 @@ Torus::Torus(GLfloat outerRadius, GLfloat innerRadius, GLuint nsides, GLuint nri
     float ringFactor = glm::two_pi<float>() / nrings;
 	float sideFactor = glm::two_pi<float>() / nsides;
     int idx = 0, tidx = 0;
-    for( int ring = 0; ring <= nrings; ring++ ) {
+    for( GLuint ring = 0; ring <= nrings; ring++ ) {
         float u = ring * ringFactor;
         float cu = cos(u);
         float su = sin(u);
-        for( int side = 0; side < nsides; side++ ) {
+        for( GLuint side = 0; side < nsides; side++ ) {
             float v = side * sideFactor;
             float cv = cos(v);
             float sv = sin(v);
@@ -55,7 +55,7 @@ Torus::Torus(GLfloat outerRadius, GLfloat innerRadius, GLuint nsides, GLuint nri
     for( GLuint ring = 0; ring < nrings; ring++ ) {
         GLuint ringStart = ring * nsides;
         GLuint nextRingStart = (ring + 1) * nsides;
-        for( int side = 0; side < nsides; side++ ) {
+        for( GLuint side = 0; side < nsides; side++ ) {
             int nextSide = (side+1) % nsides;
             // The quad
             el[idx] = (ringStart + side);

diff --git a/ingredients/trianglemesh.cpp b/ingredients/trianglemesh.cpp
@@ -12,7 +12,7 @@ void TriangleMesh::initBuffers(
     if( indices == nullptr || points == nullptr || normals == nullptr )
         return;
 
-    nVerts = indices->size();
+    nVerts = (GLuint)indices->size();
 
     GLuint indexBuf = 0, posBuf = 0, normBuf = 0, tcBuf = 0, tangentBuf = 0;
     glGenBuffers(1, &indexBuf);
@@ -89,7 +89,7 @@ TriangleMesh::~TriangleMesh() {
 
 void TriangleMesh::deleteBuffers() {
     if( buffers.size() > 0 ) {
-        glDeleteBuffers( buffers.size(), buffers.data() );
+        glDeleteBuffers( (GLsizei)buffers.size(), buffers.data() );
         buffers.clear();
     }