From d904a4a472217162f9f7087a16473eb418ce8468 Mon Sep 17 00:00:00 2001
From: Thomas FORGIONE <thomas.forgione@gmail.com>
Date: Mon, 11 Jan 2016 16:45:05 +0100
Subject: [PATCH] Corrected makefile (for server to start) and re-enabled
 collisions

---
 js/Makefile                               | 1 +
 js/l3d/apps/prototype/interactive/main.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/js/Makefile b/js/Makefile
index cf00dd8..ca63ce5 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -35,6 +35,7 @@ L3D:
 		--js l3d/src/cameras/FixedCamera.js \
 		--js l3d/src/cameras/PointerCamera.js \
 		--js l3d/src/scenes/createCoins.js \
+		--js l3d/src/scenes/initScene.js \
 		--js_output_file ../static/js/l3d.min.js
 
 TestList:
diff --git a/js/l3d/apps/prototype/interactive/main.js b/js/l3d/apps/prototype/interactive/main.js
index ee956e4..2edbe26 100644
--- a/js/l3d/apps/prototype/interactive/main.js
+++ b/js/l3d/apps/prototype/interactive/main.js
@@ -164,6 +164,7 @@ function initThreeElements() {
     scene.addCoins(GLOB.coinConfig);
 
     camera1.collidableObjects = scene.collidableObjects;
+    camera1.collisions = true;
 
     // Get default param for camera lock
     document.getElementById('lock').checked = GLOB.locked;