created new Bullet 2 CPU BasicDemo, using the OpenGL 3 rendering. I will add picking soon. Hold ctrl/alt + mouse to move/zoom camera

remove reference to btGImpact (it is removed now)
This commit is contained in:
erwincoumans
2013-12-06 17:48:58 -08:00
parent bbb2c8a6f1
commit fca6d11381
16 changed files with 301 additions and 1671 deletions

View File

@@ -15,59 +15,15 @@
initOpenGL()
initGlew()
--links{"gwen"}
links{"gwen", "OpenGL_Window","OpenGL_TrueTypeFont"}
files {
"**.cpp",
"**.h",
"../../src/Bullet3Common/**.cpp",
"../../src/Bullet3Common/**.h",
"../../btgui/OpenGLWindow/SimpleOpenGL3App.cpp",
"../../btgui/OpenGLWindow/SimpleOpenGL3App.h",
"../../btgui/OpenGLWindow/TwFonts.cpp",
"../../btgui/OpenGLWindow/TwFonts.h",
"../../btgui/OpenGLWindow/LoadShader.cpp",
"../../btgui/OpenGLWindow/LoadShader.h",
"../../btgui/OpenGLWindow/GLPrimitiveRenderer.cpp",
"../../btgui/OpenGLWindow/GLPrimitiveRenderer.h",
"../../btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h",
"../../btgui/OpenGLWindow/GLInstancingRenderer.cpp",
"../../btgui/OpenGLWindow/GLInstancingRenderer.h",
"../../btgui/OpenGLWindow/GLRenderToTexture.cpp",
"../../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/Bullet3Common/**.cpp",
"../../btgui/Bullet3Common/**.h",
"../../btgui/Timing/b3Clock.cpp",
"../../btgui/Timing/b3Clock.h"
}
if os.is("Windows") then
files {
"../../btgui/OpenGLWindow/Win32OpenGLWindow.cpp",
"../../btgui/OpenGLWindow/Win32OpenGLWindow.h",
"../../btgui/OpenGLWindow/Win32Window.cpp",
"../../btgui/OpenGLWindow/Win32Window.h",
}
end
if os.is("Linux") then
links ("X11")
files{
"../../btgui/OpenGLWindow/X11OpenGLWindow.h",
"../../btgui/OpenGLWindow/X11OpenGLWindow.cpp"
}
end
if os.is("MacOSX") then
links{"Cocoa.framework"}
files{
"../../btgui/OpenGLWindow/MacOpenGLWindow.mm",
"../../btgui/OpenGLWindow/MacOpenGLWindow.h",
}
end