Merge branch 'slembcke:master' into master

Author: viblo

VERSION.txt

@@ -210,7 +210,7 @@ Keep in mind that this is a x.0.0 release and that it's likely there are still s
 What's new in 5.3.5
 * FIX: Fixed spelling of cpArbiterGetDepth(). Was cpArbiteGetDepth() before. Apparently nobody ever used this function.
 * FIX: Added defines for M_PI and M_E. Apparently these values were never part of the C standard math library. Who knew!?
-* FIX: Added a guard to cpBodyActivate() so that it's a noop for rouge bodies.
+* FIX: Added a guard to cpBodyActivate() so that it's a noop for rogue bodies.
 * FIX: Shape queries now work with (and against) sensor shapes.
 * FIX: Fixed an issue where removing a collision handler while a separate() callback was waiting to fire the next step would cause crashes.
 * FIX: Fixed an issue where the default callback would not be called for sensor shapes.
@@ -297,4 +297,4 @@ What's new in 5.1.0:
 What's new in 5.0.0:
  * Brand new Joint/Constraint API: New constraints can be added easily and are much more flexible than the old joint system
  * Efficient Segment Queries - Like raycasting, but with line segments.
- * Brand new collision callback API: Collision begin/separate events, API for removal of objects within callbacks, more programable control over collision handling.
+ * Brand new collision callback API: Collision begin/separate events, API for removal of objects within callbacks, more programable control over collision handling.

demo/ChipmunkDebugDraw.c

@@ -23,15 +23,21 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "sokol/sokol_gfx.h"
+#include "sokol/sokol.h"
 
 #include "chipmunk/chipmunk_private.h"
 #include "ChipmunkDebugDraw.h"
 
 cpTransform ChipmunkDebugDrawVPMatrix;
 float ChipmunkDebugDrawPointLineScale = 1.0f;
 
-#define GLSL33(x) "#version 330\n" #x
+#ifdef SOKOL_GLCORE33
+#define GLSL(x) "#version 330\n" #x
+#endif
+#ifdef SOKOL_GLES3
+#define GLSL(x) "#version 300 es\n" #x
+#endif
+
 
 static sg_bindings bindings;
 static sg_pipeline pipeline;
@@ -84,7 +90,7 @@ ChipmunkDebugDrawInit(void)
 			.size = sizeof(Uniforms),
 			.uniforms[0] = {.name = "U_vp_matrix", .type = SG_UNIFORMTYPE_MAT4},
 		},
-		.vs.source = GLSL33(
+		.vs.source = GLSL(
 			layout(location = 0) in vec2 IN_pos;
 			layout(location = 1) in vec2 IN_uv;
 			layout(location = 2) in float IN_radius;
@@ -100,15 +106,16 @@ ChipmunkDebugDrawInit(void)
 			} FRAG;
 
 			void main(){
-				gl_Position = U_vp_matrix*vec4(IN_pos + IN_radius*IN_uv, 0, 1);
+				gl_Position = U_vp_matrix*vec4(IN_pos + IN_radius*IN_uv, 0.0, 1.0);
 				FRAG.uv = IN_uv;
 				FRAG.fill = IN_fill;
 				FRAG.fill.rgb *= IN_fill.a;
 				FRAG.outline = IN_outline;
 				FRAG.outline.a *= IN_outline.a;
 			}
 		),
