Skip to content

Commit 3603c2b

Browse files
author
Alexander Gräfenstein
committed
switched to webidl2ts
1 parent c3a3fc5 commit 3603c2b

File tree

9 files changed

+856
-366
lines changed

9 files changed

+856
-366
lines changed

ammo/ambient/ammo.d.ts

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
declare function Ammo<T>(api?: T): Promise<T & typeof Ammo>;
1+
declare function Ammo<T>(target?: T): Promise<T & typeof Ammo>;
22
declare module Ammo {
33
function destroy(obj: any): void;
44
class btIDebugDraw {
@@ -89,7 +89,7 @@ declare module Ammo {
8989
getOrigin(): btVector3;
9090
getRotation(): btQuaternion;
9191
getBasis(): btMatrix3x3;
92-
setFromOpenGLMatrix(m: number[]): void;
92+
setFromOpenGLMatrix(m: ReadonlyArray<number>): void;
9393
inverse(): btTransform;
9494
op_mul(t: btTransform): btTransform;
9595
}
@@ -128,8 +128,8 @@ declare module Ammo {
128128
setCcdSweptSphereRadius(radius: number): void;
129129
getUserIndex(): number;
130130
setUserIndex(index: number): void;
131-
getUserPointer(): any;
132-
setUserPointer(userPointer: any): void;
131+
getUserPointer(): unknown;
132+
setUserPointer(userPointer: unknown): void;
133133
getBroadphaseHandle(): btBroadphaseProxy;
134134
}
135135
class btCollisionObjectWrapper {
@@ -302,7 +302,7 @@ declare module Ammo {
302302
getMargin(): number;
303303
}
304304
class btMultiSphereShape extends btCollisionShape {
305-
constructor(positions: btVector3, radii: number[], numPoints: number);
305+
constructor(positions: btVector3, radii: ReadonlyArray<number>, numPoints: number);
306306
}
307307
class btConeShape extends btCollisionShape {
308308
constructor(radius: number, height: number);
@@ -320,6 +320,8 @@ declare module Ammo {
320320
class btFace {
321321
get_m_indices(): btIntArray;
322322
set_m_indices(m_indices: btIntArray): void;
323+
get_m_plane(): ReadonlyArray<number>;
324+
set_m_plane(m_plane: ReadonlyArray<number>): void;
323325
}
324326
class btVector3Array {
325327
size(): number;
@@ -336,7 +338,7 @@ declare module Ammo {
336338
set_m_faces(m_faces: btFaceArray): void;
337339
}
338340
class btConvexHullShape extends btCollisionShape {
339-
constructor(points?: number[], numPoints?: number);
341+
constructor(points?: ReadonlyArray<number>, numPoints?: number);
340342
addPoint(point: btVector3, recalculateLocalAABB?: boolean): void;
341343
setMargin(margin: number): void;
342344
getMargin(): number;
@@ -402,7 +404,7 @@ declare module Ammo {
402404
constructor(meshInterface: btStridingMeshInterface, useQuantizedAabbCompression: boolean, buildBvh?: boolean);
403405
}
404406
class btHeightfieldTerrainShape extends btConcaveShape {
405-
constructor(heightStickWidth: number, heightStickLength: number, heightfieldData: any, heightScale: number, minHeight: number, maxHeight: number, upAxis: number, hdt: PHY_ScalarType, flipQuadEdges: boolean);
407+
constructor(heightStickWidth: number, heightStickLength: number, heightfieldData: unknown, heightScale: number, minHeight: number, maxHeight: number, upAxis: number, hdt: PHY_ScalarType, flipQuadEdges: boolean);
406408
setMargin(margin: number): void;
407409
getMargin(): number;
408410
}
@@ -656,7 +658,7 @@ declare module Ammo {
656658
addAction(action: btActionInterface): void;
657659
removeAction(action: btActionInterface): void;
658660
getSolverInfo(): btContactSolverInfo;
659-
setInternalTickCallback(cb: btInternalTickCallback, worldUserInfo?: any, isPreTick?: boolean): void;
661+
setInternalTickCallback(cb: btInternalTickCallback, worldUserInfo?: unknown, isPreTick?: boolean): void;
660662
}
661663
class btDiscreteDynamicsWorld extends btDynamicsWorld {
662664
constructor(dispatcher: btDispatcher, pairCache: btBroadphaseInterface, constraintSolver: btConstraintSolver, collisionConfiguration: btCollisionConfiguration);
@@ -885,6 +887,8 @@ declare module Ammo {
885887
set_m_gravity(m_gravity: btVector3): void;
886888
}
887889
class Face {
890+
get_m_n(): ReadonlyArray<Node>;
891+
set_m_n(m_n: ReadonlyArray<Node>): void;
888892
get_m_normal(): btVector3;
889893
set_m_normal(m_normal: btVector3): void;
890894
get_m_ra(): number;
@@ -1004,7 +1008,7 @@ declare module Ammo {
10041008
set_collisions(collisions: number): void;
10051009
}
10061010
class btSoftBody extends btCollisionObject {
1007-
constructor(worldInfo: btSoftBodyWorldInfo, node_count: number, x: btVector3, m: number[]);
1011+
constructor(worldInfo: btSoftBodyWorldInfo, node_count: number, x: btVector3, m: ReadonlyArray<number>);
10081012
get_m_cfg(): Config;
10091013
set_m_cfg(m_cfg: Config): void;
10101014
get_m_nodes(): tNodeArray;
@@ -1061,9 +1065,9 @@ declare module Ammo {
10611065
constructor();
10621066
CreateRope(worldInfo: btSoftBodyWorldInfo, from: btVector3, to: btVector3, res: number, fixeds: number): btSoftBody;
10631067
CreatePatch(worldInfo: btSoftBodyWorldInfo, corner00: btVector3, corner10: btVector3, corner01: btVector3, corner11: btVector3, resx: number, resy: number, fixeds: number, gendiags: boolean): btSoftBody;
1064-
CreatePatchUV(worldInfo: btSoftBodyWorldInfo, corner00: btVector3, corner10: btVector3, corner01: btVector3, corner11: btVector3, resx: number, resy: number, fixeds: number, gendiags: boolean, tex_coords: number[]): btSoftBody;
1068+
CreatePatchUV(worldInfo: btSoftBodyWorldInfo, corner00: btVector3, corner10: btVector3, corner01: btVector3, corner11: btVector3, resx: number, resy: number, fixeds: number, gendiags: boolean, tex_coords: ReadonlyArray<number>): btSoftBody;
10651069
CreateEllipsoid(worldInfo: btSoftBodyWorldInfo, center: btVector3, radius: btVector3, res: number): btSoftBody;
1066-
CreateFromTriMesh(worldInfo: btSoftBodyWorldInfo, vertices: number[], triangles: number[], ntriangles: number, randomizeConstraints: boolean): btSoftBody;
1070+
CreateFromTriMesh(worldInfo: btSoftBodyWorldInfo, vertices: ReadonlyArray<number>, triangles: ReadonlyArray<number>, ntriangles: number, randomizeConstraints: boolean): btSoftBody;
10671071
CreateFromConvexHull(worldInfo: btSoftBodyWorldInfo, vertices: btVector3, nvertices: number, randomizeConstraints: boolean): btSoftBody;
10681072
}
10691073
}

ammo/ammo.d.ts

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default Ammo;
2-
export function Ammo<T>(api?: T): Promise<T & typeof Ammo>;
3-
export declare module Ammo {
2+
declare function Ammo<T>(target?: T): Promise<T & typeof Ammo>;
3+
declare module Ammo {
44
function destroy(obj: any): void;
55
class btIDebugDraw {
66
drawLine(from: btVector3, to: btVector3, color: btVector3): void;
@@ -90,7 +90,7 @@ export declare module Ammo {
9090
getOrigin(): btVector3;
9191
getRotation(): btQuaternion;
9292
getBasis(): btMatrix3x3;
93-
setFromOpenGLMatrix(m: number[]): void;
93+
setFromOpenGLMatrix(m: ReadonlyArray<number>): void;
9494
inverse(): btTransform;
9595
op_mul(t: btTransform): btTransform;
9696
}
@@ -129,8 +129,8 @@ export declare module Ammo {
129129
setCcdSweptSphereRadius(radius: number): void;
130130
getUserIndex(): number;
131131
setUserIndex(index: number): void;
132-
getUserPointer(): any;
133-
setUserPointer(userPointer: any): void;
132+
getUserPointer(): unknown;
133+
setUserPointer(userPointer: unknown): void;
134134
getBroadphaseHandle(): btBroadphaseProxy;
135135
}
136136
class btCollisionObjectWrapper {
@@ -303,7 +303,7 @@ export declare module Ammo {
303303
getMargin(): number;
304304
}
305305
class btMultiSphereShape extends btCollisionShape {
306-
constructor(positions: btVector3, radii: number[], numPoints: number);
306+
constructor(positions: btVector3, radii: ReadonlyArray<number>, numPoints: number);
307307
}
308308
class btConeShape extends btCollisionShape {
309309
constructor(radius: number, height: number);
@@ -321,6 +321,8 @@ export declare module Ammo {
321321
class btFace {
322322
get_m_indices(): btIntArray;
323323
set_m_indices(m_indices: btIntArray): void;
324+
get_m_plane(): ReadonlyArray<number>;
325+
set_m_plane(m_plane: ReadonlyArray<number>): void;
324326
}
325327
class btVector3Array {
326328
size(): number;
@@ -337,7 +339,7 @@ export declare module Ammo {
337339
set_m_faces(m_faces: btFaceArray): void;
338340
}
339341
class btConvexHullShape extends btCollisionShape {
340-
constructor(points?: number[], numPoints?: number);
342+
constructor(points?: ReadonlyArray<number>, numPoints?: number);
341343
addPoint(point: btVector3, recalculateLocalAABB?: boolean): void;
342344
setMargin(margin: number): void;
343345
getMargin(): number;
@@ -403,7 +405,7 @@ export declare module Ammo {
403405
constructor(meshInterface: btStridingMeshInterface, useQuantizedAabbCompression: boolean, buildBvh?: boolean);
404406
}
405407
class btHeightfieldTerrainShape extends btConcaveShape {
406-
constructor(heightStickWidth: number, heightStickLength: number, heightfieldData: any, heightScale: number, minHeight: number, maxHeight: number, upAxis: number, hdt: PHY_ScalarType, flipQuadEdges: boolean);
408+
constructor(heightStickWidth: number, heightStickLength: number, heightfieldData: unknown, heightScale: number, minHeight: number, maxHeight: number, upAxis: number, hdt: PHY_ScalarType, flipQuadEdges: boolean);
407409
setMargin(margin: number): void;
408410
getMargin(): number;
409411
}
@@ -657,7 +659,7 @@ export declare module Ammo {
657659
addAction(action: btActionInterface): void;
658660
removeAction(action: btActionInterface): void;
659661
getSolverInfo(): btContactSolverInfo;
660-
setInternalTickCallback(cb: btInternalTickCallback, worldUserInfo?: any, isPreTick?: boolean): void;
662+
setInternalTickCallback(cb: btInternalTickCallback, worldUserInfo?: unknown, isPreTick?: boolean): void;
661663
}
662664
class btDiscreteDynamicsWorld extends btDynamicsWorld {
663665
constructor(dispatcher: btDispatcher, pairCache: btBroadphaseInterface, constraintSolver: btConstraintSolver, collisionConfiguration: btCollisionConfiguration);
@@ -886,6 +888,8 @@ export declare module Ammo {
886888
set_m_gravity(m_gravity: btVector3): void;
887889
}
888890
class Face {
891+
get_m_n(): ReadonlyArray<Node>;
892+
set_m_n(m_n: ReadonlyArray<Node>): void;
889893
get_m_normal(): btVector3;
890894
set_m_normal(m_normal: btVector3): void;
891895
get_m_ra(): number;
@@ -1005,7 +1009,7 @@ export declare module Ammo {
10051009
set_collisions(collisions: number): void;
10061010
}
10071011
class btSoftBody extends btCollisionObject {
1008-
constructor(worldInfo: btSoftBodyWorldInfo, node_count: number, x: btVector3, m: number[]);
1012+
constructor(worldInfo: btSoftBodyWorldInfo, node_count: number, x: btVector3, m: ReadonlyArray<number>);
10091013
get_m_cfg(): Config;
10101014
set_m_cfg(m_cfg: Config): void;
10111015
get_m_nodes(): tNodeArray;
@@ -1062,9 +1066,9 @@ export declare module Ammo {
10621066
constructor();
10631067
CreateRope(worldInfo: btSoftBodyWorldInfo, from: btVector3, to: btVector3, res: number, fixeds: number): btSoftBody;
10641068
CreatePatch(worldInfo: btSoftBodyWorldInfo, corner00: btVector3, corner10: btVector3, corner01: btVector3, corner11: btVector3, resx: number, resy: number, fixeds: number, gendiags: boolean): btSoftBody;
1065-
CreatePatchUV(worldInfo: btSoftBodyWorldInfo, corner00: btVector3, corner10: btVector3, corner01: btVector3, corner11: btVector3, resx: number, resy: number, fixeds: number, gendiags: boolean, tex_coords: number[]): btSoftBody;
1069+
CreatePatchUV(worldInfo: btSoftBodyWorldInfo, corner00: btVector3, corner10: btVector3, corner01: btVector3, corner11: btVector3, resx: number, resy: number, fixeds: number, gendiags: boolean, tex_coords: ReadonlyArray<number>): btSoftBody;
10661070
CreateEllipsoid(worldInfo: btSoftBodyWorldInfo, center: btVector3, radius: btVector3, res: number): btSoftBody;
1067-
CreateFromTriMesh(worldInfo: btSoftBodyWorldInfo, vertices: number[], triangles: number[], ntriangles: number, randomizeConstraints: boolean): btSoftBody;
1071+
CreateFromTriMesh(worldInfo: btSoftBodyWorldInfo, vertices: ReadonlyArray<number>, triangles: ReadonlyArray<number>, ntriangles: number, randomizeConstraints: boolean): btSoftBody;
10681072
CreateFromConvexHull(worldInfo: btSoftBodyWorldInfo, vertices: btVector3, nvertices: number, randomizeConstraints: boolean): btSoftBody;
10691073
}
10701074
}

index.ts

-11
This file was deleted.

0 commit comments

Comments
 (0)