end of day commit

This commit is contained in:
Faye Li 2017-02-15 16:47:06 -08:00
parent 19bff20ebf
commit 1e5090ad27
2 changed files with 17 additions and 1 deletions

View file

@ -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);

View file

@ -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);
}
}
}
}