-		.fs.source = GLSL33(
+		.fs.source = GLSL(
+			precision mediump float;
 			in struct {
 				vec2 uv;
 				vec4 fill;
@@ -119,10 +126,10 @@ ChipmunkDebugDrawInit(void)
 
 			void main(){
 				float len = length(FRAG.uv);
-				float fw = length(fwidth(FRAG.uv));
-				float mask = smoothstep(-1, fw - 1, -len);
+				float fw = length(vec2(dFdx(len), dFdy(len)));
+				float mask = smoothstep(-1.0, fw - 1.0, -len);
 
-				float outline = 1 - fw;
+				float outline = 1.0 - fw;
 				float outline_mask = smoothstep(outline - fw, outline, len);
 				vec4 color = FRAG.fill + (FRAG.outline - FRAG.fill*FRAG.outline.a)*outline_mask;
 				OUT_color = color*mask;
@@ -273,7 +280,7 @@ void ChipmunkDebugDrawPolygon(int count, const cpVect *verts, cpFloat radius, cp
 
 void ChipmunkDebugDrawBB(cpBB bb, cpSpaceDebugColor color)
 {
-	cpVect verts[] = {
+	cpVect verts[4] = {
 		cpv(bb.r, bb.b),
 		cpv(bb.r, bb.t),
 		cpv(bb.l, bb.t),

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"
@@ -39,7 +39,12 @@ static int glyph_indexes[256];
 
 cpTransform ChipmunkDemoTextMatrix;
 
-#define GLSL33(x) "#version 330\n" #x
+#ifdef SOKOL_GLCORE33
+#define GLSL(x) "#version 330\n" #x
+#endif
+#ifdef SOKOL_GLES3
+#define GLSL(x) "#version 300 es\n" #x
+#endif
 
 static sg_bindings bindings;
 static sg_pipeline pipeline;
@@ -102,7 +107,7 @@ ChipmunkDemoTextInit(void)
 			.size = sizeof(Uniforms),
 			.uniforms[0] = {.name = "U_vp_matrix", .type = SG_UNIFORMTYPE_MAT4},
 		},
-		.vs.source = GLSL33(
+		.vs.source = GLSL(
 			layout(location = 0) in vec2 IN_pos;
 			layout(location = 1) in vec2 IN_uv;
 			layout(location = 2) in vec4 IN_color;
@@ -115,13 +120,14 @@ ChipmunkDemoTextInit(void)
 			} FRAG;
 
 			void main(){
-				gl_Position = U_vp_matrix*vec4(IN_pos, 0, 1);
+				gl_Position = U_vp_matrix*vec4(IN_pos, 0.0, 1.0);
 				FRAG.uv = IN_uv;
 				FRAG.color = IN_color;
 			}
 		),
 		.fs.images[0] = {.name = "U_texture", .type = SG_IMAGETYPE_2D},
-		.fs.source = GLSL33(
+		.fs.source = GLSL(
+			precision mediump float;
 			in struct {
 				vec2 uv;
 				vec4 color;

demo/Planet.c

@@ -62,7 +62,7 @@ add_box(cpSpace *space)
 	const cpFloat size = 10.0f;
 	const cpFloat mass = 1.0f;
 
-	cpVect verts[] = {
+	cpVect verts[4] = {
 		cpv(-size,-size),
 		cpv(-size, size),
 		cpv( size, size),
@@ -95,10 +95,10 @@ add_box(cpSpace *space)
 static cpSpace *
 init(void)
 {
-	// Create a rouge body to control the planet manually.
 	cpSpace *space = cpSpaceNew();
 	cpSpaceSetIterations(space, 20);
 
+	// Create a kinematic body to control the planet manually.
 	planetBody = cpSpaceAddBody(space, cpBodyNewKinematic());
 	cpBodySetAngularVelocity(planetBody, 0.2f);
 

demo/Plink.c

@@ -72,7 +72,7 @@ init(void)
 	cpShape *shape;
 
 	// Vertexes for a triangle shape.
-	cpVect tris[] = {
+	cpVect tris[4] = {
 		cpv(-15,-15),
 		cpv(  0, 10),
 		cpv( 15,-15),

demo/Pump.c

@@ -109,7 +109,7 @@ init(void)
 	cpShapeSetFriction(shape, 0.5f);
 	cpShapeSetFilter(shape, NOT_GRABBABLE_FILTER);
 
-	cpVect verts[] = {
+	cpVect verts[4] = {
 		cpv(-30,-80),
 		cpv(-30, 80),
 		cpv( 30, 64),

demo/sokol/sokol.h

@@ -1,5 +1,7 @@
 #define SOKOL_WIN32_FORCE_MAIN
+#ifndef SOKOL_GLES3
 #define SOKOL_GLCORE33
+#endif
 #include "sokol_app.h"
 #include "sokol_time.h"
 #include "sokol_gfx.h"

doc-src/chipmunk-docs.textile

@@ -274,7 +274,7 @@ Static bodies are bodies that never (or rarely) move. Using static bodies for th
 A graphics engine only needs to know the position of an object for each frame that its drawn. For a physics engine, this isn't enough information to calculate a collision response. When you set the position of a body, you are effectively asking it to teleport itself. This means that it will instantly move to its new position instead of moving through space and time like a normal object. If you teleport an object so that it overlaps another one, the best the physics engine can do is to attempt to push the objects apart again since there is no information about their movement. This generally results in very mushy looking collisions. So instead of setting the position of an object, it's better to set its velocity and allow the physics engine to update the position. That way it can resolve any resulting colisions natuarally since it knows how the objects were moving. This is why kinematic bodies work the way they do. You set the velocity, and the physics updates their position so the two are never out of sync.
 
 
-For dynamic bodies, setting the velocity explicitly every frame can cause problems. For example, a problem occurs when a light dynamic body (like a person) is pressed against a heavy dynamic body (like a car), and you set velocity of the small object so that it's pushing it into the big body. To the physics engine, the change in velocity is the same as applying a large impulse (a very short, very large force). Even if the velocity is low, the large force can allow the small body to push the big body, even when it normally wouldn't be able to. For example, a person walking into a car can overpower the car's friction and cause it to creep along the ground slowly. Additionally, when you set the velocity of an object that is already in contact, it can cause the two objects to overlap by a small amount. The easiest way to avoid both of these problems is to make smaller changes to the body's velocity, accelerating it over a fraction of a second instead of a single frame. An even better solution, which is covered more thoroughly later, is to use constraints to move the object.
+For dynamic bodies, setting the velocity explicitly every frame can cause problems. For example, a problem occurs when a light dynamic body (like a person) is pressed against a heavy dynamic body (like a car), and you set velocity of the small object so that it's pushing it into the big body. To the physics engine, the change in velocity is the same as applying a large impulse (a very short, very large force). Even if the velocity is low, the large force can allow the small body to push the big body, even when it normally wouldn't be able to. For example, a person walking into a car can overpower the car's friction and cause it to creep along the ground slowly. Additionally, when you set the velocity of an object that is already in contact, it can cause the two objects to overlap by a small amount. The easiest way to avoid both of these problems is to make smaller changes to the body's velocity, accelerating it over a fraction of a second instead of a single frame. An even better solution is to use constraints to move the object. For an example, look at how the Tank and Crane demos drive their constraints and use the maximum bias and force properties. The mouse control in the demo application works the same way.
 
 <%= h 2, "Memory Management Functions:", "Memory" %>
 

include/chipmunk/chipmunk_structs.h

@@ -428,7 +428,7 @@ struct cpSpace {
 	cpArray *pooledArbiters;
 
 	cpArray *allocatedBuffers;
-	unsigned int locked;
+	int locked;
 
 	cpBool usesWildcards;
 	cpHashSet *collisionHandlers;

src/cpPolyShape.c

@@ -234,7 +234,7 @@ cpBoxShapeInit(cpPolyShape *poly, cpBody *body, cpFloat width, cpFloat height, c
 cpPolyShape *
 cpBoxShapeInit2(cpPolyShape *poly, cpBody *body, cpBB box, cpFloat radius)
 {
-	cpVect verts[] = {
+	cpVect verts[4] = {
 		cpv(box.r, box.b),
 		cpv(box.r, box.t),
 		cpv(box.l, box.t),