box2d-bindings 0.1.1-x64-mingw → 0.1.3-x64-mingw

data/lib/box2d_types.rb

@@ -25,9 +25,9 @@ module Box2D
   ShapeType_chainSegmentShape = 4
   ShapeType_shapeTypeCount = 5
   JointType_distanceJoint = 0
-  JointType_motorJoint = 1
-  JointType_mouseJoint = 2
-  JointType_nullJoint = 3
+  JointType_filterJoint = 1
+  JointType_motorJoint = 2
+  JointType_mouseJoint = 3
   JointType_prismaticJoint = 4
   JointType_revoluteJoint = 5
   JointType_weldJoint = 6
@@ -192,6 +192,7 @@ module Box2D
   typedef :pointer, :b2PreSolveFcn
   typedef :pointer, :b2OverlapResultFcn
   typedef :pointer, :b2CastResultFcn
+  typedef :pointer, :b2PlaneResultFcn
   typedef :int, :b2HexColor
 
   # Struct
@@ -240,9 +241,7 @@ module Box2D
       :hitEventThreshold, :float,
       :contactHertz, :float,
       :contactDampingRatio, :float,
-      :contactPushMaxSpeed, :float,
-      :jointHertz, :float,
-      :jointDampingRatio, :float,
+      :maxContactPushSpeed, :float,
       :maximumLinearSpeed, :float,
       :frictionCallback, :pointer,
       :restitutionCallback, :pointer,
@@ -265,12 +264,8 @@ module Box2D
     def contactHertz=(v) self[:contactHertz] = v end
     def contactDampingRatio = self[:contactDampingRatio]
     def contactDampingRatio=(v) self[:contactDampingRatio] = v end
-    def contactPushMaxSpeed = self[:contactPushMaxSpeed]
-    def contactPushMaxSpeed=(v) self[:contactPushMaxSpeed] = v end
-    def jointHertz = self[:jointHertz]
-    def jointHertz=(v) self[:jointHertz] = v end
-    def jointDampingRatio = self[:jointDampingRatio]
-    def jointDampingRatio=(v) self[:jointDampingRatio] = v end
+    def maxContactPushSpeed = self[:maxContactPushSpeed]
+    def maxContactPushSpeed=(v) self[:maxContactPushSpeed] = v end
     def maximumLinearSpeed = self[:maximumLinearSpeed]
     def maximumLinearSpeed=(v) self[:maximumLinearSpeed] = v end
     def frictionCallback = self[:frictionCallback]
@@ -293,16 +288,14 @@ module Box2D
     def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_gravity_, _restitutionThreshold_, _hitEventThreshold_, _contactHertz_, _contactDampingRatio_, _contactPushMaxSpeed_, _jointHertz_, _jointDampingRatio_, _maximumLinearSpeed_, _frictionCallback_, _restitutionCallback_, _enableSleep_, _enableContinuous_, _workerCount_, _enqueueTask_, _finishTask_, _userTaskContext_, _userData_, _internalValue_)
+    def self.create_as(_gravity_, _restitutionThreshold_, _hitEventThreshold_, _contactHertz_, _contactDampingRatio_, _maxContactPushSpeed_, _maximumLinearSpeed_, _frictionCallback_, _restitutionCallback_, _enableSleep_, _enableContinuous_, _workerCount_, _enqueueTask_, _finishTask_, _userTaskContext_, _userData_, _internalValue_)
       instance = WorldDef.new
       instance[:gravity] = _gravity_
       instance[:restitutionThreshold] = _restitutionThreshold_
       instance[:hitEventThreshold] = _hitEventThreshold_
       instance[:contactHertz] = _contactHertz_
       instance[:contactDampingRatio] = _contactDampingRatio_
-      instance[:contactPushMaxSpeed] = _contactPushMaxSpeed_
-      instance[:jointHertz] = _jointHertz_
-      instance[:jointDampingRatio] = _jointDampingRatio_
+      instance[:maxContactPushSpeed] = _maxContactPushSpeed_
       instance[:maximumLinearSpeed] = _maximumLinearSpeed_
       instance[:frictionCallback] = _frictionCallback_
       instance[:restitutionCallback] = _restitutionCallback_
@@ -437,18 +430,47 @@ module Box2D
     end
   end
 
-  class ShapeDef < FFI::Struct
+  class SurfaceMaterial < FFI::Struct
     layout(
-      :userData, :pointer,
       :friction, :float,
       :restitution, :float,
       :rollingResistance, :float,
       :tangentSpeed, :float,
-      :material, :int,
+      :userMaterialId, :int,
+      :customColor, :uint,
+    )
+    def friction = self[:friction]
+    def friction=(v) self[:friction] = v end
+    def restitution = self[:restitution]
+    def restitution=(v) self[:restitution] = v end
+    def rollingResistance = self[:rollingResistance]
+    def rollingResistance=(v) self[:rollingResistance] = v end
+    def tangentSpeed = self[:tangentSpeed]
+    def tangentSpeed=(v) self[:tangentSpeed] = v end
+    def userMaterialId = self[:userMaterialId]
+    def userMaterialId=(v) self[:userMaterialId] = v end
+    def customColor = self[:customColor]
+    def customColor=(v) self[:customColor] = v end
+    def self.create_as(_friction_, _restitution_, _rollingResistance_, _tangentSpeed_, _userMaterialId_, _customColor_)
+      instance = SurfaceMaterial.new
+      instance[:friction] = _friction_
+      instance[:restitution] = _restitution_
+      instance[:rollingResistance] = _rollingResistance_
+      instance[:tangentSpeed] = _tangentSpeed_
+      instance[:userMaterialId] = _userMaterialId_
+      instance[:customColor] = _customColor_
+      instance
+    end
+  end
+
+  class ShapeDef < FFI::Struct
+    layout(
+      :userData, :pointer,
+      :material, SurfaceMaterial,
       :density, :float,
       :filter, Filter,
-      :customColor, :uint,
       :isSensor, :bool,
+      :enableSensorEvents, :bool,
       :enableContactEvents, :bool,
       :enableHitEvents, :bool,
       :enablePreSolveEvents, :bool,
@@ -458,24 +480,16 @@ module Box2D
     )
     def userData = self[:userData]
     def userData=(v) self[:userData] = v end
