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

Merge pull request #232 from erwincoumans/master

Browse Source 
consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueType...
This commit is contained in:
erwincoumans
2014-09-03 10:21:02 -07:00
parent d6c78426bd 0125324bd6
commit b125a96294
30 changed files with 50 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos3/AllBullet2Demos/premake4.lua
View File

@@ -14,7 +14,7 @@
} }
links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"} links{"gwen", "OpenGL_Window","BulletSoftBody","BulletDynamics","BulletCollision","LinearMath","lua-5.2.3"}
initOpenGL() initOpenGL()
initGlew() initGlew()

6
Demos3/CpuDemos/main_opengl3core.cpp
View File

@@ -22,8 +22,8 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h" #include "OpenGLWindow/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" #include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "gwenUserInterface.h" #include "gwenUserInterface.h"
#include "../btgui/Timing/b3Quickprof.h" #include "../btgui/Timing/b3Quickprof.h"
@@ -459,7 +459,7 @@ void myprintf(const char* msg)
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "OpenGLTrueTypeFont/stb_image_write.h" #include "OpenGLWindow/stb_image_write.h"
void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName) void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName)
{ {
int numComponents = 4; int numComponents = 4;

10
Demos3/CpuDemos/premake4.lua
View File

@@ -43,11 +43,11 @@ files {
"../../btgui/OpenGLWindow/TwFonts.h", "../../btgui/OpenGLWindow/TwFonts.h",
"../../btgui/OpenGLWindow/GLRenderToTexture.cpp", "../../btgui/OpenGLWindow/GLRenderToTexture.cpp",
"../../btgui/OpenGLWindow/GLRenderToTexture.h", "../../btgui/OpenGLWindow/GLRenderToTexture.h",
"../../btgui/OpenGLTrueTypeFont/fontstash.cpp", "../../btgui/OpenGLWindow/fontstash.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.h", "../../btgui/OpenGLWindow/fontstash.h",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
"../../btgui/FontFiles/OpenSans.cpp", "../../btgui/OpenGLWindow/OpenSans.cpp",
"../../btgui/stb_image/stb_image.cpp", "../../btgui/stb_image/stb_image.cpp",
"../../btgui/stb_image/stb_image.h", "../../btgui/stb_image/stb_image.h",
"../../btgui/Timing/b3Quickprof.cpp", "../../btgui/Timing/b3Quickprof.cpp",

6
Demos3/GpuDemos/main_opengl3core.cpp
View File

@@ -24,8 +24,8 @@
//#include "b3GpuDynamicsWorld.h" //#include "b3GpuDynamicsWorld.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h" #include "OpenGLWindow/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" #include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "gwenUserInterface.h" #include "gwenUserInterface.h"
#include "ParticleDemo.h" #include "ParticleDemo.h"
#include "broadphase/PairBench.h" #include "broadphase/PairBench.h"
@@ -543,7 +543,7 @@ void myprintf(const char* msg)
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "OpenGLTrueTypeFont/stb_image_write.h" #include "OpenGLWindow/stb_image_write.h"
void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName) void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName)
{ {
int numComponents = 4; int numComponents = 4;

10
Demos3/GpuDemos/premake4.lua
View File

@@ -52,11 +52,11 @@ function createProject(vendor)
"../../btgui/OpenGLWindow/TwFonts.h", "../../btgui/OpenGLWindow/TwFonts.h",
"../../btgui/OpenGLWindow/GLRenderToTexture.cpp", "../../btgui/OpenGLWindow/GLRenderToTexture.cpp",
"../../btgui/OpenGLWindow/GLRenderToTexture.h", "../../btgui/OpenGLWindow/GLRenderToTexture.h",
"../../btgui/OpenGLTrueTypeFont/fontstash.cpp", "../../btgui/OpenGLWindow/fontstash.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.h", "../../btgui/OpenGLWindow/fontstash.h",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
"../../btgui/FontFiles/OpenSans.cpp", "../../btgui/OpenGLWindow/OpenSans.cpp",
"../../btgui/stb_image/stb_image.cpp", "../../btgui/stb_image/stb_image.cpp",
"../../btgui/stb_image/stb_image.h", "../../btgui/stb_image/stb_image.h",
"../../btgui/Timing/b3Quickprof.cpp", "../../btgui/Timing/b3Quickprof.cpp",

4
Demos3/GpuGuiInitialize/main.cpp
View File

@@ -14,8 +14,8 @@
//#include "b3GpuDynamicsWorld.h" //#include "b3GpuDynamicsWorld.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h" #include "OpenGLWindow/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" #include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/GwenOpenGL3CoreRenderer.h" #include "OpenGLWindow/GwenOpenGL3CoreRenderer.h"
#include "../btgui/Timing/b3Quickprof.h" #include "../btgui/Timing/b3Quickprof.h"

10
Demos3/GpuGuiInitialize/premake4.lua
View File

@@ -42,11 +42,11 @@ function createProject(vendor)
"../../btgui/OpenGLWindow/TwFonts.cpp", "../../btgui/OpenGLWindow/TwFonts.cpp",
"../../btgui/OpenGLWindow/TwFonts.h", "../../btgui/OpenGLWindow/TwFonts.h",
"../../btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h", "../../btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h",
"../../btgui/FontFiles/OpenSans.cpp", "../../btgui/OpenGLWindow/OpenSans.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.cpp", "../../btgui/OpenGLWindow/fontstash.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.h", "../../btgui/OpenGLWindow/fontstash.h",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp", "../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h", "../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",

10
Demos3/ImplicitCloth/premake4.lua
View File

@@ -35,11 +35,11 @@
"../../btgui/OpenGLWindow/GLRenderToTexture.h", "../../btgui/OpenGLWindow/GLRenderToTexture.h",
"../../btgui/OpenGLWindow/TwFonts.cpp", "../../btgui/OpenGLWindow/TwFonts.cpp",
"../../btgui/OpenGLWindow/TwFonts.h", "../../btgui/OpenGLWindow/TwFonts.h",
"../../btgui/FontFiles/OpenSans.cpp", "../../btgui/OpenGLWindow/OpenSans.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.cpp", "../../btgui/OpenGLWindow/fontstash.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.h", "../../btgui/OpenGLWindow/fontstash.h",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
"../../src/Bullet3Common/**.cpp", "../../src/Bullet3Common/**.cpp",
"../../src/Bullet3Common/**.h", "../../src/Bullet3Common/**.h",
"../../btgui/Timing/b3Clock.cpp", "../../btgui/Timing/b3Clock.cpp",

10
Demos3/SimpleOpenGL3/premake4.lua
View File

@@ -12,18 +12,16 @@
"../../btgui" "../../btgui"
} }
initOpenGL()
initGlew()
links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont"} links{ "OpenGL_Window"}
initOpenGL()
initGlew()
files { files {
"**.cpp", "**.cpp",
"**.h", "**.h",
"../../src/Bullet3Common/**.cpp", "../../src/Bullet3Common/**.cpp",
"../../src/Bullet3Common/**.h", "../../src/Bullet3Common/**.h",
"../../btgui/Timing/b3Clock.cpp",
"../../btgui/Timing/b3Clock.h"
} }

51
btgui/GwenOpenGLTest/Apple/premake4.lua
View File

@@ -1,51 +0,0 @@
if os.is("macosx") then
project "Gwen_OpenGLTest_Apple"
kind "ConsoleApp"
flags {"Unicode"}
defines { "GWEN_COMPILE_STATIC" , "_HAS_EXCEPTIONS=0", "_STATIC_CPPLIB" }
targetdir "../../../../bin"
includedirs
{
"../..","..","../../../rendertest","../../../../bullet2"
}
initOpenGL()
initGlew()
links {
"gwen","Cocoa.framework"
}
files {
"../../../rendertest/MacOpenGLWindow.mm",
"../../../rendertest/MacOpenGLWindow.h",
"../../../rendertest/TwFonts.cpp",
"../../../rendertest/TwFonts.h",
"../../../rendertest/LoadShader.cpp",
"../../../rendertest/LoadShader.h",
"../../../rendertest/GLPrimitiveRenderer.cpp",
"../../../rendertest/GLPrimitiveRenderer.h",
"../../../rendertest/GwenOpenGL3CoreRenderer.h",
"../../../OpenGLTrueTypeFont/fontstash.cpp",
"../../../OpenGLTrueTypeFont/fontstash.h",
"../../../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../bullet2/LinearMath/b3ConvexHullComputer.cpp",
"../../../../bullet2/LinearMath/b3ConvexHullComputer.h",
"../../../../bullet2/LinearMath/btSerializer.cpp",
"../../../../bullet2/LinearMath/btSerializer.h",
"../../../../bullet2/LinearMath/b3AlignedAllocator.cpp",
"../../../../bullet2/LinearMath/b3Quickprof.cpp",
"../../../../bullet2/LinearMath/b3Quickprof.h",
"../**.cpp",
"../**.h",
}
end

2
btgui/GwenOpenGLTest/OpenGLSample.cpp
View File

@@ -21,7 +21,7 @@ extern char OpenSansData[];
#endif //_WIN32 #endif //_WIN32
#endif//__APPLE__ #endif//__APPLE__
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" #include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/GwenOpenGL3CoreRenderer.h" #include "OpenGLWindow/GwenOpenGL3CoreRenderer.h"
#include "OpenGLWindow/GLPrimitiveRenderer.h" #include "OpenGLWindow/GLPrimitiveRenderer.h"

10
btgui/GwenOpenGLTest/premake4.lua
View File

@@ -25,7 +25,7 @@
files { files {
"../FontFiles/OpenSans.cpp", "../OpenGLWindow/OpenSans.cpp",
"../OpenGLWindow/TwFonts.cpp", "../OpenGLWindow/TwFonts.cpp",
"../OpenGLWindow/TwFonts.h", "../OpenGLWindow/TwFonts.h",
"../OpenGLWindow/LoadShader.cpp", "../OpenGLWindow/LoadShader.cpp",
@@ -33,10 +33,10 @@
"../OpenGLWindow/GLPrimitiveRenderer.cpp", "../OpenGLWindow/GLPrimitiveRenderer.cpp",
"../OpenGLWindow/GLPrimitiveRenderer.h", "../OpenGLWindow/GLPrimitiveRenderer.h",
"../OpenGLWindow/GwenOpenGL3CoreRenderer.h", "../OpenGLWindow/GwenOpenGL3CoreRenderer.h",
"../OpenGLTrueTypeFont/fontstash.cpp", "../OpenGLWindow/fontstash.cpp",
"../OpenGLTrueTypeFont/fontstash.h", "../OpenGLWindow/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp", "../OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h", "../OpenGLWindow/opengl_fontstashcallbacks.h",
"../../btgui/Timing/b3Clock.cpp", "../../btgui/Timing/b3Clock.cpp",
"../../btgui/Timing/b3Clock.h", "../../btgui/Timing/b3Clock.h",
"**.cpp", "**.cpp",

31
btgui/OpenGLTrueTypeFont/premake4.lua
View File

@@ -1,31 +0,0 @@
project "OpenGL_TrueTypeFont"
language "C++"
kind "StaticLib"
initOpenGL()
initGlew()
includedirs {
"../../src",
".."
}
if os.is("Linux") then
initX11()
end
files
{
"../FontFiles/OpenSans.cpp",
"fontstash.cpp",
"fontstash.h",
"opengl_fontstashcallbacks.cpp",
"opengl_fontstashcallbacks.h",
"stb_image_write.h",
"stb_truetype.h",
}

4
btgui/OpenGLWindow/CMakeLists.txt
View File

@@ -4,13 +4,13 @@ INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/btgui ${BULLET_PHYSICS_SOURCE_DIR}/btgui
) )
FILE(GLOB OpenGLWindow_HDRS "*.h" "../OpenGLTrueTypeFont/*.h") FILE(GLOB OpenGLWindow_HDRS "*.h" )
FILE(GLOB OpenGLWindowMac_CPP "Mac*.mm") FILE(GLOB OpenGLWindowMac_CPP "Mac*.mm")
FILE(GLOB OpenGLWindowWin32_CPP "Win32*.cpp") FILE(GLOB OpenGLWindowWin32_CPP "Win32*.cpp")
FILE(GLOB OpenGLWindowLinux_CPP "X11*.cpp") FILE(GLOB OpenGLWindowLinux_CPP "X11*.cpp")
FILE(GLOB OpenGLWindowCommon_CPP "*.cpp" "../OpenGLTrueTypeFont/*.cpp" "../FontFiles/OpenSans.cpp" ) FILE(GLOB OpenGLWindowCommon_CPP "*.cpp" )
LIST(REMOVE_ITEM OpenGLWindowCommon_CPP ${OpenGLWindowMac_CPP} ) LIST(REMOVE_ITEM OpenGLWindowCommon_CPP ${OpenGLWindowMac_CPP} )
LIST(REMOVE_ITEM OpenGLWindowCommon_CPP ${OpenGLWindowWin32_CPP} ) LIST(REMOVE_ITEM OpenGLWindowCommon_CPP ${OpenGLWindowWin32_CPP} )

2
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -1245,7 +1245,7 @@ void GLInstancingRenderer::getMouseDirection(float* dir, int x, int y)
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "OpenGLTrueTypeFont/stb_image_write.h" #include "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
btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h
View File

@@ -6,7 +6,7 @@
#include "Gwen/BaseRender.h" #include "Gwen/BaseRender.h"
#include "GLPrimitiveRenderer.h" #include "GLPrimitiveRenderer.h"
struct sth_stash; struct sth_stash;
#include "../OpenGLTrueTypeFont/fontstash.h" #include "fontstash.h"
#include "Gwen/Texture.h" #include "Gwen/Texture.h"
#include "TwFonts.h" #include "TwFonts.h"

0
btgui/FontFiles/OpenSans.cpp → btgui/OpenGLWindow/OpenSans.cpp
View File

0
btgui/FontFiles/OpenSans.ttf → btgui/OpenGLWindow/OpenSans.ttf
View File

10
btgui/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -21,11 +21,11 @@
#include "Bullet3Common/b3Vector3.h" #include "Bullet3Common/b3Vector3.h"
#include "Bullet3Common/b3Logging.h" #include "Bullet3Common/b3Logging.h"
#include "OpenGLTrueTypeFont/fontstash.h" #include "OpenGLWindow/fontstash.h"
#include "OpenGLWindow/TwFonts.h" #include "OpenGLWindow/TwFonts.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h" #include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include <assert.h> #include <assert.h>
#include "GLRenderToTexture.h" #include "OpenGLWindow/GLRenderToTexture.h"
#ifdef _WIN32 #ifdef _WIN32
#define popen _popen #define popen _popen
@@ -225,8 +225,6 @@ void SimpleOpenGL3App::drawText( const char* txt, int posX, int posY)
//r.w = g_DefaultNormalFont->m_CharWidth[c]+extraSpacing; //r.w = g_DefaultNormalFont->m_CharWidth[c]+extraSpacing;
int endX = startX+g_DefaultNormalFont->m_CharWidth[c]; int endX = startX+g_DefaultNormalFont->m_CharWidth[c];
int endY = startY+g_DefaultNormalFont->m_CharHeight; int endY = startY+g_DefaultNormalFont->m_CharHeight;
//Gwen::Rect rect = r;
//Translate( rect );
float currentColor[]={0.2f,0.2,0.2f,1.f}; float currentColor[]={0.2f,0.2,0.2f,1.f};
@@ -425,7 +423,7 @@ SimpleOpenGL3App::~SimpleOpenGL3App()
} }
//#define STB_IMAGE_WRITE_IMPLEMENTATION //#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "OpenGLTrueTypeFont/stb_image_write.h" #include "OpenGLWindow/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;

