update

slembcke · Maeiky · Apr 20, 2022 · Apr 20, 2022 · Apr 20, 2022 · Apr 20, 2022
commit b019a1aff0370782ea07dc4f85c211c129da4b62
diff --git a/README.md b/README.md
diff --git a/WebGL/Chipmunk.png b/WebGL/Chipmunk.png
diff --git a/WebGL/Web_Emsc_Default_OS/App.html b/WebGL/Web_Emsc_Default_OS/App.html
diff --git a/WebGL/Web_Emsc_Default_OS/App.js b/WebGL/Web_Emsc_Default_OS/App.js
diff --git a/WebGL/Web_Emsc_Default_OS/Shell_Common.css b/WebGL/Web_Emsc_Default_OS/Shell_Common.css
diff --git a/WebGL/Web_Emsc_Default_OS/Shell_Common.js b/WebGL/Web_Emsc_Default_OS/Shell_Common.js
diff --git a/cwc/Build.cwc b/cwc/Build.cwc
@@ -8,7 +8,6 @@
 ;Build Engine
 -c ../src/ !../src/cpHastySpace.c -o obj/{sOut}/lib/Chipmunk/
 -{vIncl}
--{vOS_Flag}
 >
 ;Generate Dynamic Lib
 -o obj/{sOut}/lib/ -#To Lib/{sOut}/Chipmunk.{_sDynamic}

diff --git a/cwc/Lib/Web_Emsc_Default_OS/Chipmunk.so b/cwc/Lib/Web_Emsc_Default_OS/Chipmunk.so
diff --git a/cwc/Lib/Web_Emsc_Default_OS/libChipmunk.a b/cwc/Lib/Web_Emsc_Default_OS/libChipmunk.a
diff --git a/cwc/Lib/Windows_Clang_Debug/Chipmunk.dll b/cwc/Lib/Windows_Clang_Debug/Chipmunk.dll
diff --git a/cwc/Lib/Windows_Clang_Debug/libChipmunk.a b/cwc/Lib/Windows_Clang_Debug/libChipmunk.a
diff --git a/cwc/Lib/Windows_Default_Debug/Chipmunk.dll b/cwc/Lib/Windows_Default_Debug/Chipmunk.dll
diff --git a/cwc/Lib/Windows_Default_Debug/libChipmunk.a b/cwc/Lib/Windows_Default_Debug/libChipmunk.a
diff --git a/cwc/Lib/Windows_Default_O2/Chipmunk.dll b/cwc/Lib/Windows_Default_O2/Chipmunk.dll
diff --git a/cwc/Lib/Windows_Default_O2/libChipmunk.a b/cwc/Lib/Windows_Default_O2/libChipmunk.a
diff --git a/demo/ChipmunkDebugDraw.c b/demo/ChipmunkDebugDraw.c
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "sokol/sokol_gfx.h"
+#include "sokol/sokol.h"
 
 #include "chipmunk/chipmunk_private.h"
 #include "ChipmunkDebugDraw.h"
@@ -126,7 +126,7 @@ ChipmunkDebugDrawInit(void)
 
 			void main(){
 				float len = length(FRAG.uv);
-				float fw = length(fwidth(FRAG.uv));
+				float fw = length(vec2(dFdx(len), dFdy(len)));
 				float mask = smoothstep(-1.0, fw - 1.0, -len);
 
 				float outline = 1.0 - fw;

diff --git a/demo/ChipmunkDemoTextSupport.c b/demo/ChipmunkDemoTextSupport.c
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "sokol/sokol_gfx.h"
+#include "sokol/sokol.h"
 
 // #include "chipmunk/chipmunk_private.h"
 // #include "ChipmunkDemo.h"

diff --git a/include/chipmunk/cpMarch.h b/include/chipmunk/cpMarch.h
@@ -1,6 +1,10 @@
 // Copyright 2013 Howling Moon Software. All rights reserved.
 // See http://chipmunk2d.net/legal.php for more information.
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// Function type used as a callback from the marching squares algorithm to sample an image function.
 /// It passes you the point to sample and your context pointer, and you return the density.
 typedef cpFloat (*cpMarchSampleFunc)(cpVect point, void *data);
@@ -26,3 +30,7 @@ CP_EXPORT void cpMarchHard(
   cpMarchSegmentFunc segment, void *segment_data,
   cpMarchSampleFunc sample, void *sample_data
 );
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/chipmunk/cpPolyline.h b/include/chipmunk/cpPolyline.h
@@ -1,6 +1,10 @@
 // Copyright 2013 Howling Moon Software. All rights reserved.
 // See http://chipmunk2d.net/legal.php for more information.
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Polylines are just arrays of vertexes.
 // They are looped if the first vertex is equal to the last.
 // cpPolyline structs are intended to be passed by value and destroyed when you are done with them.
@@ -68,3 +72,7 @@ CP_EXPORT void cpPolylineSetCollectSegment(cpVect v0, cpVect v1, cpPolylineSet *
 CP_EXPORT cpPolylineSet *cpPolylineConvexDecomposition(cpPolyline *line, cpFloat tol);
 
 #define cpPolylineConvexDecomposition_BETA cpPolylineConvexDecomposition
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/cpBody.c b/src/cpBody.c
@@ -103,9 +103,9 @@ cpBodyFree(cpBody *body)
 #ifdef NDEBUG
 	#define	cpAssertSaneBody(body)
 #else
-	static void cpv_assert_nan(cpVect v, char *message){cpAssertHard(v.x == v.x && v.y == v.y, message);}
-	static void cpv_assert_infinite(cpVect v, char *message){cpAssertHard(cpfabs(v.x) != INFINITY && cpfabs(v.y) != INFINITY, message);}
-	static void cpv_assert_sane(cpVect v, char *message){cpv_assert_nan(v, message); cpv_assert_infinite(v, message);}
+	static void cpv_assert_nan(cpVect v, const char *message){cpAssertHard(v.x == v.x && v.y == v.y, message);}
+	static void cpv_assert_infinite(cpVect v, const char *message){cpAssertHard(cpfabs(v.x) != INFINITY && cpfabs(v.y) != INFINITY, message);}
+	static void cpv_assert_sane(cpVect v, const char *message){cpv_assert_nan(v, message); cpv_assert_infinite(v, message);}
 
 	static void
 	cpBodySanityCheck(const cpBody *body)