diff --git a/scripts/developer/utilities/render/photobooth/html/photobooth.html b/scripts/developer/utilities/render/photobooth/html/photobooth.html index 497f5acfe1..f9c79174f3 100644 --- a/scripts/developer/utilities/render/photobooth/html/photobooth.html +++ b/scripts/developer/utilities/render/photobooth/html/photobooth.html @@ -81,7 +81,7 @@ type="text" data-provide="slider" data-slider-ticks="[-180, 0, 180]" - data-slider-ticks-labels='["anti-clockwise","centre", "clockwise"]' + data-slider-ticks-labels='["clockwise", "centre", "anti-clockwise"]' data-slider-min="-180" data-slider-max="180" data-slider-step="1" @@ -142,6 +142,10 @@ $("#reload-model-button").click(function() { emit("onClickReloadModelButton", {value: $("#model-url").val()}); }); + $("#rotate-slider").slider().on("slide", function(e){ + console.log("slided " + e.value); + emit("onRotateSlider", {value: e.value}); + }); }); diff --git a/scripts/developer/utilities/render/photobooth/photoboothApp.js b/scripts/developer/utilities/render/photobooth/photoboothApp.js index f6a968a97b..09c141b277 100644 --- a/scripts/developer/utilities/render/photobooth/photoboothApp.js +++ b/scripts/developer/utilities/render/photobooth/photoboothApp.js @@ -29,10 +29,12 @@ PhotoBooth.init(); photoboothCreated = true; } + } button.clicked.connect(onClicked); tablet.webEventReceived.connect(onWebEventReceived); + function onWebEventReceived(event) { print("photobooth.js received a web event:" + event); // Converts the event to a JavasScript Object @@ -76,6 +78,10 @@ var cameraID = PhotoBooth.cameraEntities[event.data.value]; Camera.setCameraEntity(cameraID); } + } else if (event.type === "onRotateSlider") { + var props = {}; + props.rotation = Quat.fromPitchYawRollDegrees(0, event.data.value, 0); + Entities.editEntity(PhotoBooth.modelEntityID, props); } } }