tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected bug of the previous commit

This commit is contained in:
Thomas FORGIONE 2015-07-06 17:25:03 +02:00
parent 59e6806d16
commit 41ccc7da27
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
js/l3d/src/recommendations/ViewportRecommendation.js
View File

@ -23,8 +23,6 @@ L3D.ViewportRecommendation = function(arg1, arg2, arg3, arg4, position, target)
direction.sub(this.camera.position); direction.sub(this.camera.position);
direction.normalize(); direction.normalize();
this.camera.target = this.camera.position.clone();
this.camera.target.add(L3D.Tools.mul(direction,10));
// this.up = new THREE.Vector3(0,0,1); // this.up = new THREE.Vector3(0,0,1);
// Compute corners // Compute corners
@ -54,27 +52,27 @@ L3D.ViewportRecommendation = function(arg1, arg2, arg3, arg4, position, target)
var material = new THREE.LineBasicMaterial({ color: '0x000000'}); var material = new THREE.LineBasicMaterial({ color: '0x000000'});
var geometry = new THREE.Geometry(); var geometry = new THREE.Geometry();
var tmp_direction = L3D.Tools.mul(direction, -2); var tmp_direction = L3D.Tools.mul(direction, -2);
var target = L3D.Tools.sum(self.position, tmp_direction); var target = L3D.Tools.sum(self.camera.position, tmp_direction);
// geometry.vertices.push(self.position, target); // geometry.vertices.push(self.camera.position, target);
geometry.vertices.push( geometry.vertices.push(
L3D.Tools.sum(L3D.Tools.sum(self.position, left), other), L3D.Tools.sum(L3D.Tools.sum(self.camera.position, left), other),
L3D.Tools.diff(L3D.Tools.sum(self.position, other),left), L3D.Tools.diff(L3D.Tools.sum(self.camera.position, other),left),
L3D.Tools.diff(L3D.Tools.diff(self.position, left),other), L3D.Tools.diff(L3D.Tools.diff(self.camera.position, left),other),
L3D.Tools.sum(L3D.Tools.diff(self.position, other), left), L3D.Tools.sum(L3D.Tools.diff(self.camera.position, other), left),
L3D.Tools.sum(L3D.Tools.sum(self.position, left), other), L3D.Tools.sum(L3D.Tools.sum(self.camera.position, left), other),
L3D.Tools.sum(L3D.Tools.diff(self.position, other), left), L3D.Tools.sum(L3D.Tools.diff(self.camera.position, other), left),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.sum(L3D.Tools.sum(self.position, left), other), L3D.Tools.sum(L3D.Tools.sum(self.camera.position, left), other),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.diff(L3D.Tools.sum(self.position, other),left), L3D.Tools.diff(L3D.Tools.sum(self.camera.position, other),left),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.diff(L3D.Tools.diff(self.position, left),other), L3D.Tools.diff(L3D.Tools.diff(self.camera.position, left),other),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.sum(L3D.Tools.diff(self.position, other), left) L3D.Tools.sum(L3D.Tools.diff(self.camera.position, other), left)
); );
self.line = new THREE.Line(geometry, material); self.line = new THREE.Line(geometry, material);
@ -157,27 +155,27 @@ L3D.ViewportRecommendation.prototype.setSize = function(size) {
(function(self, direction, left, other, size) { (function(self, direction, left, other, size) {
var tmp_direction = L3D.Tools.mul(direction, -2 * size); var tmp_direction = L3D.Tools.mul(direction, -2 * size);
var target = L3D.Tools.sum(self.position, tmp_direction); var target = L3D.Tools.sum(self.camera.position, tmp_direction);
var vertices = [ var vertices = [
L3D.Tools.sum(L3D.Tools.sum(self.position, left), other), L3D.Tools.sum(L3D.Tools.sum(self.camera.position, left), other),
L3D.Tools.diff(L3D.Tools.sum(self.position, other),left), L3D.Tools.diff(L3D.Tools.sum(self.camera.position, other),left),
L3D.Tools.diff(L3D.Tools.diff(self.position, left),other), L3D.Tools.diff(L3D.Tools.diff(self.camera.position, left),other),
L3D.Tools.sum(L3D.Tools.diff(self.position, other), left), L3D.Tools.sum(L3D.Tools.diff(self.camera.position, other), left),
L3D.Tools.sum(L3D.Tools.sum(self.position, left), other), L3D.Tools.sum(L3D.Tools.sum(self.camera.position, left), other),
L3D.Tools.sum(L3D.Tools.diff(self.position, other), left), L3D.Tools.sum(L3D.Tools.diff(self.camera.position, other), left),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.sum(L3D.Tools.sum(self.position, left), other), L3D.Tools.sum(L3D.Tools.sum(self.camera.position, left), other),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.diff(L3D.Tools.sum(self.position, other),left), L3D.Tools.diff(L3D.Tools.sum(self.camera.position, other),left),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.diff(L3D.Tools.diff(self.position, left),other), L3D.Tools.diff(L3D.Tools.diff(self.camera.position, left),other),
L3D.Tools.sum(self.position, tmp_direction), L3D.Tools.sum(self.camera.position, tmp_direction),
L3D.Tools.sum(L3D.Tools.diff(self.position, other), left) L3D.Tools.sum(L3D.Tools.diff(self.camera.position, other), left)
]; ];
self.line.geometry.vertices = vertices; self.line.geometry.vertices = vertices;