-    def friction = self[:friction]
-    def friction=(v) self[:friction] = v end
-    def restitution = self[:restitution]
-    def restitution=(v) self[:restitution] = v end
-    def rollingResistance = self[:rollingResistance]
-    def rollingResistance=(v) self[:rollingResistance] = v end
-    def tangentSpeed = self[:tangentSpeed]
-    def tangentSpeed=(v) self[:tangentSpeed] = v end
     def material = self[:material]
     def material=(v) self[:material] = v end
     def density = self[:density]
     def density=(v) self[:density] = v end
     def filter = self[:filter]
     def filter=(v) self[:filter] = v end
-    def customColor = self[:customColor]
-    def customColor=(v) self[:customColor] = v end
     def isSensor = self[:isSensor]
     def isSensor=(v) self[:isSensor] = v end
+    def enableSensorEvents = self[:enableSensorEvents]
+    def enableSensorEvents=(v) self[:enableSensorEvents] = v end
     def enableContactEvents = self[:enableContactEvents]
     def enableContactEvents=(v) self[:enableContactEvents] = v end
     def enableHitEvents = self[:enableHitEvents]
@@ -488,18 +502,14 @@ module Box2D
     def updateBodyMass=(v) self[:updateBodyMass] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_userData_, _friction_, _restitution_, _rollingResistance_, _tangentSpeed_, _material_, _density_, _filter_, _customColor_, _isSensor_, _enableContactEvents_, _enableHitEvents_, _enablePreSolveEvents_, _invokeContactCreation_, _updateBodyMass_, _internalValue_)
+    def self.create_as(_userData_, _material_, _density_, _filter_, _isSensor_, _enableSensorEvents_, _enableContactEvents_, _enableHitEvents_, _enablePreSolveEvents_, _invokeContactCreation_, _updateBodyMass_, _internalValue_)
       instance = ShapeDef.new
       instance[:userData] = _userData_
-      instance[:friction] = _friction_
-      instance[:restitution] = _restitution_
-      instance[:rollingResistance] = _rollingResistance_
-      instance[:tangentSpeed] = _tangentSpeed_
       instance[:material] = _material_
       instance[:density] = _density_
       instance[:filter] = _filter_
-      instance[:customColor] = _customColor_
       instance[:isSensor] = _isSensor_
+      instance[:enableSensorEvents] = _enableSensorEvents_
       instance[:enableContactEvents] = _enableContactEvents_
       instance[:enableHitEvents] = _enableHitEvents_
       instance[:enablePreSolveEvents] = _enablePreSolveEvents_
@@ -510,39 +520,6 @@ module Box2D
     end
   end
 
-  class SurfaceMaterial < FFI::Struct
-    layout(
-      :friction, :float,
-      :restitution, :float,
-      :rollingResistance, :float,
-      :tangentSpeed, :float,
-      :material, :int,
-      :customColor, :uint,
-    )
-    def friction = self[:friction]
-    def friction=(v) self[:friction] = v end
-    def restitution = self[:restitution]
-    def restitution=(v) self[:restitution] = v end
-    def rollingResistance = self[:rollingResistance]
-    def rollingResistance=(v) self[:rollingResistance] = v end
-    def tangentSpeed = self[:tangentSpeed]
-    def tangentSpeed=(v) self[:tangentSpeed] = v end
-    def material = self[:material]
-    def material=(v) self[:material] = v end
-    def customColor = self[:customColor]
-    def customColor=(v) self[:customColor] = v end
-    def self.create_as(_friction_, _restitution_, _rollingResistance_, _tangentSpeed_, _material_, _customColor_)
-      instance = SurfaceMaterial.new
-      instance[:friction] = _friction_
-      instance[:restitution] = _restitution_
-      instance[:rollingResistance] = _rollingResistance_
-      instance[:tangentSpeed] = _tangentSpeed_
-      instance[:material] = _material_
-      instance[:customColor] = _customColor_
-      instance
-    end
-  end
-
   class ChainDef < FFI::Struct
     layout(
       :userData, :pointer,
@@ -552,6 +529,7 @@ module Box2D
       :materialCount, :int,
       :filter, Filter,
       :isLoop, :bool,
+      :enableSensorEvents, :bool,
       :internalValue, :int,
     )
     def userData = self[:userData]
@@ -568,9 +546,11 @@ module Box2D
     def filter=(v) self[:filter] = v end
     def isLoop = self[:isLoop]
     def isLoop=(v) self[:isLoop] = v end
+    def enableSensorEvents = self[:enableSensorEvents]
+    def enableSensorEvents=(v) self[:enableSensorEvents] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_userData_, _points_, _count_, _materials_, _materialCount_, _filter_, _isLoop_, _internalValue_)
+    def self.create_as(_userData_, _points_, _count_, _materials_, _materialCount_, _filter_, _isLoop_, _enableSensorEvents_, _internalValue_)
       instance = ChainDef.new
       instance[:userData] = _userData_
       instance[:points] = _points_
