Updated Chipmunk2D

Author: viblo

CHANGELOG.rst

@@ -4,7 +4,8 @@ Changelog
 
 .. 
  Fix for 2 static bodies that are changed to dynamic and are attached to constraints
-
+ Updated the fork of Chipmunk2D used by Pymunk, fixing a number of issues, including maxForce on Spring constaints.
+ 
 Pymunk 6.7.0 (2024-05-01)
 -------------------------
 

Chipmunk2D

@@ -6,7 +6,7 @@ Pymunk
 Pymunk is an easy-to-use pythonic 2D physics library that can be used whenever 
 you need 2D rigid body physics from Python. Perfect when you need 2D physics 
 in your game, demo or simulation! It is built on top of the very 
-capable 2D physics library `Chipmunk <http://chipmunk-physics.net>`_.
+capable 2D physics library `Chipmunk2D <http://chipmunk-physics.net>`_.
 
 The first version was released in 2007 and Pymunk is still actively developed 
 and maintained today, more than 15 years of active development!
@@ -19,7 +19,7 @@ the Pymunk webpage for some examples.
 2007 - 2024, Victor Blomqvist - vb@viblo.se, MIT License
 
 This release is based on the latest Pymunk release (6.7.0), 
-using Chipmunk 7 rev 2e8d4104b7e2380d1a73f5363a931b3eb3de8d07.
+using Chipmunk2D 7 rev 7a29dcfa49931f26632f3019582f289ba811a2b9.
 
 
 Installation

README.rst

@@ -1,6 +1,7 @@
 """This example lets you dynamically create static walls and dynamic balls
 
 """
+
 __docformat__ = "reStructuredText"
 
 import pygame
@@ -18,133 +19,48 @@ def main():
  clock = pygame.time.Clock()
  running = True
  draw_options = pymunk.pygame_util.DrawOptions(screen)
- draw_options.flags = pymunk.SpaceDebugDrawOptions.DRAW_SHAPES
- draw_options.flags |= pymunk.SpaceDebugDrawOptions.DRAW_COLLISION_POINTS
+ # draw_options.flags = pymunk.SpaceDebugDrawOptions.DRAW_SHAPES
+ # draw_options.flags |= pymunk.SpaceDebugDrawOptions.DRAW_COLLISION_POINTS
 
  ### Physics stuff
  space = pymunk.Space()
