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

consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueTypeFont)

Browse Source 
consolidate stringify_linux/_osx into stringify.sh
This commit is contained in:
Erwin Coumans
2014-09-03 09:52:31 -07:00
parent d6c78426bd
commit 0125324bd6
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()
initGlew()

6
Demos3/CpuDemos/main_opengl3core.cpp
View File

@@ -22,8 +22,8 @@
#include <assert.h>
#include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/fontstash.h"
#include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "gwenUserInterface.h"
#include "../btgui/Timing/b3Quickprof.h"
@@ -459,7 +459,7 @@ void myprintf(const char* msg)
//#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)
{
int numComponents = 4;

10
Demos3/CpuDemos/premake4.lua
View File

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

6
Demos3/GpuDemos/main_opengl3core.cpp
View File

@@ -24,8 +24,8 @@
//#include "b3GpuDynamicsWorld.h"
#include <assert.h>
#include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/fontstash.h"
#include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "gwenUserInterface.h"
#include "ParticleDemo.h"
#include "broadphase/PairBench.h"
@@ -543,7 +543,7 @@ void myprintf(const char* msg)
//#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)
{
int numComponents = 4;

10
Demos3/GpuDemos/premake4.lua
View File

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

4
Demos3/GpuGuiInitialize/main.cpp
View File

@@ -14,8 +14,8 @@
//#include "b3GpuDynamicsWorld.h"
#include <assert.h>
#include <string.h>
#include "OpenGLTrueTypeFont/fontstash.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/fontstash.h"
#include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/GwenOpenGL3CoreRenderer.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.h",
"../../btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h",
"../../btgui/FontFiles/OpenSans.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.cpp",
"../../btgui/OpenGLTrueTypeFont/fontstash.h",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../btgui/OpenGLWindow/OpenSans.cpp",
"../../btgui/OpenGLWindow/fontstash.cpp",
"../../btgui/OpenGLWindow/fontstash.h",
"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../../btgui/OpenGLWindow/opengl_fontstashcallbacks.h",
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp",

10
Demos3/ImplicitCloth/premake4.lua
View File

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

10
Demos3/SimpleOpenGL3/premake4.lua
View File

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