@@ -579,6 +559,7 @@ module Box2D
       instance[:materialCount] = _materialCount_
       instance[:filter] = _filter_
       instance[:isLoop] = _isLoop_
+      instance[:enableSensorEvents] = _enableSensorEvents_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -603,6 +584,7 @@ module Box2D
       :storeImpulses, :float,
       :splitIslands, :float,
       :transforms, :float,
+      :jointEvents, :float,
       :hitEvents, :float,
       :refit, :float,
       :bullets, :float,
@@ -643,6 +625,8 @@ module Box2D
     def splitIslands=(v) self[:splitIslands] = v end
     def transforms = self[:transforms]
     def transforms=(v) self[:transforms] = v end
+    def jointEvents = self[:jointEvents]
+    def jointEvents=(v) self[:jointEvents] = v end
     def hitEvents = self[:hitEvents]
     def hitEvents=(v) self[:hitEvents] = v end
     def refit = self[:refit]
@@ -653,7 +637,7 @@ module Box2D
     def sleepIslands=(v) self[:sleepIslands] = v end
     def sensors = self[:sensors]
     def sensors=(v) self[:sensors] = v end
-    def self.create_as(_step_, _pairs_, _collide_, _solve_, _mergeIslands_, _prepareStages_, _solveConstraints_, _prepareConstraints_, _integrateVelocities_, _warmStart_, _solveImpulses_, _integratePositions_, _relaxImpulses_, _applyRestitution_, _storeImpulses_, _splitIslands_, _transforms_, _hitEvents_, _refit_, _bullets_, _sleepIslands_, _sensors_)
+    def self.create_as(_step_, _pairs_, _collide_, _solve_, _mergeIslands_, _prepareStages_, _solveConstraints_, _prepareConstraints_, _integrateVelocities_, _warmStart_, _solveImpulses_, _integratePositions_, _relaxImpulses_, _applyRestitution_, _storeImpulses_, _splitIslands_, _transforms_, _jointEvents_, _hitEvents_, _refit_, _bullets_, _sleepIslands_, _sensors_)
       instance = Profile.new
       instance[:step] = _step_
       instance[:pairs] = _pairs_
@@ -672,6 +656,7 @@ module Box2D
       instance[:storeImpulses] = _storeImpulses_
       instance[:splitIslands] = _splitIslands_
       instance[:transforms] = _transforms_
+      instance[:jointEvents] = _jointEvents_
       instance[:hitEvents] = _hitEvents_
       instance[:refit] = _refit_
       instance[:bullets] = _bullets_
@@ -734,12 +719,54 @@ module Box2D
     end
   end
 
-  class DistanceJointDef < FFI::Struct
+  class JointDef < FFI::Struct
     layout(
+      :userData, :pointer,
       :bodyIdA, BodyId,
       :bodyIdB, BodyId,
-      :localAnchorA, Vec2,
-      :localAnchorB, Vec2,
+      :localFrameA, Transform,
+      :localFrameB, Transform,
+      :forceThreshold, :float,
+      :torqueThreshold, :float,
+      :drawSize, :float,
+      :collideConnected, :bool,
+    )
+    def userData = self[:userData]
+    def userData=(v) self[:userData] = v end
+    def bodyIdA = self[:bodyIdA]
+    def bodyIdA=(v) self[:bodyIdA] = v end
+    def bodyIdB = self[:bodyIdB]
+    def bodyIdB=(v) self[:bodyIdB] = v end
+    def localFrameA = self[:localFrameA]
+    def localFrameA=(v) self[:localFrameA] = v end
+    def localFrameB = self[:localFrameB]
+    def localFrameB=(v) self[:localFrameB] = v end
+    def forceThreshold = self[:forceThreshold]
+    def forceThreshold=(v) self[:forceThreshold] = v end
+    def torqueThreshold = self[:torqueThreshold]
+    def torqueThreshold=(v) self[:torqueThreshold] = v end
+    def drawSize = self[:drawSize]
+    def drawSize=(v) self[:drawSize] = v end
+    def collideConnected = self[:collideConnected]
+    def collideConnected=(v) self[:collideConnected] = v end
+    def self.create_as(_userData_, _bodyIdA_, _bodyIdB_, _localFrameA_, _localFrameB_, _forceThreshold_, _torqueThreshold_, _drawSize_, _collideConnected_)
+      instance = JointDef.new
+      instance[:userData] = _userData_
+      instance[:bodyIdA] = _bodyIdA_
+      instance[:bodyIdB] = _bodyIdB_
+      instance[:localFrameA] = _localFrameA_
+      instance[:localFrameB] = _localFrameB_
+      instance[:forceThreshold] = _forceThreshold_
+      instance[:torqueThreshold] = _torqueThreshold_
+      instance[:drawSize] = _drawSize_
+      instance[:collideConnected] = _collideConnected_
+      instance
+    end
+  end
+
+  class DistanceJointDef < FFI::Struct
+    layout(
+      :base, JointDef,
       :length, :float,
       :enableSpring, :bool,
       :hertz, :float,
@@ -750,18 +777,10 @@ module Box2D
       :enableMotor, :bool,
       :maxMotorForce, :float,
       :motorSpeed, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def localAnchorA = self[:localAnchorA]
-    def localAnchorA=(v) self[:localAnchorA] = v end
-    def localAnchorB = self[:localAnchorB]
-    def localAnchorB=(v) self[:localAnchorB] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
     def length = self[:length]
     def length=(v) self[:length] = v end
     def enableSpring = self[:enableSpring]
@@ -782,18 +801,11 @@ module Box2D
     def maxMotorForce=(v) self[:maxMotorForce] = v end
     def motorSpeed = self[:motorSpeed]
     def motorSpeed=(v) self[:motorSpeed] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _localAnchorA_, _localAnchorB_, _length_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _minLength_, _maxLength_, _enableMotor_, _maxMotorForce_, _motorSpeed_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _length_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _minLength_, _maxLength_, _enableMotor_, _maxMotorForce_, _motorSpeed_, _internalValue_)
       instance = DistanceJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:localAnchorA] = _localAnchorA_
