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

Different scenes are now managed correctly

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-06-05 10:35:20 +02:00
parent d0e3d4bc3e
commit baccd01111
7 changed files with 96 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/prototype/initScene.js vendored
View File

@@ -106,6 +106,10 @@ function initPeach(camera, scene, static_path, coins) {
scene.add(camera);
Coin.init(0.001);
var otherCams = [];
var cameras = new CameraContainer(camera, otherCams);
return cameras;
}
function initZeldaScene(scene, collidableObjects, loader, static_path) {

4
js/prototype/main.js vendored
View File

@@ -78,7 +78,9 @@ function init() {
// Initialize pointer camera
var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.1, 100000, renderer, container);
cameras = initBobomb(camera1, scene, static_path, coins);
cameras = initMainScene(camera1, scene, static_path, coins);
// cameras = initPeach(camera1, scene, static_path, coins);
// cameras = initBobomb(camera1, scene, static_path, coins);
// cameras = initWhomp(camera1, scene, static_path, coins);
// cameras = initMountain(camera1, scene, static_path, coins);
// cameras = initSponza(camera1, scene, static_path, coins);

2
js/prototype/replay.js vendored
View File

@@ -67,7 +67,7 @@ function init() {
// Initialize pointer camera
var camera1 = new ReplayCamera(50, container_size.width() / container_size.height(), 0.01, 100000, coins);
cameras = initBobomb(camera1, scene, static_path, coins);
cameras = initMainScene(camera1, scene, static_path, coins);
camera1.cameras = cameras;
// Add listeners