Cleaning and remove useless files

controllers/prototype/index.js

@@ -171,5 +171,5 @@ module.exports.userstudy = function(req, res) {
 };
 
 module.exports.next = function(req, res) {
-    res.redirect('/prototype/game')
+    res.redirect('/prototype/game');
 };

controllers/prototype/views/prototype_arrows.jade

@@ -1,26 +0,0 @@
-extends ./prototype_interactive
-
-block title
-    title #{title} - Prototype - Arrows
-
-block configjs
-    script Recommendation = L3D.ArrowRecommendation;
-    script.
-        Coin.onLastCoin = function() {
-            $('#next').show();
-            $('#next').click(function() {
-                window.location = '/prototype/arrows';
-                $('#next').click(function() {});
-            });
-        };
-
-block lastbutton
-    button#next.btn.btn-success.navbar-btn(style={'margin-right':'10px', 'margin-bottom':'10px', 'display':'none'})
-        span Go to the next step
-
-//-block preciseDescription
-    p
-        | Recommended views are displayed with a
-        | transparent blue arrow.  They disappear when you
-        | come closer to them, and shows the motion between
-        | your current position and the recommendation.

controllers/prototype/views/prototype_empty.jade

@@ -1,25 +0,0 @@
-extends ./prototype_interactive
-
-block title
-    title #{title} - Prototype - Arrows
-
-block configjs
-    script Recommendation = L3D.EmptyRecommendation;
-    script.
-        Coin.onLastCoin = function() {
-            $('#next').show();
-            $('#next').click(function() {
-                window.location = '/prototype/arrows';
-            });
-        };
-
-block lastbutton
-    button#next.btn.btn-success.navbar-btn(style={'margin-right':'10px', 'margin-bottom':'10px', 'display':'none'})
-        span Go to the next step
-
-//-block preciseDescription
-    p
-        | Recommended views are displayed with a
-        | transparent blue arrow.  They disappear when you
-        | come closer to them, and shows the motion between
-        | your current position and the recommendation.

controllers/prototype/views/prototype_recommendation.jade

@@ -5,14 +5,6 @@ block title
 
 block configjs
     script Recommendation = #{recommendationStyle}; coinsId = [#{coins}];
-    script.
-        Coin.onLastCoin = function() {
-            $('#next').show();
-            $('#next').click(function() {
-                window.location = '/prototype/game';
-                $('#next').prop('disabled', true);
-            });
-        };
 
 block lastbutton
     button#next.btn.btn-success.navbar-btn(style={'margin-right':'10px', 'margin-bottom':'10px', 'display':'none'})

controllers/prototype/views/prototype_viewports.jade

@@ -1,28 +0,0 @@
-extends ./prototype_interactive
-
-block title
-    title #{title} - Prototype - Viewports
-
-block configjs
-    script Recommendation = L3D.ViewportRecommendation;
-    script.
-        Coin.onLastCoin = function() {
-            $('#next').show();
-            $('#next').click(function() {
-                window.location = '/prototype/arrows';
-                $('#next').click(function() {});
-            });
-        };
-
-block lastbutton
-    button#next.btn.btn-success.navbar-btn(style={'margin-right':'10px', 'margin-bottom':'10px', 'display':'none'})
-        span Go to the next step
-
-//-block preciseDescription
-    p
-        | Recommended views are displayed with a
-        | transparent red rectangle and some lines.
-        | Basically, it represents the position of a camera
-        | (the point at the extramities of the lines
-        | represents the optical center, and the red
-        | rectangle represents the image plane).

js/l3d/apps/prototype/GlobalFunctions.js

@@ -169,3 +169,11 @@ function appendTo(container) {
     };
 
 }
+
+function setNextButton(target) {
+    $('#next').show();
+    $('#next').click(function() {
+        window.location = target;
+        $('#next').prop('disabled', true);
+    });
+}

js/l3d/apps/prototype/interactive/main.js

@@ -19,7 +19,7 @@ var startCanvas;
 
 window.onbeforeunload = function() {
 
-    if (initMainScene !== L3D.initPeach && initMainScene !== L3D.initSponza && Coin.total !== 8) {
+    if (initMainScene !== L3D.initPeach && initMainScene !== L3D.initSponza && !($('#next').is(":visible"))) {
 
         return 'Warning : you are going to leave the page and abort the current test !';
 
@@ -27,25 +27,15 @@ window.onbeforeunload = function() {
 
 };
 
+var nextPage = '/prototype/game';
+
 Coin.onCoinGot = function(coin) {
     if (coin === 6) {
-        setTimeout(function() {
+        setTimeout(function() { setNextButton(nextPage); }, 60*1000);
-            $('#next').show();
-            $('#next').click(function() {
-                window.location = '/prototype/next';
-                $('#next').prop('disabled', true);
-            });
-        }, 60*1000);
     }
 };
 
-Coin.onLastCoin = function() {
+Coin.onLastCoin = function() { setNextButton(nextPage); };
-    $('#next').show();
-    $('#next').click(function() {
-        window.location = '/prototype/next';
-    });
-
-}
 
 function main() {
 

js/l3d/apps/prototype/tutorial/TutorialSteps.js

@@ -210,13 +210,6 @@ TutorialSteps.prototype.nextStep = function() {
                 });
                 break;
             case 17:
-                setTimeout(function() {
-                $('#next').show();
-                $('#next').click(function() {
-                    window.location = '/before-begin';
-                });
-            }, 3*60*1000);
-
                 var cams = L3D.createPeachRecommendations(this.containerSize.width(), this.containerSize.height());
                 for (var i = 2; i < cams.length; i++) {
                     this.addRecommendation(cams[i]);

js/l3d/apps/prototype/tutorial/main.js

@@ -18,18 +18,16 @@ var pointer;
 var startCanvas;
 var tutorial;
 
+var nextPage = '/before-begin';
+
 Coin.onCoinGot = function(val) {
     if (val === 6) {
-        setTimeout(function() {
+        setTimeout(function() {setNextButton(nextPage); }, 60*1000);
-            $('#next').show();
-            $('#next').click(function() {
-                window.location = '/prototype/game';
-                $('#next').unbind('click');
-            });
-        }, 60*1000);
     }
 };
 
+Coin.onLastCoin = function() { setNextButton(nextPage); };
+
 function main() {
 
     // Main container that holds everything