0
btgui/OpenGLTrueTypeFont/fontstash.cpp → btgui/OpenGLWindow/fontstash.cpp
View File

0
btgui/OpenGLTrueTypeFont/fontstash.h → btgui/OpenGLWindow/fontstash.h
View File

0
btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp → btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp
View File

0
btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h → btgui/OpenGLWindow/opengl_fontstashcallbacks.h
View File

0
btgui/OpenGLTrueTypeFont/stb_image_write.h → btgui/OpenGLWindow/stb_image_write.h
View File

0
btgui/OpenGLTrueTypeFont/stb_truetype.h → btgui/OpenGLWindow/stb_truetype.h
View File

4
build3/bin2cpp.bat
View File

@@ -2,6 +2,6 @@
rem @echo off rem @echo off
premake4 --file=bin2cpp.lua --binfile="../btgui/FontFiles/OpenSans.ttf" --cppfile="../btgui/FontFiles/OpenSans.cpp" --stringname="OpenSansData" bin2cpp premake4 --file=bin2cpp.lua --binfile="../btgui/FontFiles/OpenSans.ttf" --cppfile="../btgui/OpenGLWindow/OpenSans.cpp" --stringname="OpenSansData" bin2cpp
pause pause

1
build3/findOpenGLGlewGlut.lua
View File

