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

consolidate stringify_linux/_osx into stringify.sh

btgui/GwenOpenGLTest/Apple/premake4.lua

@@ -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
-

btgui/GwenOpenGLTest/OpenGLSample.cpp

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

btgui/GwenOpenGLTest/premake4.lua

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

btgui/OpenGLTrueTypeFont/premake4.lua

@@ -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",
-		}
-

btgui/OpenGLWindow/CMakeLists.txt

@@ -4,13 +4,13 @@ INCLUDE_DIRECTORIES(
 	${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 OpenGLWindowWin32_CPP "Win32*.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 ${OpenGLWindowWin32_CPP} )

btgui/OpenGLWindow/GLInstancingRenderer.cpp

@@ -1245,7 +1245,7 @@ void GLInstancingRenderer::getMouseDirection(float* dir, int x, int y)
 
 
 //#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)
 {
 

btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h

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

btgui/OpenGLWindow/SimpleOpenGL3App.cpp

@@ -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;