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

10
btgui/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -21,11 +21,11 @@
#include "Bullet3Common/b3Vector3.h"
#include "Bullet3Common/b3Logging.h"
#include "OpenGLTrueTypeFont/fontstash.h"
#include "OpenGLWindow/fontstash.h"
#include "OpenGLWindow/TwFonts.h"
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include <assert.h>
#include "GLRenderToTexture.h"
#include "OpenGLWindow/GLRenderToTexture.h"
#ifdef _WIN32
#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;
int endX = startX+g_DefaultNormalFont->m_CharWidth[c];
int endY = startY+g_DefaultNormalFont->m_CharHeight;
//Gwen::Rect rect = r;
//Translate( rect );
float currentColor[]={0.2f,0.2,0.2f,1.f};
@@ -425,7 +423,7 @@ SimpleOpenGL3App::~SimpleOpenGL3App()
}
//#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)
{
int numComponents = 4;