Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erwin Coumans
2017-06-22 16:30:03 -07:00
parent d1481c78ba fbff4c57ca
commit 31fb1c2e79
12 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
View File

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

1
examples/OpenGLWindow/CMakeLists.txt
View File

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

2
examples/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -1406,7 +1406,7 @@ void GLInstancingRenderer::updateCamera(int upAxis)
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#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) void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
{ {

2
examples/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -919,7 +919,7 @@ void SimpleOpenGL3App::getScreenPixels(unsigned char* rgbaBuffer, int bufferSize
} }
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#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) static void writeTextureToFile(int textureWidth, int textureHeight, const char* fileName, FILE* ffmpegVideo)
{ {
int numComponents = 4; int numComponents = 4;

2
examples/OpenGLWindow/fontstash.cpp
View File

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

2
examples/OpenGLWindow/opengl_fontstashcallbacks.cpp
View File

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

2
examples/OpenGLWindow/premake4.lua
View File

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

2
examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
View File

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

0
examples/OpenGLWindow/stb_image_write.h → examples/ThirdPartyLibs/stb_image/stb_image_write.h
View File

0
examples/OpenGLWindow/stb_truetype.h → examples/ThirdPartyLibs/stb_image/stb_truetype.h
View File

1
test/InverseDynamics/CMakeLists.txt
View File

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

4
test/InverseDynamics/premake4.lua
View File

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