Hi,

Here a proposal for bullet library.

Hope it s good enough.

Regards.
Index: patches/patch-examples_OpenGLWindow_LoadShader_cpp
===================================================================
RCS file: patches/patch-examples_OpenGLWindow_LoadShader_cpp
diff -N patches/patch-examples_OpenGLWindow_LoadShader_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_OpenGLWindow_LoadShader_cpp	10 Apr 2018 18:44:39 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: examples/OpenGLWindow/LoadShader.cpp
+--- examples/OpenGLWindow/LoadShader.cpp.orig
++++ examples/OpenGLWindow/LoadShader.cpp
+@@ -47,7 +47,7 @@ GLuint gltLoadShaderPair(const char *szVertexProg, con
+         return 0;
+ 		glDeleteShader(hVertexShader);
+ 		glDeleteShader(hFragmentShader);
+-		return (GLuint)NULL;
++		return (GLuint)0;
+ 	}
+ 
+   assert(glGetError()==GL_NO_ERROR);
+@@ -65,7 +65,7 @@ GLuint gltLoadShaderPair(const char *szVertexProg, con
+         exit(EXIT_FAILURE);
+ 		glDeleteShader(hVertexShader);
+ 		glDeleteShader(hFragmentShader);
+-		return (GLuint)NULL;
++		return (GLuint)0;
+ 	}
+ 
+     assert(glGetError()==GL_NO_ERROR);
+@@ -102,7 +102,7 @@ GLuint gltLoadShaderPair(const char *szVertexProg, con
+ 		printf("Warning/Error in GLSL shader:\n");
+ 		printf("%s\n",infoLog);
+ 		glDeleteProgram(hReturn);
+-		return (GLuint)NULL;
++		return (GLuint)0;
+ 	}
+ 
+ 	return hReturn;
Index: patches/patch-examples_SharedMemory_PhysicsServerExample_cpp
===================================================================
RCS file: patches/patch-examples_SharedMemory_PhysicsServerExample_cpp
diff -N patches/patch-examples_SharedMemory_PhysicsServerExample_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_SharedMemory_PhysicsServerExample_cpp	10 Apr 2018 18:44:39 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Index: examples/SharedMemory/PhysicsServerExample.cpp
+--- examples/SharedMemory/PhysicsServerExample.cpp.orig
++++ examples/SharedMemory/PhysicsServerExample.cpp
+@@ -2416,14 +2416,14 @@ void PhysicsServerExample::drawUserDebugLines()
+ 			}
+ 
+ 			float colorRGBA[4] = {
+-				m_multiThreadedHelper->m_userDebugText[i].m_textColorRGB[0],
+-				m_multiThreadedHelper->m_userDebugText[i].m_textColorRGB[1],
+-				m_multiThreadedHelper->m_userDebugText[i].m_textColorRGB[2],
++				static_cast<float>(m_multiThreadedHelper->m_userDebugText[i].m_textColorRGB[0]),
++				static_cast<float>(m_multiThreadedHelper->m_userDebugText[i].m_textColorRGB[1]),
++				static_cast<float>(m_multiThreadedHelper->m_userDebugText[i].m_textColorRGB[2]),
+ 				1.};
+ 
+-			float pos[3] = {m_multiThreadedHelper->m_userDebugText[i].m_textPositionXYZ1[0],
+-			m_multiThreadedHelper->m_userDebugText[i].m_textPositionXYZ1[1],
+-			m_multiThreadedHelper->m_userDebugText[i].m_textPositionXYZ1[2]};
++			float pos[3] = {static_cast<float>(m_multiThreadedHelper->m_userDebugText[i].m_textPositionXYZ1[0]),
++			static_cast<float>(m_multiThreadedHelper->m_userDebugText[i].m_textPositionXYZ1[1]),
++			static_cast<float>(m_multiThreadedHelper->m_userDebugText[i].m_textPositionXYZ1[2])};
+ 
+ 			int graphicsIndex = m_multiThreadedHelper->m_userDebugText[i].m_trackingVisualShapeIndex;
+ 			if (graphicsIndex>=0)
Index: patches/patch-examples_SharedMemory_TinyRendererVisualShapeConverter_cpp
===================================================================
RCS file: patches/patch-examples_SharedMemory_TinyRendererVisualShapeConverter_cpp
diff -N patches/patch-examples_SharedMemory_TinyRendererVisualShapeConverter_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_SharedMemory_TinyRendererVisualShapeConverter_cpp	10 Apr 2018 18:44:39 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
+--- examples/SharedMemory/TinyRendererVisualShapeConverter.cpp.orig
++++ examples/SharedMemory/TinyRendererVisualShapeConverter.cpp
+@@ -725,7 +725,8 @@ void TinyRendererVisualShapeConverter::changeRGBAColor
+ 		TinyRendererObjectArray** ptrptr = m_data->m_swRenderInstances.getAtIndex(i);
+ 		if (ptrptr && *ptrptr)
+ 		{
+-			float rgba[4] = {rgbaColor[0], rgbaColor[1], rgbaColor[2], rgbaColor[3]};
++			float rgba[4] = {static_cast<float>(rgbaColor[0]), static_cast<float>(rgbaColor[1]), static_cast<float>(rgbaColor[2]), 
++				static_cast<float>(rgbaColor[3])};
+ 			TinyRendererObjectArray* visuals = *ptrptr;
+ 			if ((bodyUniqueId == visuals->m_objectUniqueId) && (linkIndex == visuals->m_linkIndex))
+ 			{

Reply via email to