diff --git a/geo/Mesh.js b/geo/Mesh.js index c0deeaa..b5bdd72 100644 --- a/geo/Mesh.js +++ b/geo/Mesh.js @@ -1,6 +1,6 @@ var fs = require('fs'); -var geo = geo || {}; +var geo = {}; geo.MeshStreamer = function(path, callback) { this.vertices = []; diff --git a/js/PointerCamera.js b/js/PointerCamera.js index b0184aa..c7e4ef7 100644 --- a/js/PointerCamera.js +++ b/js/PointerCamera.js @@ -241,15 +241,15 @@ PointerCamera.prototype.moveHermite = function(otherCamera, toSave) { } PointerCamera.prototype.isColliding = function(direction) { - this.raycaster.set(this.position, direction.clone().normalize()); - var intersects = this.raycaster.intersectObjects(this.collidableObjects, true); + // this.raycaster.set(this.position, direction.clone().normalize()); + // var intersects = this.raycaster.intersectObjects(this.collidableObjects, true); - for (var i in intersects) { - if (intersects[i].distance < Tools.norm(direction) + this.speed * 300 && - intersects[i].object.raycastable) { - return true; - } - } + /// for (var i in intersects) { + /// if (intersects[i].distance < Tools.norm(direction) + this.speed * 300 && + /// intersects[i].object.raycastable) { + /// return true; + /// } + /// } return false; } diff --git a/js/prototype/main.js b/js/prototype/main.js index 7656747..a4e45e0 100644 --- a/js/prototype/main.js +++ b/js/prototype/main.js @@ -116,22 +116,22 @@ function initListeners() { } function render() { - cameraSelecter.update(); + // cameraSelecter.update(); - // Update recommendations (set raycastable if shown) - var transform = buttonManager.showArrows ? show : hide; - cameras.map(function(camera) { - if (camera instanceof RecommendedCamera) { - transform(camera); + // // Update recommendations (set raycastable if shown) + // var transform = buttonManager.showArrows ? show : hide; + // cameras.map(function(camera) { + // if (camera instanceof RecommendedCamera) { + // transform(camera); - camera.traverse(function(elt) { - elt.raycastable = buttonManager.showArrows; - }); - } - }); + // camera.traverse(function(elt) { + // elt.raycastable = buttonManager.showArrows; + // }); + // } + // }); // Update coins - coins.forEach(function(coin) { coin.update(); }); + // coins.forEach(function(coin) { coin.update(); }); // Update main camera var currentTime = Date.now() - previousTime; @@ -139,29 +139,29 @@ function render() { previousTime = Date.now(); // Update the recommendations - cameras.update(cameras.mainCamera()); + // cameras.update(cameras.mainCamera()); // Set current position of camera - cameras.look(); + // cameras.look(); - var left = 0, bottom = 0, width = container_size.width(), height = container_size.height(); - renderer.setScissor(left, bottom, width, height); - renderer.enableScissorTest(true); - renderer.setViewport(left, bottom, width, height); + // var left = 0, bottom = 0, width = container_size.width(), height = container_size.height(); + // renderer.setScissor(left, bottom, width, height); + // renderer.enableScissorTest(true); + // renderer.setViewport(left, bottom, width, height); renderer.render(scene, cameras.mainCamera()); // Remove borders of preview - previewer.clear(); + // previewer.clear(); // Hide arrows in recommendation - cameras.map(function(camera) { if (camera instanceof RecommendedCamera) hide(camera); }); + // cameras.map(function(camera) { if (camera instanceof RecommendedCamera) hide(camera); }); // Update transparent elements // THREEx.Transparency.update(cameras.mainCamera()); // Render preview - previewer.render(cameraSelecter.prev, container_size.width(), container_size.height()); + // previewer.render(cameraSelecter.prev, container_size.width(), container_size.height()); } function animate() {