Merge branch 'master' of https://github.com/erwincoumans/bullet3

examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp

@@ -6,7 +6,7 @@
 #include "../ImportObjDemo/Wavefront2GLInstanceGraphicsShape.h"
 #include "../../Utils/b3ResourcePath.h"
 #include "Bullet3Common/b3FileUtils.h"
-#include "../../ThirdPartyLibs/stb_image/stb_image.h"
+#include "stb_image/stb_image.h"
 #include "../ImportObjDemo/LoadMeshFromObj.h"
 bool b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(const std::string& fileName, b3ImportMeshData& meshData)
 {

examples/OpenGLWindow/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 INCLUDE_DIRECTORIES(
 	..
+	../ThirdPartyLibs
 	../../src
 )
 

examples/OpenGLWindow/GLInstancingRenderer.cpp

@@ -1406,7 +1406,7 @@ void GLInstancingRenderer::updateCamera(int upAxis)
 
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
 {
 

examples/OpenGLWindow/SimpleOpenGL3App.cpp

@@ -919,7 +919,7 @@ void SimpleOpenGL3App::getScreenPixels(unsigned char* rgbaBuffer, int bufferSize
 }
 
 //#define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 static void writeTextureToFile(int textureWidth, int textureHeight, const char* fileName, FILE* ffmpegVideo)
 {
 	int numComponents = 4;

examples/OpenGLWindow/fontstash.cpp

@@ -37,7 +37,7 @@
 #define STB_TRUETYPE_IMPLEMENTATION
 #define STBTT_malloc(x,u)    malloc(x)
 #define STBTT_free(x,u)      free(x)
-#include "stb_truetype.h"
+#include "stb_image/stb_truetype.h"
 
 #define HASH_LUT_SIZE 256
 

examples/OpenGLWindow/opengl_fontstashcallbacks.cpp

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "stb_image_write.h"
+#include "stb_image/stb_image_write.h"
 
 
 static unsigned int s_indexData[INDEX_COUNT];

examples/OpenGLWindow/premake4.lua

@@ -9,7 +9,7 @@
 		initGlew()
 
 		includedirs {
-		 	
+		 	"../ThirdPartyLibs",
 		 	"../../src",
 		}
 		

examples/SharedMemory/TinyRendererVisualShapeConverter.cpp

@@ -34,7 +34,7 @@ subject to the following restrictions:
 #include "../Importers/ImportURDFDemo/UrdfParser.h"
 #include "../SharedMemory/SharedMemoryPublic.h"//for b3VisualShapeData
 #include "../TinyRenderer/model.h"
-#include "../ThirdPartyLibs/stb_image/stb_image.h"
+#include "stb_image/stb_image.h"
 
 struct MyTexture2
 {

test/InverseDynamics/CMakeLists.txt

@@ -37,6 +37,7 @@ INCLUDE_DIRECTORIES(
         ../../src
         ../gtest-1.7.0/include
         ../../Extras/InverseDynamics
+        ../../examples/ThirdPartyLibs
 )
 
 

test/InverseDynamics/premake4.lua

@@ -85,8 +85,8 @@
                 "../../examples/InverseDynamics",
                 "../../examples/ThirdPartyLibs",
                 "../../Extras/InverseDynamics",
-                "../gtest-1.7.0/include"
-
+                "../gtest-1.7.0/include",
+                "../../examples/ThirdPartyLibs",
         }