From 85c896d0164640a5331877b6722fa8d589efa3d2 Mon Sep 17 00:00:00 2001
From: Thomas FORGIONE <thomas.forgione@gmail.com>
Date: Thu, 23 Apr 2015 10:37:36 +0200
Subject: [PATCH] Improved recommendation rendering

---
 js/PointerCamera.js  |  4 ++--
 prototype/index.html |  2 +-
 prototype/js/main.js | 29 +++++++++++++++++++++++++++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/js/PointerCamera.js b/js/PointerCamera.js
index 50268d8..a63b9b1 100644
--- a/js/PointerCamera.js
+++ b/js/PointerCamera.js
@@ -48,8 +48,8 @@ var PointerCamera = function() {
 
     document.addEventListener('keydown', onKeyDown, false);
     document.addEventListener('keyup', onKeyUp, false);
-    listenerTarget.addEventListener('mousedown', onMouseDown, false);
-    listenerTarget.addEventListener('mousemove', onMouseMove, false);
+    listenerTarget.addEventListener('mousedown', function(event) { if (event.which == 1) onMouseDown();}, false);
+    listenerTarget.addEventListener('mousemove', function(event) { if (event.which == 1) onMouseMove();}, false);
     listenerTarget.addEventListener('mouseup', onMouseUp, false);
     listenerTarget.addEventListener('mouseout', onMouseUp, false);
 
diff --git a/prototype/index.html b/prototype/index.html
index c1ea646..cb38b69 100644
--- a/prototype/index.html
+++ b/prototype/index.html
@@ -22,6 +22,6 @@
             <label for="collisions">Collisions</label>
             <input type="checkbox" id="showarrows" style="margin-bottom:10px" checked>
             <label for="showarrows">Show arrows</label>
-            <div style="border-width:1px; border-style: solid;" id="container"></div>
+            <div id="container"></div>
 #
         </section>
diff --git a/prototype/js/main.js b/prototype/js/main.js
index 2de1e7c..8319c31 100644
--- a/prototype/js/main.js
+++ b/prototype/js/main.js
@@ -7,6 +7,7 @@ var cameras = new CameraContainer();
 var spheres = new Array(mesh_number);
 var visible = 0;
 var stats;
+var ctx2d;
 
 var loader;
 
@@ -50,7 +51,15 @@ function init() {
     renderer.setSize(container_size.width, container_size.height);
     renderer.shadowMapEnabled = true;
     renderer.setClearColor(0x87ceeb);
-    renderer.sortObjects = false
+    renderer.sortObjects = false;
+
+    var canvas = document.createElement('canvas');
+    canvas.style.position ="absolute";
+    canvas.style.cssFloat = 'top-left';
+    canvas.width = container_size.width;
+    canvas.height = container_size.height;
+    ctx2d = canvas.getContext('2d');
+    ctx2d.lineWidth = 2;
 
     // on initialise la scène
     scene = new THREE.Scene();
@@ -63,6 +72,7 @@ function init() {
     stats.domElement.style.position = 'absolute';
     stats.domElement.style.cssFloat = "top-left";
     container.appendChild( stats.domElement );
+    container.appendChild(canvas);
     container.appendChild(renderer.domElement);
 
     // init light
@@ -193,7 +203,7 @@ function init() {
 
     window.addEventListener('resize', onWindowResize, false);
 
-    container.addEventListener('mousedown', click, false);
+    container.addEventListener('mousedown', function(event) { if (event.which == 1) click(event); }, false);
     container.addEventListener('mousemove', mouseMove, false);
 
     camera1.collidableObjects = collidableObjects;
@@ -245,6 +255,9 @@ function render() {
     renderer.setViewport(left, bottom, width, height);
     renderer.render(scene, cameras.mainCamera());
 
+    // Clear canvas
+    ctx2d.clearRect(0,0,container_size.width, container_size.height);
+
     if (prev.go) {
         // Hide arrows
         cameras.map(function(camera) { if (camera instanceof FixedCamera) hide(camera); });
@@ -254,6 +267,18 @@ function render() {
         left = prev.x - width/2;
         bottom =  prev.y + height/5;
 
+
+        // Draw border
+        var can_bottom = container.offsetHeight - bottom - height - 1;
+        ctx2d.beginPath();
+        ctx2d.moveTo(left-1, can_bottom);
+        ctx2d.lineTo(left-1, can_bottom + height);
+        ctx2d.lineTo(left + width-1, can_bottom + height);
+        ctx2d.lineTo(left + width-1, can_bottom);
+        ctx2d.closePath();
+        ctx2d.stroke();
+
+        // Do render in previsualization
         prev.camera.look();
         renderer.setScissor(left, bottom, width, height);
         renderer.enableScissorTest (true);