update physics libraries for 3.8.0 new features (#349)

This commit is contained in:
Yiwen 2023-05-14 23:17:00 +08:00 committed by GitHub
parent f28ffe31d2
commit 5bfcf7000b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 62211 additions and 30204 deletions

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,7 @@ declare namespace Bullet {
_free(p: ptr): void;
_read_f32(p: ptr): void;
_write_f32(p: ptr, v: number): void;
_safe_delete(p: ptr, bulletType: number):void;
_safe_delete(p: ptr, bulletType: number): void;
Vec3_new(x: number, y: number, z: number): ptr;
Vec3_x(p: ptr): number;
@ -44,12 +44,31 @@ declare namespace Bullet {
TypedConstraint_getFixedBody(): ptr;
HingeConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
HingeConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
HingeConstraint_setLimit(ptr: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void;
HingeConstraint_setAngularOnly(ptr: ptr, angular: number): void;
HingeConstraint_enableMotor(ptr: ptr, enable: boolean): void;
HingeConstraint_setMotorVelocity(ptr: ptr, velocity: number): void;
HingeConstraint_setMaxMotorImpulse(ptr: ptr, maxImpulse: number): void;
HingeConstraint_setMotorTarget(ptr: ptr, target: number, dt: number): void;
P2PConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
P2PConstraint_setPivotA(ptr0: ptr, ptr1: ptr): void;
P2PConstraint_setPivotB(ptr0: ptr, ptr1: ptr): void;
TypedConstraint_setMaxImpulseThreshold(ptr0: ptr, maxImpulse: number): void;
FixedConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
FixedConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
Generic6DofSpring2Constraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr, rotateOrder: number): ptr;
Generic6DofSpring2Constraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
Generic6DofSpring2Constraint_setLimit(ptr0: ptr, index: number, lo: number, hi: number): void;
Generic6DofSpring2Constraint_enableSpring(ptr0: ptr, index: number, onOff: boolean): void;
Generic6DofSpring2Constraint_setStiffness(ptr0: ptr, index: number, stiffness: number): void;
Generic6DofSpring2Constraint_setDamping(ptr0: ptr, index: number, damping: number): void;
Generic6DofSpring2Constraint_setBounce(ptr0: ptr, index: number, bounce: number): void;
Generic6DofSpring2Constraint_setEquilibriumPoint(ptr0: ptr, index: number, val: number): void;
Generic6DofSpring2Constraint_enableMotor(ptr0: ptr, index: number, onOff: boolean): void;
Generic6DofSpring2Constraint_setMaxMotorForce(ptr0: ptr, index: number, force: number): void;
Generic6DofSpring2Constraint_setTargetVelocity(ptr0: ptr, index: number, velocity: number): void;
Generic6DofSpring2Constraint_setServo(ptr0: ptr, index: number, onOff: boolean): number;
Generic6DofSpring2Constraint_setServoTarget(ptr0: ptr, index: number, target: number): number;
// shapes
@ -180,6 +199,7 @@ declare namespace Bullet {
ManifoldPoint_get_m_positionWorldOnA(p: ptr): ptr;
ManifoldPoint_get_m_positionWorldOnB(p: ptr): ptr;
ManifoldPoint_get_m_normalWorldOnB(p: ptr): ptr;
ManifoldPoint_get_m_positionWorldOnB(p: ptr): ptr;
DbvtBroadphase_new(): ptr;
SequentialImpulseConstraintSolver_new(): ptr;
@ -187,6 +207,7 @@ declare namespace Bullet {
CollisionWorld_addCollisionObject(p: ptr, body: ptr, g: number, m: number): void;
CollisionWorld_removeCollisionObject(p: ptr, body: ptr): void;
CollisionWorld_rayTest(p: ptr, p0: ptr, p1: ptr, p2: ptr): void;
CollisionWorld_convexSweepTest(p: ptr, castShape: ptr, from: ptr, to: ptr, resultCallback: ptr, allowedCcdPenetration: ptr): void;
ccDiscreteDynamicsWorld_new(dispatcher: ptr, pairCache: ptr, solver: ptr): ptr;
ccDiscreteDynamicsWorld_setAllowSleep(p: ptr, v: boolean): void;
@ -196,8 +217,11 @@ declare namespace Bullet {
DynamicsWorld_removeRigidBody(p: ptr, body: ptr): void;
DynamicsWorld_addConstraint(p: ptr, p2: ptr, v: boolean): void;
DynamicsWorld_removeConstraint(p: ptr, p2: ptr): void;
DynamicsWorld_addAction(p: ptr, action: ptr): void;
DynamicsWorld_removeAction(p: ptr, action: ptr): void;
RayCallback_hasHit(p: ptr): boolean;
ConvexCallback_hasHit(p: ptr): boolean;
ccAllRayCallback_static(): ptr;
ccAllRayCallback_setFlags(p: ptr, flag: number): void;
@ -213,7 +237,48 @@ declare namespace Bullet {
ccClosestRayCallback_getHitNormalWorld(p: ptr): ptr;
ccClosestRayCallback_getCollisionShapePtr(p: ptr): ptr;
ccAllConvexCallback_static(): ptr;
ccAllConvexCallback_reset(p: ptr, p0: ptr, p1: ptr, m: number, q: boolean): void;
ccAllConvexCallback_getHitPointWorld(p: ptr): ptr;
ccAllConvexCallback_getHitNormalWorld(p: ptr): ptr;
ccAllConvexCallback_getCollisionShapePtrs(p: ptr): ptr;
ccClosestConvexCallback_static(): ptr;
ccClosestConvexCallback_reset(p: ptr, p0: ptr, p1: ptr, m: number, q: boolean): void;
ccClosestConvexCallback_getHitPointWorld(p: ptr): ptr;
ccClosestConvexCallback_getHitNormalWorld(p: ptr): ptr;
ccClosestConvexCallback_getCollisionShapePtr(p: ptr): ptr;
ccMaterial_new(): ptr;
ccMaterial_set(p: ptr, r: number, f: number, rf: number, sf: number): void;
// CharacterController
ControllerHitReport_new(): ptr;
CharacterController_getGhostObject(ptrCCT: ptr): ptr;
ControllerHit_getCurrentController(ptr: ptr): ptr;
ControllerHit_getHitWorldPos(ptr: ptr): ptr;
ControllerHit_getHitWorldNormal(ptr: ptr): ptr;
ControllerHit_getHitMotionDir(ptr: ptr): ptr; //CCT hit Motion direction
ControllerHit_getHitMotionLength(ptr: ptr): number; //CCT hit Motion length
ControllerShapeHit_getHitShape(ptr: ptr): ptr;
ControllerShapeHit_getHitCollisionObject(ptr: ptr): ptr;
CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number):number;
CharacterController_getPosition(ptrCCT: ptr);
CharacterController_setContactOffset(ptrCCT: ptr, v: number);
CharacterController_setStepOffset(ptrCCT: ptr, v: number);
CharacterController_setSlopeLimit(ptrCCT: ptr, v: number);
CharacterController_setCollision(ptrCCT: ptr, collision: boolean);
CharacterController_setOverlapRecovery(ptrCCT: ptr, value: boolean);
CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, radius: number, height: number): ptr;
CapsuleCharacterController_new(collisionWorld: ptr, ptrBtCapsuleCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
CapsuleCharacterController_setRadius(ptrCCT: ptr, radius: number): void;
CapsuleCharacterController_setHeight(ptrCCT: ptr, height: number): void;
BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, halfHeight: number, halfSideExtent: number, halfForwardExtent: number): ptr;
BoxCharacterController_new(collisionWorld: ptr, ptrBtBoxCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
BoxCharacterController_setHalfHeight(ptrCCT: ptr, v: number): void;
BoxCharacterController_setHalfSideExtent(ptrCCT: ptr, v: number): void;
BoxCharacterController_setHalfForwardExtent(ptrCCT: ptr, v: number): void;
}
}

Binary file not shown.

View File

@ -182,6 +182,51 @@ declare namespace phy {
getRigidDynamicLockFlags (): number
}
/// Character Controller ///
interface ControllerShapeHit {
}
interface ControllersHit {
}
abstract class Controller {
release (): void
move (disp: Vec3, minDist: number, elapsedTime: number,
filterData: FilterData, cb: number): number
setPosition (pos: any): void
getPosition (): any
setStepOffset (val: number): void
getStepOffset (): number
setContactOffset (val: number): void
getContactOffset (): number
setSlopeLimit (val: number): void
getSlopeLimit (): number
setCollision (val: boolean): void
setSimulationFilterData (val: FilterData): void
setQueryFilterData (val: FilterData): void
}
class CapsuleController extends Controller {
constructor ()
setRadius (val: number): void
getRadius (): number
setHeight (val: number): void
getHeight (): number
setClimbingMode (val: number): void
getClimbingMode (): number
}
class BoxController extends Controller {
constructor ()
setHalfHeight (val: number): void
getHalfHeight (): number
setHalfSideExtent(val: number): void
getHalfSideExtent (): number
setHalfForwardExtent (val: number): void
getHalfForwardExtent (): number
}
/// Geometry ///
interface Geometry {

File diff suppressed because one or more lines are too long

View File

@ -60,16 +60,10 @@ var quit_ = function(status, toThrow) {
// Determine the runtime environment we are in. You can customize this by
// setting the ENVIRONMENT setting at compile time (see settings.js).
var ENVIRONMENT_IS_WEB = false;
var ENVIRONMENT_IS_WEB = true;
var ENVIRONMENT_IS_WORKER = false;
var ENVIRONMENT_IS_NODE = false;
var ENVIRONMENT_IS_SHELL = false;
ENVIRONMENT_IS_WEB = typeof window === 'object';
ENVIRONMENT_IS_WORKER = typeof importScripts === 'function';
// N.b. Electron.js environment is simultaneously a NODE-environment, but
// also a web environment.
ENVIRONMENT_IS_NODE = typeof process === 'object' && typeof process.versions === 'object' && typeof process.versions.node === 'string';
ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
@ -581,8 +575,8 @@ var wasmMemory;
// In the wasm backend, we polyfill the WebAssembly object,
// so this creates a (non-native-wasm) table for us.
var wasmTable = new WebAssembly.Table({
'initial': 5024,
'maximum': 5024 + 0,
'initial': 5437,
'maximum': 5437 + 0,
'element': 'anyfunc'
});
@ -1204,11 +1198,11 @@ function updateGlobalBufferAndViews(buf) {
}
var STATIC_BASE = 1024,
STACK_BASE = 5607968,
STACK_BASE = 5608208,
STACKTOP = STACK_BASE,
STACK_MAX = 365088,
DYNAMIC_BASE = 5607968,
DYNAMICTOP_PTR = 364928;
STACK_MAX = 365328,
DYNAMIC_BASE = 5608208,
DYNAMICTOP_PTR = 365168;
@ -1684,7 +1678,7 @@ var ASM_CONSTS = {
// STATICTOP = STATIC_BASE + 364064;
// STATICTOP = STATIC_BASE + 364304;
/* global initializers */ __ATINIT__.push({ func: function() { ___wasm_call_ctors() } });
@ -3909,7 +3903,7 @@ var ASM_CONSTS = {
}
function _emscripten_get_sbrk_ptr() {
return 364928;
return 365168;
}
function _emscripten_memcpy_big(dest, src, num) {
@ -4316,11 +4310,6 @@ var dynCall_viii = Module["dynCall_viii"] = function() {
return (dynCall_viii = Module["dynCall_viii"] = Module["asm"]["dynCall_viii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_i = Module["dynCall_i"] = function() {
return (dynCall_i = Module["dynCall_i"] = Module["asm"]["dynCall_i"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_fii = Module["dynCall_fii"] = function() {
return (dynCall_fii = Module["dynCall_fii"] = Module["asm"]["dynCall_fii"]).apply(null, arguments);
@ -4336,6 +4325,11 @@ var dynCall_iiiii = Module["dynCall_iiiii"] = function() {
return (dynCall_iiiii = Module["dynCall_iiiii"] = Module["asm"]["dynCall_iiiii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_i = Module["dynCall_i"] = function() {
return (dynCall_i = Module["dynCall_i"] = Module["asm"]["dynCall_i"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiiiii = Module["dynCall_iiiiiii"] = function() {
return (dynCall_iiiiiii = Module["dynCall_iiiiiii"] = Module["asm"]["dynCall_iiiiiii"]).apply(null, arguments);
@ -4346,6 +4340,26 @@ var dynCall_vii = Module["dynCall_vii"] = function() {
return (dynCall_vii = Module["dynCall_vii"] = Module["asm"]["dynCall_vii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiff = Module["dynCall_iiff"] = function() {
return (dynCall_iiff = Module["dynCall_iiff"] = Module["asm"]["dynCall_iiff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iifff = Module["dynCall_iifff"] = function() {
return (dynCall_iifff = Module["dynCall_iifff"] = Module["asm"]["dynCall_iifff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiff = Module["dynCall_iiiff"] = function() {
return (dynCall_iiiff = Module["dynCall_iiiff"] = Module["asm"]["dynCall_iiiff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiifff = Module["dynCall_iiifff"] = function() {
return (dynCall_iiifff = Module["dynCall_iiifff"] = Module["asm"]["dynCall_iiifff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viiii = Module["dynCall_viiii"] = function() {
return (dynCall_viiii = Module["dynCall_viiii"] = Module["asm"]["dynCall_viiii"]).apply(null, arguments);
@ -4362,13 +4376,13 @@ var dynCall_viifi = Module["dynCall_viifi"] = function() {
};
/** @type {function(...*):?} */
var dynCall_dii = Module["dynCall_dii"] = function() {
return (dynCall_dii = Module["dynCall_dii"] = Module["asm"]["dynCall_dii"]).apply(null, arguments);
var dynCall_iifffi = Module["dynCall_iifffi"] = function() {
return (dynCall_iifffi = Module["dynCall_iifffi"] = Module["asm"]["dynCall_iifffi"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viid = Module["dynCall_viid"] = function() {
return (dynCall_viid = Module["dynCall_viid"] = Module["asm"]["dynCall_viid"]).apply(null, arguments);
var dynCall_viiiii = Module["dynCall_viiiii"] = function() {
return (dynCall_viiiii = Module["dynCall_viiiii"] = Module["asm"]["dynCall_viiiii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
@ -4397,13 +4411,13 @@ var dynCall_iiiiiifiiiiif = Module["dynCall_iiiiiifiiiiif"] = function() {
};
/** @type {function(...*):?} */
var dynCall_iiiif = Module["dynCall_iiiif"] = function() {
return (dynCall_iiiif = Module["dynCall_iiiif"] = Module["asm"]["dynCall_iiiif"]).apply(null, arguments);
var dynCall_iiiiiifiiiiiif = Module["dynCall_iiiiiifiiiiiif"] = function() {
return (dynCall_iiiiiifiiiiiif = Module["dynCall_iiiiiifiiiiiif"] = Module["asm"]["dynCall_iiiiiifiiiiiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiifff = Module["dynCall_iiifff"] = function() {
return (dynCall_iiifff = Module["dynCall_iiifff"] = Module["asm"]["dynCall_iiifff"]).apply(null, arguments);
var dynCall_iiiif = Module["dynCall_iiiif"] = function() {
return (dynCall_iiiif = Module["dynCall_iiiif"] = Module["asm"]["dynCall_iiiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
@ -4421,11 +4435,6 @@ var dynCall_iif = Module["dynCall_iif"] = function() {
return (dynCall_iif = Module["dynCall_iif"] = Module["asm"]["dynCall_iif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiff = Module["dynCall_iiff"] = function() {
return (dynCall_iiff = Module["dynCall_iiff"] = Module["asm"]["dynCall_iiff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiifff = Module["dynCall_iiiifff"] = function() {
return (dynCall_iiiifff = Module["dynCall_iiiifff"] = Module["asm"]["dynCall_iiiifff"]).apply(null, arguments);
@ -4436,6 +4445,16 @@ var dynCall_iiffff = Module["dynCall_iiffff"] = function() {
return (dynCall_iiffff = Module["dynCall_iiffff"] = Module["asm"]["dynCall_iiffff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viiif = Module["dynCall_viiif"] = function() {
return (dynCall_viiif = Module["dynCall_viiif"] = Module["asm"]["dynCall_viiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiiffii = Module["dynCall_iiiiffii"] = function() {
return (dynCall_iiiiffii = Module["dynCall_iiiiffii"] = Module["asm"]["dynCall_iiiiffii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_vifi = Module["dynCall_vifi"] = function() {
return (dynCall_vifi = Module["dynCall_vifi"] = Module["asm"]["dynCall_vifi"]).apply(null, arguments);
@ -4462,8 +4481,13 @@ var dynCall_iiiifiiiiii = Module["dynCall_iiiifiiiiii"] = function() {
};
/** @type {function(...*):?} */
var dynCall_viiif = Module["dynCall_viiif"] = function() {
return (dynCall_viiif = Module["dynCall_viiif"] = Module["asm"]["dynCall_viiif"]).apply(null, arguments);
var dynCall_iiiiifiiiiif = Module["dynCall_iiiiifiiiiif"] = function() {
return (dynCall_iiiiifiiiiif = Module["dynCall_iiiiifiiiiif"] = Module["asm"]["dynCall_iiiiifiiiiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiiifiiiiiif = Module["dynCall_iiiiifiiiiiif"] = function() {
return (dynCall_iiiiifiiiiiif = Module["dynCall_iiiiifiiiiiif"] = Module["asm"]["dynCall_iiiiifiiiiiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
@ -4476,6 +4500,11 @@ var dynCall_vif = Module["dynCall_vif"] = function() {
return (dynCall_vif = Module["dynCall_vif"] = Module["asm"]["dynCall_vif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiffii = Module["dynCall_iiiffii"] = function() {
return (dynCall_iiiffii = Module["dynCall_iiiffii"] = Module["asm"]["dynCall_iiiffii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_v = Module["dynCall_v"] = function() {
return (dynCall_v = Module["dynCall_v"] = Module["asm"]["dynCall_v"]).apply(null, arguments);
@ -4511,11 +4540,6 @@ var dynCall_viiiiiiiiiiifii = Module["dynCall_viiiiiiiiiiifii"] = function() {
return (dynCall_viiiiiiiiiiifii = Module["dynCall_viiiiiiiiiiifii"] = Module["asm"]["dynCall_viiiiiiiiiiifii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viiiii = Module["dynCall_viiiii"] = function() {
return (dynCall_viiiii = Module["dynCall_viiiii"] = Module["asm"]["dynCall_viiiii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iifiiiijii = Module["dynCall_iifiiiijii"] = function() {
return (dynCall_iifiiiijii = Module["dynCall_iifiiiijii"] = Module["asm"]["dynCall_iifiiiijii"]).apply(null, arguments);
@ -4596,11 +4620,6 @@ var dynCall_viifffi = Module["dynCall_viifffi"] = function() {
return (dynCall_viifffi = Module["dynCall_viifffi"] = Module["asm"]["dynCall_viifffi"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iifff = Module["dynCall_iifff"] = function() {
return (dynCall_iifff = Module["dynCall_iifff"] = Module["asm"]["dynCall_iifff"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viiifiiiii = Module["dynCall_viiifiiiii"] = function() {
return (dynCall_viiifiiiii = Module["dynCall_viiifiiiii"] = Module["asm"]["dynCall_viiifiiiii"]).apply(null, arguments);
@ -4611,11 +4630,6 @@ var dynCall_viiiifiiiiif = Module["dynCall_viiiifiiiiif"] = function() {
return (dynCall_viiiifiiiiif = Module["dynCall_viiiifiiiiif"] = Module["asm"]["dynCall_viiiifiiiiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiiifiiiiif = Module["dynCall_iiiiifiiiiif"] = function() {
return (dynCall_iiiiifiiiiif = Module["dynCall_iiiiifiiiiif"] = Module["asm"]["dynCall_iiiiifiiiiif"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_iiiiifiii = Module["dynCall_iiiiifiii"] = function() {
return (dynCall_iiiiifiii = Module["dynCall_iiiiifiii"] = Module["asm"]["dynCall_iiiiifiii"]).apply(null, arguments);
@ -4671,6 +4685,11 @@ var dynCall_iiiiiiiiii = Module["dynCall_iiiiiiiiii"] = function() {
return (dynCall_iiiiiiiiii = Module["dynCall_iiiiiiiiii"] = Module["asm"]["dynCall_iiiiiiiiii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viiiffii = Module["dynCall_viiiffii"] = function() {
return (dynCall_viiiffii = Module["dynCall_viiiffii"] = Module["asm"]["dynCall_viiiffii"]).apply(null, arguments);
};
/** @type {function(...*):?} */
var dynCall_viij = Module["dynCall_viij"] = function() {
return (dynCall_viij = Module["dynCall_viij"] = Module["asm"]["dynCall_viij"]).apply(null, arguments);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long