-      instance[:localAnchorB] = _localAnchorB_
+      instance[:base] = _base_
       instance[:length] = _length_
       instance[:enableSpring] = _enableSpring_
       instance[:hertz] = _hertz_
@@ -804,8 +816,6 @@ module Box2D
       instance[:enableMotor] = _enableMotor_
       instance[:maxMotorForce] = _maxMotorForce_
       instance[:motorSpeed] = _motorSpeed_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -813,48 +823,28 @@ module Box2D
 
   class MotorJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :linearOffset, Vec2,
-      :angularOffset, :float,
+      :base, JointDef,
       :maxForce, :float,
       :maxTorque, :float,
       :correctionFactor, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def linearOffset = self[:linearOffset]
-    def linearOffset=(v) self[:linearOffset] = v end
-    def angularOffset = self[:angularOffset]
-    def angularOffset=(v) self[:angularOffset] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
     def maxForce = self[:maxForce]
     def maxForce=(v) self[:maxForce] = v end
     def maxTorque = self[:maxTorque]
     def maxTorque=(v) self[:maxTorque] = v end
     def correctionFactor = self[:correctionFactor]
     def correctionFactor=(v) self[:correctionFactor] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _linearOffset_, _angularOffset_, _maxForce_, _maxTorque_, _correctionFactor_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _maxForce_, _maxTorque_, _correctionFactor_, _internalValue_)
       instance = MotorJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:linearOffset] = _linearOffset_
-      instance[:angularOffset] = _angularOffset_
+      instance[:base] = _base_
       instance[:maxForce] = _maxForce_
       instance[:maxTorque] = _maxTorque_
       instance[:correctionFactor] = _correctionFactor_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -862,69 +852,45 @@ module Box2D
 
   class MouseJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :target, Vec2,
+      :base, JointDef,
       :hertz, :float,
       :dampingRatio, :float,
       :maxForce, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def target = self[:target]
-    def target=(v) self[:target] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
     def hertz = self[:hertz]
     def hertz=(v) self[:hertz] = v end
     def dampingRatio = self[:dampingRatio]
     def dampingRatio=(v) self[:dampingRatio] = v end
     def maxForce = self[:maxForce]
     def maxForce=(v) self[:maxForce] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _target_, _hertz_, _dampingRatio_, _maxForce_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _hertz_, _dampingRatio_, _maxForce_, _internalValue_)
       instance = MouseJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:target] = _target_
+      instance[:base] = _base_
       instance[:hertz] = _hertz_
       instance[:dampingRatio] = _dampingRatio_
       instance[:maxForce] = _maxForce_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
   end
 
-  class NullJointDef < FFI::Struct
+  class FilterJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :userData, :pointer,
+      :base, JointDef,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _userData_, _internalValue_)
-      instance = NullJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:userData] = _userData_
+    def self.create_as(_base_, _internalValue_)
+      instance = FilterJointDef.new
+      instance[:base] = _base_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -932,12 +898,8 @@ module Box2D
 
   class PrismaticJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :localAnchorA, Vec2,
-      :localAnchorB, Vec2,
-      :localAxisA, Vec2,
-      :referenceAngle, :float,
+      :base, JointDef,
+      :targetTranslation, :float,
       :enableSpring, :bool,
       :hertz, :float,
       :dampingRatio, :float,
@@ -947,22 +909,12 @@ module Box2D
       :enableMotor, :bool,
       :maxMotorForce, :float,
       :motorSpeed, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def localAnchorA = self[:localAnchorA]
-    def localAnchorA=(v) self[:localAnchorA] = v end
-    def localAnchorB = self[:localAnchorB]
-    def localAnchorB=(v) self[:localAnchorB] = v end
-    def localAxisA = self[:localAxisA]
-    def localAxisA=(v) self[:localAxisA] = v end
-    def referenceAngle = self[:referenceAngle]
-    def referenceAngle=(v) self[:referenceAngle] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
+    def targetTranslation = self[:targetTranslation]
+    def targetTranslation=(v) self[:targetTranslation] = v end
     def enableSpring = self[:enableSpring]
     def enableSpring=(v) self[:enableSpring] = v end
     def hertz = self[:hertz]
@@ -981,20 +933,12 @@ module Box2D
     def maxMotorForce=(v) self[:maxMotorForce] = v end
     def motorSpeed = self[:motorSpeed]
     def motorSpeed=(v) self[:motorSpeed] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _localAnchorA_, _localAnchorB_, _localAxisA_, _referenceAngle_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _lowerTranslation_, _upperTranslation_, _enableMotor_, _maxMotorForce_, _motorSpeed_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _targetTranslation_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _lowerTranslation_, _upperTranslation_, _enableMotor_, _maxMotorForce_, _motorSpeed_, _internalValue_)
       instance = PrismaticJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:localAnchorA] = _localAnchorA_
-      instance[:localAnchorB] = _localAnchorB_
-      instance[:localAxisA] = _localAxisA_
-      instance[:referenceAngle] = _referenceAngle_
+      instance[:base] = _base_
+      instance[:targetTranslation] = _targetTranslation_
       instance[:enableSpring] = _enableSpring_
       instance[:hertz] = _hertz_
       instance[:dampingRatio] = _dampingRatio_
