From b18ac88177e36493d2491a99fd40ec3d43138b28 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Tue, 2 Jun 2015 15:40:52 +0200 Subject: [PATCH] container_size is now global --- js/prototype/initScene.js | 6 +++--- js/prototype/main.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/js/prototype/initScene.js b/js/prototype/initScene.js index f959d79..b3dddca 100644 --- a/js/prototype/initScene.js +++ b/js/prototype/initScene.js @@ -400,7 +400,7 @@ function createBobombCameras(width, height) { } -function initBobomb(camera, scene, static_path, container_size) { +function initBobomb(camera, scene, static_path) { addLight(scene); var loader = new THREE.OBJMTLLoader(); @@ -477,7 +477,7 @@ function resetWhompElements() { }; } -function initWhomp(camera, scene, static_path, container_size) { +function initWhomp(camera, scene, static_path) { addLight(scene); var loader = new THREE.OBJMTLLoader(); @@ -559,7 +559,7 @@ function resetMountainElements() { } } -function initMountain(camera, scene, static_path, container_size) { +function initMountain(camera, scene, static_path) { addLight(scene); var loader = new THREE.OBJMTLLoader(); diff --git a/js/prototype/main.js b/js/prototype/main.js index c9c02f7..5afa346 100644 --- a/js/prototype/main.js +++ b/js/prototype/main.js @@ -78,9 +78,9 @@ function init() { // Initialize pointer camera var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, container); - cameras = initBobomb(camera1, scene, static_path, container_size); - // cameras = initWhomp(camera1, scene, static_path, container_size); - // cameras = initMountain(camera1, scene, static_path, container_size); + cameras = initBobomb(camera1, scene, static_path); + // cameras = initWhomp(camera1, scene, static_path); + // cameras = initMountain(camera1, scene, static_path); // Add listeners initListeners();