-
- static_body = space.static_body
- walls = [
- pymunk.Segment(static_body, (0, 0), (0, 150), 0.0),
- pymunk.Segment(static_body, (0, 150), (150, 150), 0.0),
- pymunk.Segment(static_body, (150, 150), (150, 50), 0.0),
- pymunk.Segment(static_body, (150, 50), (100, 50), 0.0),
- pymunk.Segment(static_body, (100, 50), (100, 0), 0.0),
- pymunk.Segment(static_body, (100, 0), (0, 0), 0.0),
- ]
- for wall in walls:
- wall.collision_type = 3
- space.add(*walls)
-
- x_offset = 5
- y_offset = 5
- sensor_depth = 50
- # body = pymunk.Body(body_type=pymunk.Body.KINEMATIC)
- body = pymunk.Body(1, 2)
- sensor_shape = pymunk.Poly(
- body,
- [
- (-5 + x_offset, 0 + y_offset),
- (-20 + x_offset, sensor_depth + y_offset),
- (20 + x_offset, sensor_depth + y_offset),
- (5 + x_offset, 0 + y_offset),
- ],
+ # space.gravity = 0, 900
+ space.iterations = 3
+ space.static_body.position = 300, 100
+
+ b = pymunk.Body()
+ b.position = 300, 100
+ b.angle = 3.0
+ c = pymunk.Circle(b, 20)
+ c.mass = 10
+ space.add(c, b)
+ b.angular_velocity = 0
+ b.velocity = 0, 1000
+ c = pymunk.constraints.DampedSpring(
+ space.static_body, b, (0, 0), (0, 0), 200, 500, 20
  )
- sensor_shape.sensor = False
- sensor_shape.collision_type = 1
-
- obj = {}
+ # c = pymunk.constraints.DampedRotarySpring(space.static_body, b, 0, 90000, 2000)
+ c.max_force = 5000
+ space.add(c)
 
- def sensor_pre_solve(arbiter: pymunk.Arbiter, space, data):
- if sensor_shape in arbiter.shapes:
- obj["last_set"] = arbiter.contact_point_set
- # for point in arbiter.contact_point_set.points:
- # obj["last_contact_points"].append((point.point_a, pygame.Color('red'))
- # obj["last_contact_points"].append((point.point_b, pygame.Color('green'))
- return True
-
- sensor_collision_handler = space.add_collision_handler(1, 3)
- sensor_collision_handler.pre_solve = sensor_pre_solve
- space.add(body, sensor_shape)
+ dt = 1 / 50.0
 
  while running:
  for event in pygame.event.get():
  if event.type == pygame.QUIT:
  running = False
  elif event.type == pygame.KEYDOWN and event.key == pygame.K_ESCAPE:
  running = False
- mouse_pos = pygame.mouse.get_pos()
-
- body.position = mouse_pos
- body.position -= pymunk.Vec2d(10, 50)
- body.angle = 1
- body.velocity = 0, 0
- body.angular_velocity = 0
-
- ### Update physics
- obj["last_set"] = None
- dt = 1.0 / 60.0
 
  space.step(dt)
 
- # point set
-
- # cpBool swapped = arb->swapped;
- # cpVect n = arb->n;
- # set.normal = (swapped ? cpvneg(n) : n);
-
- # for(int i=0; i<set.count; i++){
- # // Contact points are relative to body CoGs;
- # cpVect p1 = cpvadd(arb->body_a->p, arb->contacts[i].r1);
- # cpVect p2 = cpvadd(arb->body_b->p, arb->contacts[i].r2);
-
- # set.points[i].pointA = (swapped ? p2 : p1);
- # set.points[i].pointB = (swapped ? p1 : p2);
- # set.points[i].distance = cpvdot(cpvsub(p2, p1), n);
- # }
-
- # debug collision draw
- # cpSpaceDebugDrawSegmentImpl draw_seg = options->drawSegment;
- # cpDataPointer data = options->data;
-
- # for (int i = 0; i < arbiters->num; i++)
- # {
- #	cpArbiter *arb = (cpArbiter *)arbiters->arr[i];
- #	cpVect n = arb->n;
-
- #	for (int j = 0; j < arb->count; j++)
- #	{
- #	cpVect p1 = cpvadd(arb->body_a->p, arb->contacts[j].r1);
- #	cpVect p2 = cpvadd(arb->body_b->p, arb->contacts[j].r2);
-
- #	cpFloat d = 2.0f;
- #	cpVect a = cpvadd(p1, cpvmult(n, -d));
- #	cpVect b = cpvadd(p2, cpvmult(n, d));
-
- #	a = cpTransformPoint(options->transform, a);
- #	b = cpTransformPoint(options->transform, b);
- #	draw_seg(a, b, color, data);
- #	}
- # }
-
  ### Draw stuff
  screen.fill(pygame.Color("white"))
  space.debug_draw(draw_options)
- if obj["last_set"] is not None:
- for point in obj["last_set"].points:
-
- n = obj["last_set"].normal
- # print(n, point.distance.get_distance())
- a = point.point_a + point.distance * n
- b = point.point_b # - point.distance * n
- # print(point.distance, point.point_a.get_distance(point.point_b))
- # pygame.draw.circle(screen, pygame.Color("red"), a, 5) # sensor
- pygame.draw.circle(screen, pygame.Color("blue"), b, 3)
-
+ print(c.impulse / dt)
  ### Flip screen
  pygame.display.flip()
- clock.tick(50)
+ clock.tick(10)
  pygame.display.set_caption("fps: " + str(clock.get_fps()))
 
 

dump/so.py

@@ -36,5 +36,5 @@
 
 chipmunk_version = "%s-%s" % (
  ffi.string(cp.cpVersionString).decode("utf-8"),
- "5dd7d774053145fa37f352d7a07d2f75a9bd8039",
+ "7a29dcfa49931f26632f3019582f289ba811a2b9",
 )