@@ -1004,8 +948,6 @@ module Box2D
       instance[:enableMotor] = _enableMotor_
       instance[:maxMotorForce] = _maxMotorForce_
       instance[:motorSpeed] = _motorSpeed_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -1013,11 +955,8 @@ module Box2D
 
   class RevoluteJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :localAnchorA, Vec2,
-      :localAnchorB, Vec2,
-      :referenceAngle, :float,
+      :base, JointDef,
+      :targetAngle, :float,
       :enableSpring, :bool,
       :hertz, :float,
       :dampingRatio, :float,
@@ -1027,21 +966,12 @@ module Box2D
       :enableMotor, :bool,
       :maxMotorTorque, :float,
       :motorSpeed, :float,
-      :drawSize, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def localAnchorA = self[:localAnchorA]
-    def localAnchorA=(v) self[:localAnchorA] = v end
-    def localAnchorB = self[:localAnchorB]
-    def localAnchorB=(v) self[:localAnchorB] = v end
-    def referenceAngle = self[:referenceAngle]
-    def referenceAngle=(v) self[:referenceAngle] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
+    def targetAngle = self[:targetAngle]
+    def targetAngle=(v) self[:targetAngle] = v end
     def enableSpring = self[:enableSpring]
     def enableSpring=(v) self[:enableSpring] = v end
     def hertz = self[:hertz]
@@ -1060,21 +990,12 @@ module Box2D
     def maxMotorTorque=(v) self[:maxMotorTorque] = v end
     def motorSpeed = self[:motorSpeed]
     def motorSpeed=(v) self[:motorSpeed] = v end
-    def drawSize = self[:drawSize]
-    def drawSize=(v) self[:drawSize] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _localAnchorA_, _localAnchorB_, _referenceAngle_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _lowerAngle_, _upperAngle_, _enableMotor_, _maxMotorTorque_, _motorSpeed_, _drawSize_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _targetAngle_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _lowerAngle_, _upperAngle_, _enableMotor_, _maxMotorTorque_, _motorSpeed_, _internalValue_)
       instance = RevoluteJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:localAnchorA] = _localAnchorA_
-      instance[:localAnchorB] = _localAnchorB_
-      instance[:referenceAngle] = _referenceAngle_
+      instance[:base] = _base_
+      instance[:targetAngle] = _targetAngle_
       instance[:enableSpring] = _enableSpring_
       instance[:hertz] = _hertz_
       instance[:dampingRatio] = _dampingRatio_
@@ -1084,9 +1005,6 @@ module Box2D
       instance[:enableMotor] = _enableMotor_
       instance[:maxMotorTorque] = _maxMotorTorque_
       instance[:motorSpeed] = _motorSpeed_
-      instance[:drawSize] = _drawSize_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -1094,29 +1012,15 @@ module Box2D
 
   class WeldJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :localAnchorA, Vec2,
-      :localAnchorB, Vec2,
-      :referenceAngle, :float,
+      :base, JointDef,
       :linearHertz, :float,
       :angularHertz, :float,
       :linearDampingRatio, :float,
       :angularDampingRatio, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def localAnchorA = self[:localAnchorA]
-    def localAnchorA=(v) self[:localAnchorA] = v end
-    def localAnchorB = self[:localAnchorB]
-    def localAnchorB=(v) self[:localAnchorB] = v end
-    def referenceAngle = self[:referenceAngle]
-    def referenceAngle=(v) self[:referenceAngle] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
     def linearHertz = self[:linearHertz]
     def linearHertz=(v) self[:linearHertz] = v end
     def angularHertz = self[:angularHertz]
@@ -1125,25 +1029,15 @@ module Box2D
     def linearDampingRatio=(v) self[:linearDampingRatio] = v end
     def angularDampingRatio = self[:angularDampingRatio]
     def angularDampingRatio=(v) self[:angularDampingRatio] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _localAnchorA_, _localAnchorB_, _referenceAngle_, _linearHertz_, _angularHertz_, _linearDampingRatio_, _angularDampingRatio_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _linearHertz_, _angularHertz_, _linearDampingRatio_, _angularDampingRatio_, _internalValue_)
       instance = WeldJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:localAnchorA] = _localAnchorA_
-      instance[:localAnchorB] = _localAnchorB_
-      instance[:referenceAngle] = _referenceAngle_
+      instance[:base] = _base_
       instance[:linearHertz] = _linearHertz_
       instance[:angularHertz] = _angularHertz_
       instance[:linearDampingRatio] = _linearDampingRatio_
       instance[:angularDampingRatio] = _angularDampingRatio_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -1151,11 +1045,7 @@ module Box2D
 
   class WheelJointDef < FFI::Struct
     layout(
-      :bodyIdA, BodyId,
-      :bodyIdB, BodyId,
-      :localAnchorA, Vec2,
-      :localAnchorB, Vec2,
-      :localAxisA, Vec2,
+      :base, JointDef,
       :enableSpring, :bool,
       :hertz, :float,
       :dampingRatio, :float,
@@ -1165,20 +1055,10 @@ module Box2D
       :enableMotor, :bool,
       :maxMotorTorque, :float,
       :motorSpeed, :float,
-      :collideConnected, :bool,
-      :userData, :pointer,
       :internalValue, :int,
     )