@@ -78,6 +78,7 @@
configuration{"Linux"} configuration{"Linux"}
if not _OPTIONS["force_dlopen_opengl"] and (os.isdir("/usr/include") and os.isfile("/usr/include/GL/gl.h") and os.isfile("/usr/include/GL/glew.h")) then if not _OPTIONS["force_dlopen_opengl"] and (os.isdir("/usr/include") and os.isfile("/usr/include/GL/gl.h") and os.isfile("/usr/include/GL/glew.h")) then
links {"GLEW"} links {"GLEW"}
print ("linking against system GLEW")
else else
print("Using static glew and dynamic loading of glx functions") print("Using static glew and dynamic loading of glx functions")
defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"} defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}

2
build3/premake4.lua
View File

@@ -124,7 +124,6 @@ if findOpenGL3() then
include "../Demos3/GpuDemos" include "../Demos3/GpuDemos"
include"../Demos3/BasicDemoConsole" include"../Demos3/BasicDemoConsole"
include"../Demos3/BasicDemoCustomOpenGL2" include"../Demos3/BasicDemoCustomOpenGL2"
include "../btgui/OpenGLTrueTypeFont"
-- include "../Demos3/CpuDemos" -- include "../Demos3/CpuDemos"
-- include "../Demos3/Wavefront" -- include "../Demos3/Wavefront"
@@ -175,7 +174,6 @@ end
-- include "../demo/gpu_initialize" -- include "../demo/gpu_initialize"
-- include "../opencl/lds_bank_conflict" -- include "../opencl/lds_bank_conflict"
-- include "../opencl/reduce" -- include "../opencl/reduce"
-- include "../btgui/OpenGLTrueTypeFont"
-- include "../btgui/OpenGLWindow" -- include "../btgui/OpenGLWindow"
-- include "../demo/ObjLoader" -- include "../demo/ObjLoader"
-- include "../test/b3DynamicBvhBroadphase" -- include "../test/b3DynamicBvhBroadphase"

