From b18e03d737ad86ca4473e0a3075467fd0193964a Mon Sep 17 00:00:00 2001 From: erwin coumans Date: Sat, 6 Jul 2013 13:11:13 -0700 Subject: [PATCH] work towards GPU joint solver (non-contact constraints), not working yet. --- Demos3/GpuDemos/main_opengl3core.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Demos3/GpuDemos/main_opengl3core.cpp b/Demos3/GpuDemos/main_opengl3core.cpp index 22ab2dec8..ae1c582c9 100644 --- a/Demos3/GpuDemos/main_opengl3core.cpp +++ b/Demos3/GpuDemos/main_opengl3core.cpp @@ -89,7 +89,6 @@ GpuDemo::CreateFunc* allDemos[]= // ConcaveSphereScene::MyCreateFunc, - GpuConstraintsDemo::MyCreateFunc, GpuBoxPlaneScene::MyCreateFunc, GpuConvexPlaneScene::MyCreateFunc, @@ -110,7 +109,10 @@ GpuDemo::CreateFunc* allDemos[]= GpuCompoundPlaneScene::MyCreateFunc, - GpuSphereScene::MyCreateFunc, + GpuSphereScene::MyCreateFunc, + + GpuConstraintsDemo::MyCreateFunc, + GpuSoftClothDemo::MyCreateFunc, @@ -118,6 +120,7 @@ GpuDemo::CreateFunc* allDemos[]= PairBench::MyCreateFunc, + GpuRaytraceScene::MyCreateFunc, ShadowMapDemo::MyCreateFunc, @@ -496,8 +499,20 @@ void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName } +#include "Bullet3Dynamics/ConstraintSolver/b3Generic6DofConstraint.h" +#include "Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h" + + int main(int argc, char* argv[]) { + + int sz = sizeof(b3Generic6DofConstraint); + int sz2 = sizeof(b3Point2PointConstraint); + int sz3 = sizeof(b3TypedConstraint); + int sz4 = sizeof(b3TranslationalLimitMotor); + int sz5 = sizeof(b3RotationalLimitMotor); + int sz6 = sizeof(b3Transform); + //b3OpenCLUtils::setCachePath("/Users/erwincoumans/develop/mycache"); b3SetCustomEnterProfileZoneFunc(b3ProfileManager::Start_Profile);