Merge pull request #376 from erwincoumans/master2.83.3

fix Yosemite build

6 files changed, 9 insertions, 11 deletions

diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt
index 0542891c1..ecf9cdd9a 100644
--- a/examples/ExampleBrowser/CMakeLists.txt
+++ b/examples/ExampleBrowser/CMakeLists.txt
@@ -99,11 +99,6 @@ SET(App_ExampleBrowser_SRCS
   ../Constraints/Dof6Spring2Setup.h
   ../Constraints/ConstraintPhysicsSetup.cpp
   ../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
diff --git a/examples/ExampleBrowser/ExampleEntries.cpp b/examples/ExampleBrowser/ExampleEntries.cpp
index b37a7c433..fbca872b7 100644
--- a/examples/ExampleBrowser/ExampleEntries.cpp
+++ b/examples/ExampleBrowser/ExampleEntries.cpp
@@ -25,7 +25,6 @@
 #include "../SoftDemo/SoftDemo.h"
 #include "../Constraints/ConstraintDemo.h"
 #include "../Vehicles/Hinge2Vehicle.h"
-#include "../Experiments/ImplicitCloth/ImplicitClothExample.h"
 #include "../Importers/ImportBullet/SerializeSetup.h"
 #include "../Raycast/RaytestDemo.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,"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"),
diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua
index 101a4c6e0..cd9051304 100644
--- a/examples/ExampleBrowser/premake4.lua
+++ b/examples/ExampleBrowser/premake4.lua
@@ -68,8 +68,6 @@
 		"../Utils/b3Clock.*",
 		"../GyroscopicDemo/GyroscopicSetup.cpp",
 		"../GyroscopicDemo/GyroscopicSetup.h",
-		"../Experiments/ImplicitCloth/**.cpp",
-		"../Experiments/ImplicitCloth/**.h",
 		"../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp",
 		"../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp",
     "../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp",
diff --git a/examples/OpenGLWindow/MacOpenGLWindow.h b/examples/OpenGLWindow/MacOpenGLWindow.h
index 81bb935b1..29204b260 100644
--- a/examples/OpenGLWindow/MacOpenGLWindow.h
+++ b/examples/OpenGLWindow/MacOpenGLWindow.h
@@ -69,6 +69,7 @@ public:
 		return m_mouseButtonCallback;
 	}
 	virtual b3ResizeCallback getResizeCallback();
+
 	virtual b3WheelCallback getWheelCallback()
 	{
 		return m_wheelCallback;
diff --git a/examples/OpenGLWindow/MacOpenGLWindow.mm b/examples/OpenGLWindow/MacOpenGLWindow.mm
index 4ee22e4da..0f8f62f31 100644
--- a/examples/OpenGLWindow/MacOpenGLWindow.mm
+++ b/examples/OpenGLWindow/MacOpenGLWindow.mm
@@ -58,6 +58,7 @@ void dumpInfo(void)
 -(float) GetWindowHeight;
 -(void) setResizeCallback:(b3ResizeCallback) callback;
 -(b3ResizeCallback) getResizeCallback;
+-(NSOpenGLContext*) getContext;
 @end
 
 float loop;
@@ -80,6 +81,10 @@ float loop;
 	return m_resizeCallback;
 }
 
+-(NSOpenGLContext*) getContext
+{
+	return m_context;
+}
 -(void)setResizeCallback:(b3ResizeCallback)callback
 {
     m_resizeCallback = callback;
@@ -1038,7 +1043,7 @@ void MacOpenGLWindow::endRendering()
 //#ifndef NO_OPENGL3
 //	glSwapAPPLE();
 //#else
- [m_internalData->m_myview->m_context flushBuffer];
+ [[m_internalData->m_myview getContext] flushBuffer];
 //  #endif 
 
 }
@@ -1125,3 +1130,4 @@ b3ResizeCallback MacOpenGLWindow::getResizeCallback()
 {
 	return [m_internalData->m_myview getResizeCallback];
 }
+
diff --git a/examples/OpenGLWindow/SimpleOpenGL2App.cpp b/examples/OpenGLWindow/SimpleOpenGL2App.cpp
index 987221457..030bc8de2 100644
--- a/examples/OpenGLWindow/SimpleOpenGL2App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL2App.cpp
@@ -1,4 +1,5 @@
 #include "SimpleOpenGL2App.h"
+#define USE_OPENGL2
 #include "OpenGLInclude.h"
 
 #include "Bullet3Common/b3Logging.h"//b3Assert?