From 650481bd54c96d0ba7161d20ad367d2ebb5738c7 Mon Sep 17 00:00:00 2001
From: Thomas FORGIONE <thomas.forgione@gmail.com>
Date: Wed, 27 May 2015 10:44:31 +0200
Subject: [PATCH] Correct bug

---
 controllers/prototype/views/prototype.jade | 1 +
 js/Makefile                                | 9 ++++++++-
 js/prototype/initScene.js                  | 4 ++--
 js/prototype/main.js                       | 2 +-
 js/prototype/tutorial.js                   | 6 +++---
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/controllers/prototype/views/prototype.jade b/controllers/prototype/views/prototype.jade
index 6a53f9f..5f4af15 100644
--- a/controllers/prototype/views/prototype.jade
+++ b/controllers/prototype/views/prototype.jade
@@ -15,6 +15,7 @@ block extrahead
 block content
     #main-div.panel-group(style={'margin-top':'10px', 'margin-bottom':'10px'})
         block description
+        #alert-placeholder
 
         button#full.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom': '10px'}) Fullscreen
         button#reset.btn.btn-primary(style={'margin-right': '10px', 'margin-bottom':'10px'}) Reset camera
diff --git a/js/Makefile b/js/Makefile
index e71f582..c26d48b 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,5 +1,10 @@
 OPT=--compilation_level SIMPLE_OPTIMIZATIONS
-CLOSURE=java -jar /usr/share/java/closure-compiler/closure-compiler.jar
+
+ifeq ($(TYPE),RELEASE)
+	CLOSURE=java -jar /usr/share/java/closure-compiler/closure-compiler.jar
+else
+	CLOSURE=./compiler.sh
+endif
 
 all: Three Stats ThreeTools Bouncing Multisphere StreamingSimulator PrototypeTools PrototypeReplay PrototypeInteractive Tutorial
 
@@ -76,6 +81,8 @@ PrototypeReplay:
 
 Tutorial:
 	$(CLOSURE) $(OPT) \
+		--js TutoCamera.js \
+		--js prototype/TutorialSteps.js \
 		--js prototype/tutorial.js \
 		--js_output_file ../static/js/tutorial.min.js
 
diff --git a/js/prototype/initScene.js b/js/prototype/initScene.js
index c463ba6..25c6bf1 100644
--- a/js/prototype/initScene.js
+++ b/js/prototype/initScene.js
@@ -262,8 +262,8 @@ function initBobombScene(scene, collidableObjects, loader, static_path) {
 
 function resetBobombElements() {
     return {
-        position: new THREE.Vector3(-8.849933489419644, 9.050627639459208, 0.6192960680432451),
-        target: new THREE.Vector3(17.945323228767702, -15.156828589982375, -16.585740412769756)
+        position: new THREE.Vector3(38.115627509754646,10.829803024792419,-19.862035691341315),
+        target: new THREE.Vector3(-1.4518898576752122,5.048214777643772,-18.869661407832535)
     };
 }
 
diff --git a/js/prototype/main.js b/js/prototype/main.js
index 64fa38b..50e3a97 100644
--- a/js/prototype/main.js
+++ b/js/prototype/main.js
@@ -90,7 +90,7 @@ function init() {
     // Initialize pointer camera
     var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
     camera1.speed = 0.005;
-    camera1.resetBobomb();
+    camera1.reset();
     camera1.save();
     scene.add(camera1);
 
diff --git a/js/prototype/tutorial.js b/js/prototype/tutorial.js
index abdfc9a..d3e1a2e 100644
--- a/js/prototype/tutorial.js
+++ b/js/prototype/tutorial.js
@@ -11,12 +11,12 @@ var spheres = new Array(mesh_number);
 var visible = 0;
 var stats;
 var previewer;
-
 var loader;
 var coins;
 var beenFullscreen = false;
 var isFullscreen = false;
 var previousTime;
+var tutorial;
 
 var main_section = document.getElementById('main-section');
 var offset = function() {
@@ -91,7 +91,8 @@ function init() {
     scene.add(ambient_light);
 
     // Initialize pointer camera
-    var camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
+    var camera1 = new TutoCamera(50, container_size.width() / container_size.height(), 0.01, 100000, container);
+    tutorial = camera1.tutorial;
     camera1.speed = 0.001;
     camera1.resetElements = resetPeachElements();
     camera1.reset();
@@ -231,7 +232,6 @@ function render() {
     // Update the recommendations
     cameras.update(cameras.mainCamera());
 
-
     // Set current position of camera
     cameras.look();