-    def bodyIdA = self[:bodyIdA]
-    def bodyIdA=(v) self[:bodyIdA] = v end
-    def bodyIdB = self[:bodyIdB]
-    def bodyIdB=(v) self[:bodyIdB] = v end
-    def localAnchorA = self[:localAnchorA]
-    def localAnchorA=(v) self[:localAnchorA] = v end
-    def localAnchorB = self[:localAnchorB]
-    def localAnchorB=(v) self[:localAnchorB] = v end
-    def localAxisA = self[:localAxisA]
-    def localAxisA=(v) self[:localAxisA] = v end
+    def base = self[:base]
+    def base=(v) self[:base] = v end
     def enableSpring = self[:enableSpring]
     def enableSpring=(v) self[:enableSpring] = v end
     def hertz = self[:hertz]
@@ -1197,19 +1077,11 @@ module Box2D
     def maxMotorTorque=(v) self[:maxMotorTorque] = v end
     def motorSpeed = self[:motorSpeed]
     def motorSpeed=(v) self[:motorSpeed] = v end
-    def collideConnected = self[:collideConnected]
-    def collideConnected=(v) self[:collideConnected] = v end
-    def userData = self[:userData]
-    def userData=(v) self[:userData] = v end
     def internalValue = self[:internalValue]
     def internalValue=(v) self[:internalValue] = v end
-    def self.create_as(_bodyIdA_, _bodyIdB_, _localAnchorA_, _localAnchorB_, _localAxisA_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _lowerTranslation_, _upperTranslation_, _enableMotor_, _maxMotorTorque_, _motorSpeed_, _collideConnected_, _userData_, _internalValue_)
+    def self.create_as(_base_, _enableSpring_, _hertz_, _dampingRatio_, _enableLimit_, _lowerTranslation_, _upperTranslation_, _enableMotor_, _maxMotorTorque_, _motorSpeed_, _internalValue_)
       instance = WheelJointDef.new
-      instance[:bodyIdA] = _bodyIdA_
-      instance[:bodyIdB] = _bodyIdB_
-      instance[:localAnchorA] = _localAnchorA_
-      instance[:localAnchorB] = _localAnchorB_
-      instance[:localAxisA] = _localAxisA_
+      instance[:base] = _base_
       instance[:enableSpring] = _enableSpring_
       instance[:hertz] = _hertz_
       instance[:dampingRatio] = _dampingRatio_
@@ -1219,8 +1091,6 @@ module Box2D
       instance[:enableMotor] = _enableMotor_
       instance[:maxMotorTorque] = _maxMotorTorque_
       instance[:motorSpeed] = _motorSpeed_
-      instance[:collideConnected] = _collideConnected_
-      instance[:userData] = _userData_
       instance[:internalValue] = _internalValue_
       instance
     end
@@ -1318,18 +1188,22 @@ module Box2D
     layout(
       :shapeIdA, ShapeId,
       :shapeIdB, ShapeId,
+      :contactId, ContactId,
       :manifold, Manifold,
     )
     def shapeIdA = self[:shapeIdA]
     def shapeIdA=(v) self[:shapeIdA] = v end
     def shapeIdB = self[:shapeIdB]
     def shapeIdB=(v) self[:shapeIdB] = v end
+    def contactId = self[:contactId]
+    def contactId=(v) self[:contactId] = v end
     def manifold = self[:manifold]
     def manifold=(v) self[:manifold] = v end
-    def self.create_as(_shapeIdA_, _shapeIdB_, _manifold_)
+    def self.create_as(_shapeIdA_, _shapeIdB_, _contactId_, _manifold_)
       instance = ContactBeginTouchEvent.new
       instance[:shapeIdA] = _shapeIdA_
       instance[:shapeIdB] = _shapeIdB_
+      instance[:contactId] = _contactId_
       instance[:manifold] = _manifold_
       instance
     end
@@ -1339,15 +1213,19 @@ module Box2D
     layout(
       :shapeIdA, ShapeId,
       :shapeIdB, ShapeId,
+      :contactId, ContactId,
     )
     def shapeIdA = self[:shapeIdA]
     def shapeIdA=(v) self[:shapeIdA] = v end
     def shapeIdB = self[:shapeIdB]
     def shapeIdB=(v) self[:shapeIdB] = v end
-    def self.create_as(_shapeIdA_, _shapeIdB_)
+    def contactId = self[:contactId]
+    def contactId=(v) self[:contactId] = v end
+    def self.create_as(_shapeIdA_, _shapeIdB_, _contactId_)
       instance = ContactEndTouchEvent.new
       instance[:shapeIdA] = _shapeIdA_
       instance[:shapeIdB] = _shapeIdB_
+      instance[:contactId] = _contactId_
       instance
     end
   end
@@ -1456,6 +1334,40 @@ module Box2D
     end
   end
 
