Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:56:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

end of day commit

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/developer/utilities/render/photobooth/html/photobooth.html
View file

@ -98,6 +98,10 @@
$(document).ready(function() { $(document).ready(function() {
// Send a ready event to hifi // Send a ready event to hifi
emit("ready", null); emit("ready", null);
$("#property-camera").on('change', function() {
console.log("ok");
emit("onSelectCamera", {value: this.val()});
});
// Send an event to hifi to trigger snapshot // Send an event to hifi to trigger snapshot
$("#picture-button").click(function() { $("#picture-button").click(function() {
emit("onClickPictureButton", null); emit("onClickPictureButton", null);

14
scripts/developer/utilities/render/photobooth/photoboothApp.js
View file

@ -53,9 +53,21 @@
// // Reticle.visible = true; // // Reticle.visible = true;
// }, SNAPSHOT_DELAY); // }, SNAPSHOT_DELAY);
} else if (event.type === "onClickReloadModelButton"){ } else if (event.type === "onClickReloadModelButton") {
print("clicked reload model button " + event.data.value); print("clicked reload model button " + event.data.value);
PhotoBooth.changeModel(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);
}
} }
} }
} }