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

@@ -1,14 +1,11 @@
project "OpenGL_rendertest"
project "OpenGL_Window"
language "C++"
kind "ConsoleApp"
kind "StaticLib"
targetdir "../../bin"
initOpenGL()
initGlew()
@@ -17,61 +14,36 @@
"../../src",
}
links {
"gwen"
}
--links {
--}
files {
"main.cpp",
"renderscene.cpp",
"renderscene.h",
"GLInstancingRenderer.cpp",
"GLInstancingRenderer.h",
"GLPrimitiveRenderer.h",
"GLPrimitiveRenderer.cpp",
"SimpleOpenGL3App.cpp",
"SimpleOpenGL3App.h",
"LoadShader.cpp",
"LoadShader.h",
"gwenWindow.cpp",
"gwenWindow.h",
"TwFonts.cpp",
"TwFonts.h",
"GwenOpenGL3CoreRenderer.h",
"../FontFiles/OpenSans.cpp",
"../OpenGLTrueTypeFont/fontstash.cpp",
"../OpenGLTrueTypeFont/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../Timing/b3Quickprof.cpp",
"../Timing/b3Quickprof.h",
"../Timing/b3Clock.cpp",
"../Timing/b3Clock.h",
"**.cpp",
"**.h",
"**.c"
}
if os.is("Windows") then
files{
if not os.is("Windows") then
excludes {
"Win32OpenGLWindow.cpp",
"Win32OpenGLWindow.h",
"Win32Window.cpp",
"Win32Window.h",
}
end
if os.is("Linux") then
files {
if not os.is("Linux") then
excludes {
"X11OpenGLWindow.cpp",
"X11OpenGLWindows.h"
}
end
if os.is("MacOSX") then
links{"Cocoa.framework"}
files
else
excludes
{
"../OpenGLWindow/MacOpenGLWindow.h",
"../OpenGLWindow/MacOpenGLWindow.mm",
}
"../OpenGLWindow/MacOpenGLWindow.h",
"../OpenGLWindow/MacOpenGLWindow.mm",
}
end