+  class JointEvent < FFI::Struct
+    layout(
+      :jointId, JointId,
+      :userData, :pointer,
+    )
+    def jointId = self[:jointId]
+    def jointId=(v) self[:jointId] = v end
+    def userData = self[:userData]
+    def userData=(v) self[:userData] = v end
+    def self.create_as(_jointId_, _userData_)
+      instance = JointEvent.new
+      instance[:jointId] = _jointId_
+      instance[:userData] = _userData_
+      instance
+    end
+  end
+
+  class JointEvents < FFI::Struct
+    layout(
+      :jointEvents, :pointer,
+      :count, :int,
+    )
+    def jointEvents = self[:jointEvents]
+    def jointEvents=(v) self[:jointEvents] = v end
+    def count = self[:count]
+    def count=(v) self[:count] = v end
+    def self.create_as(_jointEvents_, _count_)
+      instance = JointEvents.new
+      instance[:jointEvents] = _jointEvents_
+      instance[:count] = _count_
+      instance
+    end
+  end
+
   class ContactData < FFI::Struct
     layout(
       :shapeIdA, ShapeId,
@@ -1479,48 +1391,50 @@ module Box2D
 
   class DebugDraw < FFI::Struct
     layout(
-      :DrawPolygon, :pointer,
-      :DrawSolidPolygon, :pointer,
-      :DrawCircle, :pointer,
-      :DrawSolidCircle, :pointer,
-      :DrawSolidCapsule, :pointer,
-      :DrawSegment, :pointer,
-      :DrawTransform, :pointer,
-      :DrawPoint, :pointer,
-      :DrawString, :pointer,
+      :DrawPolygonFcn, :pointer,
+      :DrawSolidPolygonFcn, :pointer,
+      :DrawCircleFcn, :pointer,
+      :DrawSolidCircleFcn, :pointer,
+      :DrawSolidCapsuleFcn, :pointer,
+      :DrawSegmentFcn, :pointer,
+      :DrawTransformFcn, :pointer,
+      :DrawPointFcn, :pointer,
+      :DrawStringFcn, :pointer,
       :drawingBounds, AABB,
       :useDrawingBounds, :bool,
       :drawShapes, :bool,
       :drawJoints, :bool,
       :drawJointExtras, :bool,
-      :drawAABBs, :bool,
+      :drawBounds, :bool,
       :drawMass, :bool,
       :drawBodyNames, :bool,
       :drawContacts, :bool,
       :drawGraphColors, :bool,
       :drawContactNormals, :bool,
       :drawContactImpulses, :bool,
+      :drawContactFeatures, :bool,
       :drawFrictionImpulses, :bool,
+      :drawIslands, :bool,
       :context, :pointer,
     )
-    def DrawPolygon = self[:DrawPolygon]
-    def DrawPolygon=(v) self[:DrawPolygon] = v end
-    def DrawSolidPolygon = self[:DrawSolidPolygon]
-    def DrawSolidPolygon=(v) self[:DrawSolidPolygon] = v end
-    def DrawCircle = self[:DrawCircle]
-    def DrawCircle=(v) self[:DrawCircle] = v end
-    def DrawSolidCircle = self[:DrawSolidCircle]
-    def DrawSolidCircle=(v) self[:DrawSolidCircle] = v end
-    def DrawSolidCapsule = self[:DrawSolidCapsule]
-    def DrawSolidCapsule=(v) self[:DrawSolidCapsule] = v end
-    def DrawSegment = self[:DrawSegment]
-    def DrawSegment=(v) self[:DrawSegment] = v end
-    def DrawTransform = self[:DrawTransform]
-    def DrawTransform=(v) self[:DrawTransform] = v end
-    def DrawPoint = self[:DrawPoint]
-    def DrawPoint=(v) self[:DrawPoint] = v end
-    def DrawString = self[:DrawString]
-    def DrawString=(v) self[:DrawString] = v end
+    def DrawPolygonFcn = self[:DrawPolygonFcn]
+    def DrawPolygonFcn=(v) self[:DrawPolygonFcn] = v end
+    def DrawSolidPolygonFcn = self[:DrawSolidPolygonFcn]
+    def DrawSolidPolygonFcn=(v) self[:DrawSolidPolygonFcn] = v end
+    def DrawCircleFcn = self[:DrawCircleFcn]
+    def DrawCircleFcn=(v) self[:DrawCircleFcn] = v end
+    def DrawSolidCircleFcn = self[:DrawSolidCircleFcn]
+    def DrawSolidCircleFcn=(v) self[:DrawSolidCircleFcn] = v end
+    def DrawSolidCapsuleFcn = self[:DrawSolidCapsuleFcn]
+    def DrawSolidCapsuleFcn=(v) self[:DrawSolidCapsuleFcn] = v end
+    def DrawSegmentFcn = self[:DrawSegmentFcn]
+    def DrawSegmentFcn=(v) self[:DrawSegmentFcn] = v end
+    def DrawTransformFcn = self[:DrawTransformFcn]
+    def DrawTransformFcn=(v) self[:DrawTransformFcn] = v end
+    def DrawPointFcn = self[:DrawPointFcn]
+    def DrawPointFcn=(v) self[:DrawPointFcn] = v end
+    def DrawStringFcn = self[:DrawStringFcn]
+    def DrawStringFcn=(v) self[:DrawStringFcn] = v end
     def drawingBounds = self[:drawingBounds]
     def drawingBounds=(v) self[:drawingBounds] = v end
     def useDrawingBounds = self[:useDrawingBounds]
@@ -1531,8 +1445,8 @@ module Box2D
     def drawJoints=(v) self[:drawJoints] = v end
     def drawJointExtras = self[:drawJointExtras]
     def drawJointExtras=(v) self[:drawJointExtras] = v end
-    def drawAABBs = self[:drawAABBs]
-    def drawAABBs=(v) self[:drawAABBs] = v end
+    def drawBounds = self[:drawBounds]
+    def drawBounds=(v) self[:drawBounds] = v end
     def drawMass = self[:drawMass]
     def drawMass=(v) self[:drawMass] = v end
     def drawBodyNames = self[:drawBodyNames]
@@ -1545,34 +1459,40 @@ module Box2D
     def drawContactNormals=(v) self[:drawContactNormals] = v end
     def drawContactImpulses = self[:drawContactImpulses]
     def drawContactImpulses=(v) self[:drawContactImpulses] = v end
+    def drawContactFeatures = self[:drawContactFeatures]
+    def drawContactFeatures=(v) self[:drawContactFeatures] = v end
     def drawFrictionImpulses = self[:drawFrictionImpulses]
     def drawFrictionImpulses=(v) self[:drawFrictionImpulses] = v end
+    def drawIslands = self[:drawIslands]
+    def drawIslands=(v) self[:drawIslands] = v end
     def context = self[:context]
     def context=(v) self[:context] = v end
-    def self.create_as(_DrawPolygon_, _DrawSolidPolygon_, _DrawCircle_, _DrawSolidCircle_, _DrawSolidCapsule_, _DrawSegment_, _DrawTransform_, _DrawPoint_, _DrawString_, _drawingBounds_, _useDrawingBounds_, _drawShapes_, _drawJoints_, _drawJointExtras_, _drawAABBs_, _drawMass_, _drawBodyNames_, _drawContacts_, _drawGraphColors_, _drawContactNormals_, _drawContactImpulses_, _drawFrictionImpulses_, _context_)
+    def self.create_as(_DrawPolygonFcn_, _DrawSolidPolygonFcn_, _DrawCircleFcn_, _DrawSolidCircleFcn_, _DrawSolidCapsuleFcn_, _DrawSegmentFcn_, _DrawTransformFcn_, _DrawPointFcn_, _DrawStringFcn_, _drawingBounds_, _useDrawingBounds_, _drawShapes_, _drawJoints_, _drawJointExtras_, _drawBounds_, _drawMass_, _drawBodyNames_, _drawContacts_, _drawGraphColors_, _drawContactNormals_, _drawContactImpulses_, _drawContactFeatures_, _drawFrictionImpulses_, _drawIslands_, _context_)
       instance = DebugDraw.new
-      instance[:DrawPolygon] = _DrawPolygon_
-      instance[:DrawSolidPolygon] = _DrawSolidPolygon_
-      instance[:DrawCircle] = _DrawCircle_
-      instance[:DrawSolidCircle] = _DrawSolidCircle_
-      instance[:DrawSolidCapsule] = _DrawSolidCapsule_
-      instance[:DrawSegment] = _DrawSegment_
-      instance[:DrawTransform] = _DrawTransform_
-      instance[:DrawPoint] = _DrawPoint_
-      instance[:DrawString] = _DrawString_
+      instance[:DrawPolygonFcn] = _DrawPolygonFcn_
+      instance[:DrawSolidPolygonFcn] = _DrawSolidPolygonFcn_
+      instance[:DrawCircleFcn] = _DrawCircleFcn_
+      instance[:DrawSolidCircleFcn] = _DrawSolidCircleFcn_
+      instance[:DrawSolidCapsuleFcn] = _DrawSolidCapsuleFcn_
+      instance[:DrawSegmentFcn] = _DrawSegmentFcn_
+      instance[:DrawTransformFcn] = _DrawTransformFcn_
+      instance[:DrawPointFcn] = _DrawPointFcn_
+      instance[:DrawStringFcn] = _DrawStringFcn_
       instance[:drawingBounds] = _drawingBounds_
       instance[:useDrawingBounds] = _useDrawingBounds_
       instance[:drawShapes] = _drawShapes_
       instance[:drawJoints] = _drawJoints_
       instance[:drawJointExtras] = _drawJointExtras_
-      instance[:drawAABBs] = _drawAABBs_
+      instance[:drawBounds] = _drawBounds_
       instance[:drawMass] = _drawMass_
       instance[:drawBodyNames] = _drawBodyNames_
       instance[:drawContacts] = _drawContacts_
       instance[:drawGraphColors] = _drawGraphColors_
       instance[:drawContactNormals] = _drawContactNormals_
       instance[:drawContactImpulses] = _drawContactImpulses_
+      instance[:drawContactFeatures] = _drawContactFeatures_
       instance[:drawFrictionImpulses] = _drawFrictionImpulses_
+      instance[:drawIslands] = _drawIslands_
       instance[:context] = _context_
       instance
     end
@@ -1587,13 +1507,13 @@ module Box2D
       [:DefaultBodyDef, :b2DefaultBodyDef, [], BodyDef.by_value],
       [:DefaultFilter, :b2DefaultFilter, [], Filter.by_value],
       [:DefaultQueryFilter, :b2DefaultQueryFilter, [], QueryFilter.by_value],
-      [:DefaultShapeDef, :b2DefaultShapeDef, [], ShapeDef.by_value],
       [:DefaultSurfaceMaterial, :b2DefaultSurfaceMaterial, [], SurfaceMaterial.by_value],
+      [:DefaultShapeDef, :b2DefaultShapeDef, [], ShapeDef.by_value],
       [:DefaultChainDef, :b2DefaultChainDef, [], ChainDef.by_value],
       [:DefaultDistanceJointDef, :b2DefaultDistanceJointDef, [], DistanceJointDef.by_value],
       [:DefaultMotorJointDef, :b2DefaultMotorJointDef, [], MotorJointDef.by_value],
       [:DefaultMouseJointDef, :b2DefaultMouseJointDef, [], MouseJointDef.by_value],
-      [:DefaultNullJointDef, :b2DefaultNullJointDef, [], NullJointDef.by_value],
+      [:DefaultFilterJointDef, :b2DefaultFilterJointDef, [], FilterJointDef.by_value],
       [:DefaultPrismaticJointDef, :b2DefaultPrismaticJointDef, [], PrismaticJointDef.by_value],
       [:DefaultRevoluteJointDef, :b2DefaultRevoluteJointDef, [], RevoluteJointDef.by_value],
       [:DefaultWeldJointDef, :b2DefaultWeldJointDef, [], WeldJointDef.by_value],