Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Yosemite build

Browse Source
This commit is contained in:
Erwin Coumans
2015-05-07 11:44:16 -07:00
parent 2a50dae011
commit 82f81e16f3
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ExampleBrowser/CMakeLists.txt
View File

@@ -99,11 +99,6 @@ SET(App_ExampleBrowser_SRCS
../Constraints/Dof6Spring2Setup.h ../Constraints/Dof6Spring2Setup.h
../Constraints/ConstraintPhysicsSetup.cpp ../Constraints/ConstraintPhysicsSetup.cpp
../Constraints/ConstraintPhysicsSetup.h ../Constraints/ConstraintPhysicsSetup.h
../Experiments/ImplicitCloth/ImplicitClothExample.cpp
../Experiments/ImplicitCloth/stan/Cloth.cpp
../Experiments/ImplicitCloth/stan/SpringNetwork.cpp
../Experiments/ImplicitCloth/stan/vec3n.cpp
../Experiments/ImplicitCloth/stan/vecmath.cpp
../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp ../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp

3
examples/ExampleBrowser/ExampleEntries.cpp
View File

@@ -25,7 +25,6 @@
#include "../SoftDemo/SoftDemo.h" #include "../SoftDemo/SoftDemo.h"
#include "../Constraints/ConstraintDemo.h" #include "../Constraints/ConstraintDemo.h"
#include "../Vehicles/Hinge2Vehicle.h" #include "../Vehicles/Hinge2Vehicle.h"
#include "../Experiments/ImplicitCloth/ImplicitClothExample.h"
#include "../Importers/ImportBullet/SerializeSetup.h" #include "../Importers/ImportBullet/SerializeSetup.h"
#include "../Raycast/RaytestDemo.h" #include "../Raycast/RaytestDemo.h"
#include "../FractureDemo/FractureDemo.h" #include "../FractureDemo/FractureDemo.h"
@@ -183,8 +182,6 @@ static ExampleEntry gDefaultExamples[]=
ExampleEntry(1,"Planar 2D","Show the use of 2D collision shapes and rigid body simulation. The collision shape is wrapped into a btConvex2dShape. The rigid bodies are restricted in a plane using the 'setAngularFactor' and 'setLinearFactor' API call.",Planar2DCreateFunc), ExampleEntry(1,"Planar 2D","Show the use of 2D collision shapes and rigid body simulation. The collision shape is wrapped into a btConvex2dShape. The rigid bodies are restricted in a plane using the 'setAngularFactor' and 'setLinearFactor' API call.",Planar2DCreateFunc),
ExampleEntry(1,"Implicit Cloth", "Cloth simulation using implicit integration, by Stan Melax. The cloth is only attached at the corners. Note the stability using a large time step even with high stiffness.",
ImplicitClothCreateFunc),
ExampleEntry(0,"Rendering"), ExampleEntry(0,"Rendering"),

2
examples/ExampleBrowser/premake4.lua
View File

@@ -68,8 +68,6 @@
"../Utils/b3Clock.*", "../Utils/b3Clock.*",
"../GyroscopicDemo/GyroscopicSetup.cpp", "../GyroscopicDemo/GyroscopicSetup.cpp",
"../GyroscopicDemo/GyroscopicSetup.h", "../GyroscopicDemo/GyroscopicSetup.h",
"../Experiments/ImplicitCloth/**.cpp",
"../Experiments/ImplicitCloth/**.h",
"../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp", "../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp",
"../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp", "../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp",
"../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp", "../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp",

1
examples/OpenGLWindow/MacOpenGLWindow.h
View File

@@ -69,6 +69,7 @@ public:
return m_mouseButtonCallback; return m_mouseButtonCallback;
} }
virtual b3ResizeCallback getResizeCallback(); virtual b3ResizeCallback getResizeCallback();
virtual b3WheelCallback getWheelCallback() virtual b3WheelCallback getWheelCallback()
{ {
return m_wheelCallback; return m_wheelCallback;

8
examples/OpenGLWindow/MacOpenGLWindow.mm
View File

@@ -58,6 +58,7 @@ void dumpInfo(void)
-(float) GetWindowHeight; -(float) GetWindowHeight;
-(void) setResizeCallback:(b3ResizeCallback) callback; -(void) setResizeCallback:(b3ResizeCallback) callback;
-(b3ResizeCallback) getResizeCallback; -(b3ResizeCallback) getResizeCallback;
-(NSOpenGLContext*) getContext;
@end @end
float loop; float loop;
@@ -80,6 +81,10 @@ float loop;
return m_resizeCallback; return m_resizeCallback;
} }
-(NSOpenGLContext*) getContext
{
return m_context;
}
-(void)setResizeCallback:(b3ResizeCallback)callback -(void)setResizeCallback:(b3ResizeCallback)callback
{ {
m_resizeCallback = callback; m_resizeCallback = callback;
@@ -1038,7 +1043,7 @@ void MacOpenGLWindow::endRendering()
//#ifndef NO_OPENGL3 //#ifndef NO_OPENGL3
// glSwapAPPLE(); // glSwapAPPLE();
//#else //#else
[m_internalData->m_myview->m_context flushBuffer]; [[m_internalData->m_myview getContext] flushBuffer];
// #endif // #endif
} }
@@ -1125,3 +1130,4 @@ b3ResizeCallback MacOpenGLWindow::getResizeCallback()
{ {
return [m_internalData->m_myview getResizeCallback]; return [m_internalData->m_myview getResizeCallback];
} }

1
examples/OpenGLWindow/SimpleOpenGL2App.cpp
View File

@@ -1,4 +1,5 @@
#include "SimpleOpenGL2App.h" #include "SimpleOpenGL2App.h"
#define USE_OPENGL2
#include "OpenGLInclude.h" #include "OpenGLInclude.h"
#include "Bullet3Common/b3Logging.h"//b3Assert? #include "Bullet3Common/b3Logging.h"//b3Assert?