This commit is contained in:
Thomas FORGIONE 2015-07-09 17:48:46 +02:00
parent 007da125ae
commit 18e7285a7f
6 changed files with 9 additions and 9 deletions

View File

@ -296,7 +296,7 @@ Info.prototype.loadPointerLocked = function() {
self.tryMerge(); self.tryMerge();
} }
); );
} };
Info.prototype.loadSwitchedLockOption = function() { Info.prototype.loadSwitchedLockOption = function() {
var self = this; var self = this;
@ -322,7 +322,7 @@ Info.prototype.loadSwitchedLockOption = function() {
self.tryMerge(); self.tryMerge();
} }
); );
} };
var UserCreator = function(finishAction) { var UserCreator = function(finishAction) {
this.finishAction = finishAction; this.finishAction = finishAction;

View File

@ -23,7 +23,7 @@ Coin.setSize = function(width,height) {
this.domElement.width = width; this.domElement.width = width;
this.domElement.height = height; this.domElement.height = height;
this.update(); this.update();
} };
Coin.image = new Image(); Coin.image = new Image();
Coin.image.src = '/static/img/redcoin.png'; Coin.image.src = '/static/img/redcoin.png';

View File

@ -108,13 +108,13 @@ TutorialSteps.prototype.addCoin = function(coin) {
this.coins.push(coin); this.coins.push(coin);
coin.addToScene(this.scene); coin.addToScene(this.scene);
this.clickableObjects.push(coin); this.clickableObjects.push(coin);
} };
TutorialSteps.prototype.addRecommendation = function(reco) { TutorialSteps.prototype.addRecommendation = function(reco) {
this.cameras.push(reco); this.cameras.push(reco);
reco.addToScene(this.scene); reco.addToScene(this.scene);
this.clickableObjects.push(reco); this.clickableObjects.push(reco);
} };
TutorialSteps.prototype.nextStep = function() { TutorialSteps.prototype.nextStep = function() {
if (this.step < this.instructions.length) { if (this.step < this.instructions.length) {

View File

@ -79,7 +79,7 @@ L3D.BaseRecommendation.prototype.raycast = function(raycaster, intersects) {
} }
} };
/** /**
* Changes the color of the meshes like a HTML link * Changes the color of the meshes like a HTML link

View File

@ -134,4 +134,4 @@ L3D.BD.Event.SwitchedLockOption.prototype.send = function() {
}; };
L3D.BD.Private.sendData(url, data); L3D.BD.Private.sendData(url, data);
} };

View File

@ -117,7 +117,7 @@ ObjectClicker.prototype.getPointedObject = function() {
var intersects = this.raycaster.intersectObjects(this.objects, false); var intersects = this.raycaster.intersectObjects(this.objects, false);
// Avoid non-raycastable objects // Avoid non-raycastable objects
for (var i = 0; i < intersects.length && !intersects[i].object.raycastable; i++){}; for (var i = 0; i < intersects.length && !intersects[i].object.raycastable; i++){}
// Objects are sorted by distance in intersects, the best is the first // Objects are sorted by distance in intersects, the best is the first
return intersects[i] !== undefined ? intersects[i].object : undefined; return intersects[i] !== undefined ? intersects[i].object : undefined;
@ -162,7 +162,7 @@ ObjectClicker.prototype.click = function() {
this.onClick(this.currentPointedObject, this.mouse.x, this.mouse.y); this.onClick(this.currentPointedObject, this.mouse.x, this.mouse.y);
} };
return ObjectClicker; return ObjectClicker;