This commit is contained in:
erwin coumans
2013-04-17 17:52:51 -07:00
parent 3cb80ad1a3
commit 626f0cf1e3
92 changed files with 158 additions and 158 deletions

View File

@@ -37,11 +37,11 @@
"../OpenGLTrueTypeFont/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../src/BulletGeometry/b3ConvexHullComputer.cpp",
"../../src/BulletGeometry/b3ConvexHullComputer.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h",
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/Bullet3Common/b3Quickprof.h",
"**.cpp",
"**.h",
}

View File

@@ -32,9 +32,9 @@ subject to the following restrictions:
#include "opengl_fontstashcallbacks.h"
#include "BulletCommon/b3Quickprof.h"
#include "BulletCommon/b3Quaternion.h"
#include "BulletCommon/b3CommandLineArgs.h"
#include "Bullet3Common/b3Quickprof.h"
#include "Bullet3Common/b3Quaternion.h"
#include "Bullet3Common/b3CommandLineArgs.h"
#include "../OpenGLWindow/LoadShader.h"
extern char OpenSansData[];
bool printStats = false;

View File

@@ -23,9 +23,9 @@
"../FontFiles/OpenSans.cpp",
"../OpenGLWindow/LoadShader.cpp",
"../OpenGLWindow/LoadShader.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h" ,
"../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/Bullet3Common/b3Quickprof.h" ,
"fontstash.cpp",
"fontstash.h",
"opengl_fontstashcallbacks.cpp",

View File

@@ -1,7 +1,7 @@
#ifndef GL_INSTANCE_GRAPHICS_SHAPE_H
#define GL_INSTANCE_GRAPHICS_SHAPE_H
#include "BulletCommon/b3AlignedObjectArray.h"
#include "Bullet3Common/b3AlignedObjectArray.h"
struct GLInstanceVertex
{

View File

@@ -2,7 +2,7 @@
#define GL_INSTANCE_RENDERER_INTERNAL_DATA_H
#include "OpenGLInclude.h"
#include "BulletCommon/b3AlignedObjectArray.h"
#include "Bullet3Common/b3AlignedObjectArray.h"
struct GLInstanceRendererInternalData
{

View File

@@ -22,10 +22,10 @@ subject to the following restrictions:
//#include "DemoSettings.h"
#include <stdio.h>
#include <assert.h>
#include "BulletCommon/b3Vector3.h"
#include "BulletCommon/b3Quaternion.h"
#include "BulletCommon/b3Quickprof.h"
#include "BulletCommon/b3Matrix3x3.h"
#include "Bullet3Common/b3Vector3.h"
#include "Bullet3Common/b3Quaternion.h"
#include "Bullet3Common/b3Quickprof.h"
#include "Bullet3Common/b3Matrix3x3.h"
#include "LoadShader.h"

View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#ifndef GL_INSTANCING_RENDERER_H
#define GL_INSTANCING_RENDERER_H
#include "BulletCommon/b3AlignedObjectArray.h"
#include "Bullet3Common/b3AlignedObjectArray.h"
void btDefaultMouseButtonCallback( int button, int state, float x, float y);
void btDefaultMouseMoveCallback( float x, float y);

View File

@@ -18,7 +18,7 @@ subject to the following restrictions:
#include "OpenGLInclude.h"
#include "BulletCommon/b3Vector3.h"
#include "Bullet3Common/b3Vector3.h"
#include "Win32InternalWindowData.h"
#include <stdio.h>

View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#include "Win32Window.h"
#include "OpenGLInclude.h"
#include "BulletCommon/b3Vector3.h"
#include "Bullet3Common/b3Vector3.h"
#include <wchar.h>
static InternalData2* sData = 0;

View File

@@ -19,7 +19,7 @@
#include "Gwen/Controls/TabControl.h"
#include "Gwen/Controls/ListBox.h"
#include "BulletCommon/b3Quickprof.h"
#include "Bullet3Common/b3Quickprof.h"
#include "GwenOpenGL3CoreRenderer.h"
#include "GLPrimitiveRenderer.h"

View File

@@ -37,10 +37,10 @@ extern char OpenSansData[];
#include "renderscene.h"
#include "BulletCommon/b3Quickprof.h"
#include "BulletCommon/b3Quaternion.h"
#include "Bullet3Common/b3Quickprof.h"
#include "Bullet3Common/b3Quaternion.h"
#include "BulletCommon/b3CommandLineArgs.h"
#include "Bullet3Common/b3CommandLineArgs.h"
#include "../OpenGLTrueTypeFont/fontstash.h"
#include "../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"

View File

@@ -41,11 +41,11 @@
"../OpenGLTrueTypeFont/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../src/BulletGeometry/b3ConvexHullComputer.cpp",
"../../src/BulletGeometry/b3ConvexHullComputer.h",
"../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../src/BulletCommon/b3Quickprof.cpp",
"../../src/BulletCommon/b3Quickprof.h"
"../../src/Bullet3Geometry/b3ConvexHullComputer.cpp",
"../../src/Bullet3Geometry/b3ConvexHullComputer.h",
"../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../src/Bullet3Common/b3Quickprof.cpp",
"../../src/Bullet3Common/b3Quickprof.h"
}
if os.is("Windows") then

View File

@@ -16,8 +16,8 @@ bool keepStaticObjects = false;
#include "GLInstancingRenderer.h"
//#include "LinearMath/b3Quickprof.h"
#include "BulletCommon/b3Quaternion.h"
#include "BulletCommon/b3Matrix3x3.h"
#include "Bullet3Common/b3Quaternion.h"
#include "Bullet3Common/b3Matrix3x3.h"
//#include "../opencl/gpu_rigidbody_pipeline/b3ConvexUtility.h"
#include "ShapeData.h"
///work-in-progress