0
build3/stringify_linux.sh → build3/stringify.sh
View File

26
build3/stringify_osx.sh
View File

@@ -1,26 +0,0 @@
#!/bin/sh
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32Kernels.cl" --headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/RadixSort32KernelsCL.h" --stringname="radixSort32KernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernels.cl" --headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/BoundSearchKernelsCL.h" --stringname="boundSearchKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernels.cl" --headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/PrefixScanKernelsCL.h" --stringname="prefixScanKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernels.cl" --headerfile="../src/Bullet3OpenCL/ParallelPrimitives/kernels/FillKernelsCL.h" --stringname="fillKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sap.cl" --headerfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sapKernels.h" --stringname="sapCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sapFast.cl" --headerfile="../src/Bullet3OpenCL/BroadphaseCollision/kernels/sapFastKernels.h" --stringname="sapFastCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/sat.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/satKernels.h" --stringname="satKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/satClipHullContacts.h" --stringname="satClipKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/primitiveContacts.h" --stringname="primitiveContactsKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.cl" --headerfile="../src/Bullet3OpenCL/NarrowphaseCollision/kernels/bvhTraversal.h" --stringname="bvhTraversalKernelCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/integrateKernel.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/integrateKernel.h" --stringname="integrateKernelCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/updateAabbsKernel.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/updateAabbsKernel.h" --stringname="updateAabbsKernelCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup.h" --stringname="solverSetupCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup2.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solverSetup2.h" --stringname="solverSetup2CL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernels.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernels.h" --stringname="batchingKernelsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernelsNew.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/batchingKernelsNew.h" --stringname="batchingKernelsNewCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solverUtils.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solverUtils.h" --stringname="solverUtilsCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solveContact.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solveContact.h" --stringname="solveContactCL" stringify
./premake4_osx --file=stringifyKernel.lua --kernelfile="../src/Bullet3OpenCL/RigidBody//kernels/solveFriction.cl" --headerfile="../src/Bullet3OpenCL/RigidBody//kernels/solveFriction.h" --stringname="solveFrictionCL" stringify