Skip to content

Fix performance issues and introduce Performance example #40

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

Merged
codynova merged 11 commits into from
Jul 6, 2020
Merged

Fix performance issues and introduce Performance example #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c3f6bcb
Add new example Performance
marcofugaro Jun 25, 2020
bf1c9e9
Add jank to the performance demo
marcofugaro Jun 26, 2020
157d9b3
Add missing low-framerate fix
marcofugaro Jun 26, 2020
2970232
Limit the accumulator and allow dt of 0, from schteppe#392
marcofugaro Jun 26, 2020
61b5f4e
Fine-tune the bail-out check
marcofugaro Jun 27, 2020
da9924d
Build
marcofugaro Jun 27, 2020
d241227
Mention new updates in the readme
marcofugaro Jun 27, 2020
42b11c1
Typo£
marcofugaro Jun 27, 2020
52a7915
Increase stepping fps threshold to 30fps
marcofugaro Jun 27, 2020
873ea8b
Merge branch 'master' into performance
codynova Jul 6, 2020
22b4448
Build
codynova Jul 6, 2020
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
Prev Previous commit
Next Next commit
Build
  • Loading branch information
@marcofugaro
marcofugaro committed Jun 27, 2020
commit da9924d7f6d79427b9b724c2881a69d8c77d88be
25 changes: 18 additions & 7 deletions dist/cannon-es.cjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9127,7 +9127,7 @@ class Trimesh extends Shape {
const n = this.vertices.length / 3,
verts = this.vertices;
const minx,miny,minz,maxx,maxy,maxz;
const v = tempWorldVertex;
const v = tempWorldVertex;
for(let i=0; i<n; i++){
this.getVertex(i, v);
quat.vmult(v, v);
Expand All @@ -9137,12 +9137,12 @@ class Trimesh extends Shape {
} else if(v.x > maxx || maxx===undefined){
maxx = v.x;
}
if (v.y < miny || miny===undefined){
if (v.y < miny || miny===undefined){
miny = v.y;
} else if(v.y > maxy || maxy===undefined){
maxy = v.y;
}
if (v.z < minz || minz===undefined){
if (v.z < minz || minz===undefined){
minz = v.z;
} else if(v.z > maxz || maxz===undefined){
maxz = v.z;
Expand Down Expand Up @@ -11803,24 +11803,35 @@ class World extends EventTarget {
*/


step(dt, timeSinceLastCalled = 0, maxSubSteps = 10) {
if (timeSinceLastCalled === 0) {
step(dt, timeSinceLastCalled, maxSubSteps = 10) {
if (timeSinceLastCalled === undefined) {
// Fixed, simple stepping
this.internalStep(dt); // Increment time

this.time += dt;
} else {
this.accumulator += timeSinceLastCalled;
const t0 = performance.now();
let substeps = 0;

while (this.accumulator >= dt && substeps < maxSubSteps) {
// Do fixed steps to catch up
this.internalStep(dt);
this.accumulator -= dt;
substeps++;
}

const t = this.accumulator % dt / dt;
if (performance.now() - t0 > dt * 6 * 1000) {
// The framerate is not interactive anymore.
// We are at 1/6th of the target framerate.
// Better bail out.
break;
}
} // Remove the excess accumulator, since we may not
// have had enough substeps available to catch up


this.accumulator = this.accumulator % dt;
const t = this.accumulator / dt;

for (let j = 0; j !== this.bodies.length; j++) {
const b = this.bodies[j];
Expand Down
25 changes: 18 additions & 7 deletions dist/cannon-es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9123,7 +9123,7 @@ class Trimesh extends Shape {
const n = this.vertices.length / 3,
verts = this.vertices;
const minx,miny,minz,maxx,maxy,maxz;
const v = tempWorldVertex;
const v = tempWorldVertex;
for(let i=0; i<n; i++){
this.getVertex(i, v);
quat.vmult(v, v);
Expand All @@ -9133,12 +9133,12 @@ class Trimesh extends Shape {
} else if(v.x > maxx || maxx===undefined){
maxx = v.x;
}
if (v.y < miny || miny===undefined){
if (v.y < miny || miny===undefined){
miny = v.y;
} else if(v.y > maxy || maxy===undefined){
maxy = v.y;
}
if (v.z < minz || minz===undefined){
if (v.z < minz || minz===undefined){
minz = v.z;
} else if(v.z > maxz || maxz===undefined){
maxz = v.z;
Expand Down Expand Up @@ -11799,24 +11799,35 @@ class World extends EventTarget {
*/


step(dt, timeSinceLastCalled = 0, maxSubSteps = 10) {
if (timeSinceLastCalled === 0) {
step(dt, timeSinceLastCalled, maxSubSteps = 10) {
if (timeSinceLastCalled === undefined) {
// Fixed, simple stepping
this.internalStep(dt); // Increment time

this.time += dt;
} else {
this.accumulator += timeSinceLastCalled;
const t0 = performance.now();
let substeps = 0;

while (this.accumulator >= dt && substeps < maxSubSteps) {
// Do fixed steps to catch up
this.internalStep(dt);
this.accumulator -= dt;
substeps++;
}

const t = this.accumulator % dt / dt;
if (performance.now() - t0 > dt * 6 * 1000) {
// The framerate is not interactive anymore.
// We are at 1/6th of the target framerate.
// Better bail out.
break;
}
} // Remove the excess accumulator, since we may not
// have had enough substeps available to catch up


this.accumulator = this.accumulator % dt;
const t = this.accumulator / dt;

for (let j = 0; j !== this.bodies.length; j++) {
const b = this.bodies[j];
Expand Down