Merge pull request #67 from 64/master

Fix OSX errors and warnings

includes/learnopengl/filesystem.h

@@ -2,6 +2,7 @@
 #define FILESYSTEM_H
 
 #include <string>
+#include <cstdlib>
 #include "root_directory.h" // This is a configuration file generated by CMake.
 
 class FileSystem

includes/learnopengl/model.h

@@ -141,29 +141,26 @@ private:
                 indices.push_back(face.mIndices[j]);
         }
         // process materials
-        if(mesh->mMaterialIndex >= 0)
+        aiMaterial* material = scene->mMaterials[mesh->mMaterialIndex];    
-        {
+        // we assume a convention for sampler names in the shaders. Each diffuse texture should be named
-            aiMaterial* material = scene->mMaterials[mesh->mMaterialIndex];
+        // as 'texture_diffuseN' where N is a sequential number ranging from 1 to MAX_SAMPLER_NUMBER. 
-            // we assume a convention for sampler names in the shaders. Each diffuse texture should be named
+        // Same applies to other texture as the following list summarizes:
-            // as 'texture_diffuseN' where N is a sequential number ranging from 1 to MAX_SAMPLER_NUMBER. 
+        // diffuse: texture_diffuseN
-            // Same applies to other texture as the following list summarizes:
+        // specular: texture_specularN
-            // diffuse: texture_diffuseN
+        // normal: texture_normalN
-            // specular: texture_specularN
-            // normal: texture_normalN
 
-            // 1. diffuse maps
+        // 1. diffuse maps
-            vector<Texture> diffuseMaps = loadMaterialTextures(material, aiTextureType_DIFFUSE, "texture_diffuse");
+        vector<Texture> diffuseMaps = loadMaterialTextures(material, aiTextureType_DIFFUSE, "texture_diffuse");
-            textures.insert(textures.end(), diffuseMaps.begin(), diffuseMaps.end());
+        textures.insert(textures.end(), diffuseMaps.begin(), diffuseMaps.end());
-            // 2. specular maps
+        // 2. specular maps
-            vector<Texture> specularMaps = loadMaterialTextures(material, aiTextureType_SPECULAR, "texture_specular");
+        vector<Texture> specularMaps = loadMaterialTextures(material, aiTextureType_SPECULAR, "texture_specular");
-            textures.insert(textures.end(), specularMaps.begin(), specularMaps.end());
+        textures.insert(textures.end(), specularMaps.begin(), specularMaps.end());
-            // 3. normal maps
+        // 3. normal maps
-            std::vector<Texture> normalMaps = loadMaterialTextures(material, aiTextureType_HEIGHT, "texture_normal");
+        std::vector<Texture> normalMaps = loadMaterialTextures(material, aiTextureType_HEIGHT, "texture_normal");
-            textures.insert(textures.end(), normalMaps.begin(), normalMaps.end());
+        textures.insert(textures.end(), normalMaps.begin(), normalMaps.end());
-            // 4. height maps
+        // 4. height maps
-            std::vector<Texture> heightMaps = loadMaterialTextures(material, aiTextureType_AMBIENT, "texture_height");
+        std::vector<Texture> heightMaps = loadMaterialTextures(material, aiTextureType_AMBIENT, "texture_height");
-            textures.insert(textures.end(), heightMaps.begin(), heightMaps.end());
+        textures.insert(textures.end(), heightMaps.begin(), heightMaps.end());
-        }
         
         // return a mesh object created from the extracted mesh data
         return Mesh(vertices, indices, textures);

src/1.getting_started/3.1.shaders_uniform/shaders_uniform.cpp

@@ -2,6 +2,7 @@
 #include <GLFW/glfw3.h>
 
 #include <iostream>
+#include <cmath>
 
 void framebuffer_size_callback(GLFWwindow* window, int width, int height);
 void processInput(GLFWwindow *window);

src/5.advanced_lighting/2.gamma_correction/gamma_correction.cpp

@@ -22,7 +22,7 @@ unsigned int loadTexture(const char *path, bool gammaCorrection);
 // settings
 const unsigned int SCR_WIDTH = 1280;
 const unsigned int SCR_HEIGHT = 720;
-bool gamma = false;
+bool gammaEnabled = false;
 bool gammaKeyPressed = false;
 
 // camera
@@ -160,14 +160,14 @@ int main()
         glUniform3fv(glGetUniformLocation(shader.ID, "lightPositions"), 4, &lightPositions[0][0]);
         glUniform3fv(glGetUniformLocation(shader.ID, "lightColors"), 4, &lightColors[0][0]);
         shader.setVec3("viewPos", camera.Position);
-        shader.setInt("gamma", gamma);
+        shader.setInt("gamma", gammaEnabled);
         // floor
         glBindVertexArray(planeVAO);
         glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, gamma ? floorTextureGammaCorrected : floorTexture);
+        glBindTexture(GL_TEXTURE_2D, gammaEnabled ? floorTextureGammaCorrected : floorTexture);
         glDrawArrays(GL_TRIANGLES, 0, 6);
 
-        std::cout << (gamma ? "Gamma enabled" : "Gamma disabled") << std::endl;
+        std::cout << (gammaEnabled ? "Gamma enabled" : "Gamma disabled") << std::endl;
 
         // glfw: swap buffers and poll IO events (keys pressed/released, mouse moved etc.)
         // -------------------------------------------------------------------------------
@@ -202,7 +202,7 @@ void processInput(GLFWwindow *window)
 
     if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_PRESS && !gammaKeyPressed)
     {
-        gamma = !gamma;
+        gammaEnabled = !gammaEnabled;
         gammaKeyPressed = true;
     }
     if (glfwGetKey(window, GLFW_KEY_SPACE) == GLFW_RELEASE)