From 6442a7bcb9aac87d3128511c14fa1e9b855975f8 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Tue, 28 Apr 2015 16:47:44 +0200 Subject: [PATCH] Cleaning BouncingCube and increase FixedCamera arrow resolution --- static/js/BouncingCube.js | 18 +++++++++--------- static/js/FixedCamera.js | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/static/js/BouncingCube.js b/static/js/BouncingCube.js index 2eff971..3cb9809 100644 --- a/static/js/BouncingCube.js +++ b/static/js/BouncingCube.js @@ -1,7 +1,3 @@ -DT = new THREE.Vector3(0.1,0.1,0.1); -FRICTION = new THREE.Vector3(1, 1, 1); -G = new THREE.Vector3(0,0,-10); - var BouncingCube = function(size, style) { Cube.call(this, size, style); @@ -16,21 +12,25 @@ BouncingCube.prototype.constructor = BouncingCube; BouncingCube.prototype.update = function() { // Compute new center var speed_clone = this.speed.clone(); - speed_clone.multiply(DT); + speed_clone.multiply(BouncingCube.DT); - this.speed.add(G); + this.speed.add(BouncingCube.G); if (this.speed.dot(this.speed) > 100) { this.center.add(speed_clone); } if (this.center.z < 0) { - this.speed.multiply(new THREE.Vector3(1,1,-0.5)); + this.speed.multiply(BouncingCube.FRICTION); this.center.z = 0; } // Update the mesh this.mesh.position.set(this.center.x, this.center.y, this.center.z); - - // console.log(this.center.x, this.center.y, this.center.z); } + +// Static variables +BouncingCube.DT = new THREE.Vector3(0.1,0.1,0.1); +BouncingCube.FRICTION = new THREE.Vector3(1, 1, -0.5); +BouncingCube.G = new THREE.Vector3(0,0,-10); + diff --git a/static/js/FixedCamera.js b/static/js/FixedCamera.js index 588c9af..52c9a37 100644 --- a/static/js/FixedCamera.js +++ b/static/js/FixedCamera.js @@ -162,7 +162,7 @@ FixedCamera.prototype.regenerateArrow = function(mainCamera) { var limit = this.fullArrow ? 0.1 : 0.3; // for (var i = this.fullArrow ? 0 : 0.5; i <= 1.001; i += 0.05) { - for (var i = 1; i > limit; i -= 0.05) { + for (var i = 1; i > limit; i -= 0.025) { point = hermite.eval(i); deriv = hermite.prime(i); up.cross(deriv);