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

Revert "In js, we don't know how to test if something is undefined" 

This reverts commit 7c138c3c27.
This commit is contained in:
Thomas FORGIONE 2015-04-07 12:04:59 +02:00
parent 7c138c3c27
commit 96db6d177f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/CameraContainer.js
View File

@ -4,7 +4,7 @@ var CameraContainer = function () {
} }
CameraContainer.prototype.mainCamera = function(id) { CameraContainer.prototype.mainCamera = function(id) {
if (typeof id === 'undefined') { if (id === undefined) {
return this.cameras[this.current_camera]; return this.cameras[this.current_camera];
} }
if (id >= cameras.length || id < 0) { if (id >= cameras.length || id < 0) {
@ -37,7 +37,7 @@ CameraContainer.prototype.get = function(i) {
CameraContainer.prototype.getById = function(id) { CameraContainer.prototype.getById = function(id) {
for (var i in this.cameras) { for (var i in this.cameras) {
if (typeof this.cameras[i].mesh !== 'undefined') { if (this.cameras[i].mesh !== undefined) {
if (this.cameras[i].mesh.id == id) { if (this.cameras[i].mesh.id == id) {
return i; return i;
} }

6
js/Cube.js
View File

@ -15,8 +15,8 @@ var Cube = function(size, style) {
// Super constructor call // Super constructor call
Displayable.call(this); Displayable.call(this);
if (typeof size === 'undefined') size = 100; if (size === undefined) size = 100;
if (typeof style === 'undefined') style = {}; if (style === undefined) style = {};
this.geometry = new THREE.BoxGeometry(size, size, size); this.geometry = new THREE.BoxGeometry(size, size, size);
// this.geometry.computeVertexNormals(); // this.geometry.computeVertexNormals();
@ -33,7 +33,7 @@ Cube.prototype.constructor = Cube;
var Plane = function(size1, size2, style) { var Plane = function(size1, size2, style) {
Displayable.call(this); Displayable.call(this);
if (typeof style === 'undefined') style = {}; if (style === undefined) style = {};
this.geometry = new THREE.PlaneBufferGeometry(size1, size2); this.geometry = new THREE.PlaneBufferGeometry(size1, size2);
this.material = new THREE.MeshLambertMaterial(style); this.material = new THREE.MeshLambertMaterial(style);

4
js/FixedCamera.js
View File

@ -5,7 +5,7 @@ var FixedCamera = function(arg1, arg2, arg3, arg4, position, target) {
THREE.PerspectiveCamera.apply(this, arguments); THREE.PerspectiveCamera.apply(this, arguments);
// Set Position // Set Position
if (typeof position === 'undefined') { if (position === undefined) {
this.position = new THREE.Vector3(0,0,5); this.position = new THREE.Vector3(0,0,5);
} else { } else {
this.position.x = position.x; this.position.x = position.x;
@ -14,7 +14,7 @@ var FixedCamera = function(arg1, arg2, arg3, arg4, position, target) {
} }
if (typeof target === 'undefined') if (target === undefined)
target = new THREE.Vector3(0,0,0); target = new THREE.Vector3(0,0,0);
var direction = target.clone(); var direction = target.clone();

4
scene/js/main.js
View File

@ -197,7 +197,7 @@ function click(event) {
// Looking for cameras // Looking for cameras
for (i in intersects) { for (i in intersects) {
if (typeof minDistance === 'undefined' || intersects[i].distance < minDistance) { if (minDistance === undefined || intersects[i].distance < minDistance) {
// We will not consider a line as clickable // We will not consider a line as clickable
if (! (intersects[i].object instanceof THREE.Line)) { if (! (intersects[i].object instanceof THREE.Line)) {
minDistance = intersects[i].distance; minDistance = intersects[i].distance;
@ -205,7 +205,7 @@ function click(event) {
} }
} }
} }
if (typeof bestIndex !== 'undefined') { if (bestIndex !== undefined) {
cameras.setById(intersects[bestIndex].object.id); cameras.setById(intersects[bestIndex].object.id);
} }