Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Build #82

Merged
merged 1 commit into from
Jan 10, 2019
Merged

New Build #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 5 additions & 57 deletions build/oimo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) :
(factory((global.OIMO = global.OIMO || {})));
}(this, (function (exports) { 'use strict';
(global = global || self, factory(global.OIMO = {}));
}(this, function (exports) { 'use strict';

// Polyfills

Expand Down Expand Up @@ -52,8 +52,6 @@

Object.assign = function ( target ) {

'use strict';

if ( target === undefined || target === null ) {

throw new TypeError( 'Cannot convert undefined or null to object' );
Expand Down Expand Up @@ -322,7 +320,6 @@
this.MaxTotalTime = 0;
this.MaxUpdateTime = 0;
}

Object.assign( InfoDisplay.prototype, {

setTime: function(n){
Expand Down Expand Up @@ -528,15 +525,6 @@

},

multiplyScalar: function( s ){

this.x *= s;
this.y *= s;
this.z *= s;
return this;

},

/*scaleV: function( v ){

this.x *= v.x;
Expand Down Expand Up @@ -793,7 +781,7 @@

toString: function(){

return"Vec3["+this.x.toFixed(4)+", "+this.y.toFixed(4)+", "+this.z.toFixed(4)+"]";
return "Vec3["+this.x.toFixed(4)+", "+this.y.toFixed(4)+", "+this.z.toFixed(4)+"]";

},

Expand Down Expand Up @@ -1062,7 +1050,7 @@

toString: function(){

return"Quat["+this.x.toFixed(4)+", ("+this.y.toFixed(4)+", "+this.z.toFixed(4)+", "+this.w.toFixed(4)+")]";
return "Quat["+this.x.toFixed(4)+", ("+this.y.toFixed(4)+", "+this.z.toFixed(4)+", "+this.w.toFixed(4)+")]";

},

Expand Down Expand Up @@ -1595,7 +1583,6 @@
te[3] = maxX || 0; te[4] = maxY || 0; te[5] = maxZ || 0;

}

Object.assign( AABB.prototype, {

AABB: true,
Expand Down Expand Up @@ -1798,7 +1785,6 @@
this.collidesWith = config.collidesWith;

}

Object.assign( Shape.prototype, {

Shape: true,
Expand Down Expand Up @@ -1845,7 +1831,6 @@
this.elements = new Float32Array( 24 );

}

Box.prototype = Object.assign( Object.create( Shape.prototype ), {

constructor: Box,
Expand Down Expand Up @@ -1981,7 +1966,6 @@
this.radius = radius;

}

Sphere.prototype = Object.assign( Object.create( Shape.prototype ), {

constructor: Sphere,
Expand Down Expand Up @@ -2037,7 +2021,6 @@
this.halfDirection = new Vec3();

}

Cylinder.prototype = Object.assign( Object.create( Shape.prototype ), {

constructor: Cylinder,
Expand Down Expand Up @@ -2115,7 +2098,6 @@
this.normal = new Vec3( 0, 1, 0 );

}

Plane.prototype = Object.assign( Object.create( Shape.prototype ), {

constructor: Plane,
Expand Down Expand Up @@ -2166,7 +2148,6 @@
this.type = SHAPE_PARTICLE;

}

Particle.prototype = Object.assign( Object.create( Shape.prototype ), {

constructor: Particle,
Expand Down Expand Up @@ -2255,7 +2236,6 @@
this.dampingRatio = 0;

}

Object.assign( LimitMotor.prototype, {

LimitMotor: true,
Expand Down Expand Up @@ -2396,7 +2376,6 @@
this.b2Link = new JointLink( this );

}

Joint.prototype = Object.assign( Object.create( Constraint.prototype ), {

constructor: Joint,
Expand Down Expand Up @@ -2440,7 +2419,6 @@

this.body1.jointLink.push( this.b1Link );
this.body2.jointLink.push( this.b2Link );

} else {

if(this.body1.jointLink != null) (this.b1Link.next=this.body1.jointLink).prev = this.b1Link;
Expand Down Expand Up @@ -3400,7 +3378,6 @@
this.lc = new LinearConstraint( this );
this.r3 = new Rotational3Constraint( this, this.limitMotor, new LimitMotor( this.tan, true ), new LimitMotor( this.bin, true ) );
}

HingeJoint.prototype = Object.assign( Object.create( Joint.prototype ), {

constructor: HingeJoint,
Expand Down Expand Up @@ -3478,7 +3455,6 @@
this.lc = new LinearConstraint( this );

}

BallAndSocketJoint.prototype = Object.assign( Object.create( Joint.prototype ), {

constructor: BallAndSocketJoint,
Expand Down Expand Up @@ -3811,7 +3787,6 @@
this.t = new TranslationalConstraint( this, this.limitMotor );

}

DistanceJoint.prototype = Object.assign( Object.create( Joint.prototype ), {

constructor: DistanceJoint,
Expand Down Expand Up @@ -3872,7 +3847,6 @@
this.i2 = this.b2.inverseInertia;

}

Object.assign( AngularConstraint.prototype, {

AngularConstraint: true,
Expand Down Expand Up @@ -4669,7 +4643,6 @@
this.t3 = new Translational3Constraint( this, this.limitMotor, new LimitMotor( this.tan, true ), new LimitMotor( this.bin, true ) );

}

PrismaticJoint.prototype = Object.assign( Object.create( Joint.prototype ), {

constructor: PrismaticJoint,
Expand Down Expand Up @@ -4756,7 +4729,6 @@
this.t3 = new Translational3Constraint( this, this.translationalLimitMotor, new LimitMotor( this.tan, true ), new LimitMotor( this.bin, true ) );

}

SliderJoint.prototype = Object.assign( Object.create( Joint.prototype ), {

constructor: SliderJoint,
Expand Down Expand Up @@ -4887,7 +4859,6 @@
this.r3 = new Rotational3Constraint(this,new LimitMotor( this.nor, true ),this.rotationalLimitMotor1,this.rotationalLimitMotor2);

}

WheelJoint.prototype = Object.assign( Object.create( Joint.prototype ), {

constructor: WheelJoint,
Expand Down Expand Up @@ -5256,7 +5227,6 @@

var c = this.cs;
var p, rvn, len, norImp, norTar, sepV, i1, i2;

for( var i=0; i < this.num; i++ ){

p = this.ps[i];
Expand Down Expand Up @@ -6325,7 +6295,6 @@
this.pairs = [];

}

Object.assign( BroadPhase.prototype, {

BroadPhase: true,
Expand Down Expand Up @@ -6386,8 +6355,6 @@

collectPairs: function () {

Error("BroadPhase", "Inheritance error.");

},

addPair: function ( s1, s2 ) {
Expand Down Expand Up @@ -6418,7 +6385,6 @@
this.aabb = shape.aabb;

}

Object.assign( Proxy.prototype, {

Proxy: true,
Expand Down Expand Up @@ -6446,7 +6412,6 @@
this.id = ProxyIdCount();

}

BasicProxy.prototype = Object.assign( Object.create( Proxy.prototype ), {

constructor: BasicProxy,
Expand All @@ -6473,7 +6438,6 @@

}


BruteForceBroadPhase.prototype = Object.assign( Object.create( BroadPhase.prototype ), {

constructor: BruteForceBroadPhase,
Expand Down Expand Up @@ -6792,7 +6756,6 @@
this.min[2].max2 = this.max[1];

}

SAPProxy.prototype = Object.assign( Object.create( Proxy.prototype ), {

constructor: SAPProxy,
Expand Down Expand Up @@ -6855,7 +6818,6 @@
this.index2 = 1;

}

SAPBroadPhase.prototype = Object.assign( Object.create( BroadPhase.prototype ), {

constructor: SAPBroadPhase,
Expand Down Expand Up @@ -7074,7 +7036,6 @@
this.aabb = new AABB();

}

Object.assign( DBVT.prototype, {

DBVT: true,
Expand Down Expand Up @@ -7417,7 +7378,6 @@
this.leaf.proxy = this;

}

DBVTProxy.prototype = Object.assign( Object.create( Proxy.prototype ), {

constructor: DBVTProxy,
Expand Down Expand Up @@ -7447,7 +7407,6 @@
this.numLeaves = 0;

}

DBVTBroadPhase.prototype = Object.assign( Object.create( BroadPhase.prototype ), {

constructor: DBVTBroadPhase,
Expand Down Expand Up @@ -7560,7 +7519,6 @@
this.flip = false;

}

Object.assign( CollisionDetector.prototype, {

CollisionDetector: true,
Expand All @@ -7587,7 +7545,6 @@
this.INF = 1/0;

}

BoxBoxCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: BoxBoxCollisionDetector,
Expand Down Expand Up @@ -8978,7 +8935,6 @@
this.flip = flip;

}

BoxCylinderCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: BoxCylinderCollisionDetector,
Expand Down Expand Up @@ -10012,7 +9968,6 @@
CollisionDetector.call( this );

}

CylinderCylinderCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: CylinderCylinderCollisionDetector,
Expand Down Expand Up @@ -10827,7 +10782,6 @@
this.flip = flip;

}

SphereBoxCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: SphereBoxCollisionDetector,
Expand Down Expand Up @@ -10999,7 +10953,6 @@
this.flip = flip;

}

SphereCylinderCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: SphereCylinderCollisionDetector,
Expand Down Expand Up @@ -11084,7 +11037,6 @@
CollisionDetector.call( this );

}

SphereSphereCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: SphereSphereCollisionDetector,
Expand Down Expand Up @@ -11131,7 +11083,6 @@
this.p = new Vec3();

}

SpherePlaneCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: SpherePlaneCollisionDetector,
Expand Down Expand Up @@ -11199,7 +11150,6 @@
this.cc2 = new Vec3();

}

BoxPlaneCollisionDetector.prototype = Object.assign( Object.create( CollisionDetector.prototype ), {

constructor: BoxPlaneCollisionDetector,
Expand Down Expand Up @@ -11312,8 +11262,6 @@

});

//import { TetraShape } from '../collision/shape/TetraShape';

/**
* The class of physical computing world.
* You must be added to the world physical all computing objects
Expand Down Expand Up @@ -12314,4 +12262,4 @@

Object.defineProperty(exports, '__esModule', { value: true });

})));
}));
2 changes: 1 addition & 1 deletion build/oimo.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading