From 1e5090ad27f762663e93a2011441944a2c6a46e8 Mon Sep 17 00:00:00 2001
From: Faye Li <si.fi.faye.li@gmial.com>
Date: Wed, 15 Feb 2017 16:47:06 -0800
Subject: [PATCH] end of day commit

---
 .../render/photobooth/html/photobooth.html         |  4 ++++
 .../utilities/render/photobooth/photoboothApp.js   | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/scripts/developer/utilities/render/photobooth/html/photobooth.html b/scripts/developer/utilities/render/photobooth/html/photobooth.html
index 6165896bf0..b23b65cfdd 100644
--- a/scripts/developer/utilities/render/photobooth/html/photobooth.html
+++ b/scripts/developer/utilities/render/photobooth/html/photobooth.html
@@ -98,6 +98,10 @@
       $(document).ready(function() {
         // Send a ready event to hifi
         emit("ready", null);
+        $("#property-camera").on('change', function() {
+          console.log("ok");
+          emit("onSelectCamera", {value: this.val()});
+        });
         // Send an event to hifi to trigger snapshot
         $("#picture-button").click(function() {
           emit("onClickPictureButton", null);
diff --git a/scripts/developer/utilities/render/photobooth/photoboothApp.js b/scripts/developer/utilities/render/photobooth/photoboothApp.js
index c32744fe63..0b58e51224 100644
--- a/scripts/developer/utilities/render/photobooth/photoboothApp.js
+++ b/scripts/developer/utilities/render/photobooth/photoboothApp.js
@@ -53,9 +53,21 @@
                 //     // Reticle.visible = true;
                 // }, SNAPSHOT_DELAY);
 
-            } else if (event.type === "onClickReloadModelButton"){
+            } else if (event.type === "onClickReloadModelButton") {
                 print("clicked reload model button " + event.data.value);
                 PhotoBooth.changeModel(event.data.value);
+            } else if (event.type === "onSelectCamera") {
+                print("selected camera " + event.data.value);
+                if (!event.data.hasOwnProperty("value")){
+                    return;
+                }
+                if (event.data.value === "First Person Camera") {
+                    Camera.mode = "first person";
+                } else {
+                    Camera.mode = "entity";
+                    var cameraID = PhotoBooth.cameraEntities[event.data.value];
+                    Camera.setCameraEntity(cameraID);
+                }
             }
         }
     }