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

container_size is now global

Browse Source
This commit is contained in:
Thomas FORGIONE 2015-06-02 15:40:52 +02:00
parent 4fd7716172
commit b18ac88177
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/prototype/initScene.js vendored
View File

@ -400,7 +400,7 @@ function createBobombCameras(width, height) {
} }
function initBobomb(camera, scene, static_path, container_size) { function initBobomb(camera, scene, static_path) {
addLight(scene); addLight(scene);
var loader = new THREE.OBJMTLLoader(); 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); addLight(scene);
var loader = new THREE.OBJMTLLoader(); 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); addLight(scene);
var loader = new THREE.OBJMTLLoader(); var loader = new THREE.OBJMTLLoader();

6
js/prototype/main.js vendored
View File

@ -78,9 +78,9 @@ function init() {
// Initialize pointer camera // Initialize pointer camera
var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, container); 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 = initBobomb(camera1, scene, static_path);
// cameras = initWhomp(camera1, scene, static_path, container_size); // cameras = initWhomp(camera1, scene, static_path);
// cameras = initMountain(camera1, scene, static_path, container_size); // cameras = initMountain(camera1, scene, static_path);
// Add listeners // Add listeners
initListeners(); initListeners();