diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 23df0a47f5..a39a152ad8 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -367,9 +367,9 @@ public slots:
void takeSecondaryCameraSnapshot(const QString& filename = QString());
/**jsdoc
- * Takes a 360 snapshot of the current view from the secondary camera that can be set up through the {@link Render} API.
- * NOTE: to provide a non-default value - all previous parameters must be provided.
+ * Takes a 360 snapshot given a position of the secondary camera (which does not need to have been previously set up).
* @function Window.takeSecondaryCameraSnapshot
+ * @param {vec3} [cameraPosition] - The (x, y, z) position of the camera for the 360 snapshot
* @param {string} [filename=""] - If this parameter is not given, the image will be saved as 'hifi-snap-by-<user name>-YYYY-MM-DD_HH-MM-SS'.
* If this parameter is <code>""</code> then the image will be saved as ".jpg".
* Otherwise, the image will be saved to this filename, with an appended ".jpg".
@@ -587,10 +587,10 @@ signals:
void stillSnapshotTaken(const QString& pathStillSnapshot, bool notify);
/**jsdoc
- * Triggered when a still equirectangular snapshot has been taken by calling {@link Window.take360Snapshot|take360Snapshot}
+ * Triggered when a still equirectangular snapshot has been taken by calling {@link Window.takeSecondaryCamera360Snapshot|takeSecondaryCamera360Snapshot}
* @function Window.equirectangularSnapshotTaken
* @param {string} pathStillSnapshot - The path and name of the snapshot image file.
- * @param {boolean} notify - The value of the <code>notify</code> parameter that {@link Window.take360Snapshot|take360Snapshot}
+ * @param {boolean} notify - The value of the <code>notify</code> parameter that {@link Window.takeSecondaryCamera360Snapshot|takeSecondaryCamera360Snapshot}
* was called with.
* @returns {Signal}
*/
diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp
index 5302a4063a..588f479d8e 100644
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@@ -51,6 +51,14 @@ const QString URL = "highfidelity_url";
Setting::Handle<QString> Snapshot::snapshotsLocation("snapshotsLocation");
+QTimer Snapshot::snapshotTimer;
+Snapshot::Snapshot() {
+ Snapshot::snapshotTimer.setSingleShot(false);
+ Snapshot::snapshotTimer.setTimerType(Qt::PreciseTimer);
+ Snapshot::snapshotTimer.setInterval(250);
+ connect(&Snapshot::snapshotTimer, &QTimer::timeout, &Snapshot::takeNextSnapshot);
+}
+
SnapshotMetaData* Snapshot::parseSnapshotData(QString snapshotPath) {
if (!QFile(snapshotPath).exists()) {
@@ -93,15 +101,6 @@ QString Snapshot::saveSnapshot(QImage image, const QString& filename) {
return snapshotPath;
}
-QTimer Snapshot::snapshotTimer;
-
-qint16 Snapshot::snapshotIndex = 0;
-QVariant Snapshot::oldAttachedEntityId = 0;
-QVariant Snapshot::oldOrientation = 0;
-QVariant Snapshot::oldvFoV = 0;
-QVariant Snapshot::oldNearClipPlaneDistance = 0;
-QVariant Snapshot::oldFarClipPlaneDistance = 0;
-
QImage Snapshot::downImage;
QImage Snapshot::frontImage;
QImage Snapshot::leftImage;
@@ -109,15 +108,70 @@ QImage Snapshot::backImage;
QImage Snapshot::rightImage;
QImage Snapshot::upImage;
+void Snapshot::takeNextSnapshot() {
+ SecondaryCameraJobConfig* config = static_cast<SecondaryCameraJobConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("SecondaryCamera"));
+ if (snapshotIndex == 0) {
+ Snapshot::downImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
+ config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 0.0f, 0.0f))));
+ } else if (snapshotIndex == 1) {
+ Snapshot::frontImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
+ config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 90.0f, 0.0f))));
+ } else if (snapshotIndex == 2) {
+ Snapshot::leftImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
+ config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 180.0f, 0.0f))));
+ } else if (snapshotIndex == 3) {
+ Snapshot::backImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
+ config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 270.0f, 0.0f))));
+ } else if (snapshotIndex == 4) {
+ Snapshot::rightImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
+ config->setOrientation(glm::quat(glm::radians(glm::vec3(90.0f, 0.0f, 0.0f))));
+ } else if (snapshotIndex == 5) {
+ Snapshot::upImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
+ } else {
+ Snapshot::snapshotTimer.stop();
+
+ // Reset secondary camera render config
+ static_cast<ToneMappingConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("SecondaryCameraJob.ToneMapping"))->setCurve(1);
+ config->resetSizeSpectatorCamera(qApp->getWindow()->geometry().width(), qApp->getWindow()->geometry().height());
+ config->setProperty("attachedEntityId", oldAttachedEntityId);
+ config->setProperty("vFoV", oldvFoV);
+ config->setProperty("nearClipPlaneDistance", oldNearClipPlaneDistance);
+ config->setProperty("farClipPlaneDistance", oldFarClipPlaneDistance);
+
+ if (!Snapshot::oldEnabled) {
+ config->enableSecondaryCameraRenderConfigs(false);
+ }
+
+ // Process six QImages
+ QtConcurrent::run(Snapshot::convertToEquirectangular);
+ }
+
+ Snapshot::snapshotIndex++;
+}
+
+QString Snapshot::snapshotFilename;
+qint16 Snapshot::snapshotIndex = 0;
+bool Snapshot::oldEnabled = false;
+QVariant Snapshot::oldAttachedEntityId = 0;
+QVariant Snapshot::oldOrientation = 0;
+QVariant Snapshot::oldvFoV = 0;
+QVariant Snapshot::oldNearClipPlaneDistance = 0;
+QVariant Snapshot::oldFarClipPlaneDistance = 0;
void Snapshot::save360Snapshot(const glm::vec3& cameraPosition, const QString& filename) {
+ Snapshot::snapshotFilename = filename;
SecondaryCameraJobConfig* secondaryCameraRenderConfig = static_cast<SecondaryCameraJobConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("SecondaryCamera"));
// Save initial values of secondary camera render config
- oldAttachedEntityId = secondaryCameraRenderConfig->property("attachedEntityId");
- oldOrientation = secondaryCameraRenderConfig->property("orientation");
- oldvFoV = secondaryCameraRenderConfig->property("vFoV");
- oldNearClipPlaneDistance = secondaryCameraRenderConfig->property("nearClipPlaneDistance");
- oldFarClipPlaneDistance = secondaryCameraRenderConfig->property("farClipPlaneDistance");
+ Snapshot::oldEnabled = secondaryCameraRenderConfig->isEnabled();
+ Snapshot::oldAttachedEntityId = secondaryCameraRenderConfig->property("attachedEntityId");
+ Snapshot::oldOrientation = secondaryCameraRenderConfig->property("orientation");
+ Snapshot::oldvFoV = secondaryCameraRenderConfig->property("vFoV");
+ Snapshot::oldNearClipPlaneDistance = secondaryCameraRenderConfig->property("nearClipPlaneDistance");
+ Snapshot::oldFarClipPlaneDistance = secondaryCameraRenderConfig->property("farClipPlaneDistance");
+
+ if (!Snapshot::oldEnabled) {
+ secondaryCameraRenderConfig->enableSecondaryCameraRenderConfigs(true);
+ }
// Initialize some secondary camera render config options for 360 snapshot capture
static_cast<ToneMappingConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("SecondaryCameraJob.ToneMapping"))->setCurve(0);
@@ -131,48 +185,11 @@ void Snapshot::save360Snapshot(const glm::vec3& cameraPosition, const QString& f
secondaryCameraRenderConfig->setOrientation(glm::quat(glm::radians(glm::vec3(-90.0f, 0.0f, 0.0f))));
- snapshotIndex = 0;
+ Snapshot::snapshotIndex = 0;
- snapshotTimer.setSingleShot(false);
- snapshotTimer.setInterval(250);
- connect(&snapshotTimer, &QTimer::timeout, [] {
- SecondaryCameraJobConfig* config = static_cast<SecondaryCameraJobConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("SecondaryCamera"));
- if (snapshotIndex == 0) {
- downImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
- config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 0.0f, 0.0f))));
- } else if (snapshotIndex == 1) {
- frontImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
- config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 90.0f, 0.0f))));
- } else if (snapshotIndex == 2) {
- leftImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
- config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 180.0f, 0.0f))));
- } else if (snapshotIndex == 3) {
- backImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
- config->setOrientation(glm::quat(glm::radians(glm::vec3(0.0f, 270.0f, 0.0f))));
- } else if (snapshotIndex == 4) {
- rightImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
- config->setOrientation(glm::quat(glm::radians(glm::vec3(90.0f, 0.0f, 0.0f))));
- } else if (snapshotIndex == 5) {
- upImage = qApp->getActiveDisplayPlugin()->getSecondaryCameraScreenshot();
- } else {
- // Reset secondary camera render config
- static_cast<ToneMappingConfig*>(qApp->getRenderEngine()->getConfiguration()->getConfig("SecondaryCameraJob.ToneMapping"))->setCurve(1);
- config->resetSizeSpectatorCamera(qApp->getWindow()->geometry().width(), qApp->getWindow()->geometry().height());
- config->setProperty("attachedEntityId", oldAttachedEntityId);
- config->setProperty("vFoV", oldvFoV);
- config->setProperty("nearClipPlaneDistance", oldNearClipPlaneDistance);
- config->setProperty("farClipPlaneDistance", oldFarClipPlaneDistance);
-
- // Process six QImages
- QtConcurrent::run(convertToEquirectangular);
-
- snapshotTimer.stop();
- }
-
- snapshotIndex++;
- });
- snapshotTimer.start();
+ Snapshot::snapshotTimer.start(250);
}
+
void Snapshot::convertToEquirectangular() {
// I got help from StackOverflow while writing this code:
// https://stackoverflow.com/questions/34250742/converting-a-cubemap-into-equirectangular-panorama
@@ -254,7 +271,7 @@ void Snapshot::convertToEquirectangular() {
}
}
- emit DependencyManager::get<WindowScriptingInterface>()->equirectangularSnapshotTaken(saveSnapshot(outputImage, QString()), true);
+ emit DependencyManager::get<WindowScriptingInterface>()->equirectangularSnapshotTaken(saveSnapshot(outputImage, Snapshot::snapshotFilename), true);
}
QTemporaryFile* Snapshot::saveTempSnapshot(QImage image) {
diff --git a/interface/src/ui/Snapshot.h b/interface/src/ui/Snapshot.h
index 19e38605aa..93c06dbeb1 100644
--- a/interface/src/ui/Snapshot.h
+++ b/interface/src/ui/Snapshot.h
@@ -37,6 +37,8 @@ class Snapshot : public QObject, public Dependency {
Q_OBJECT
SINGLETON_DEPENDENCY
public:
+ Snapshot();
+
static QString saveSnapshot(QImage image, const QString& filename);
static void save360Snapshot(const glm::vec3& cameraPosition, const QString& filename);
static QTemporaryFile* saveTempSnapshot(QImage image);
@@ -51,11 +53,17 @@ signals:
public slots:
Q_INVOKABLE QString getSnapshotsLocation();
Q_INVOKABLE void setSnapshotsLocation(const QString& location);
+
+private slots:
+ static void takeNextSnapshot();
+
private:
static QFile* savedFileForSnapshot(QImage & image, bool isTemporary, const QString& userSelectedFilename = QString());
+ static QString snapshotFilename;
static QTimer snapshotTimer;
static qint16 snapshotIndex;
+ static bool oldEnabled;
static QVariant oldAttachedEntityId;
static QVariant oldOrientation;
static QVariant oldvFoV;
diff --git a/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml b/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
index 568c1faf3c..dbce93b93d 100644
--- a/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
+++ b/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
@@ -22,6 +22,7 @@ Rectangle {
HifiStylesUit.HifiConstants { id: hifi; }
id: root;
+ property bool processing360Snapshot: false;
// Style
color: hifi.colors.baseGray;
@@ -189,8 +190,8 @@ Rectangle {
z: 999;
id: processingSnapshot;
anchors.fill: parent;
- visible: !take360SnapshotButton.enabled && cameraToggleButton.camIsOn;
- color: Qt.rgba(0.0, 0.0, 0.0, 0.8);
+ visible: root.processing360Snapshot;
+ color: Qt.rgba(0.0, 0.0, 0.0, 0.85);
// This object is always used in a popup.
// This MouseArea is used to prevent a user from being
@@ -464,8 +465,7 @@ Rectangle {
width: parent.width/2 - 10;
height: 40;
onClicked: {
- take360SnapshotButton.enabled = false;
- take360SnapshotButton.text = "PROCESSING...";
+ root.processing360Snapshot = true;
sendToScript({method: 'takeSecondaryCamera360Snapshot'});
}
}
@@ -517,9 +517,8 @@ Rectangle {
takeSnapshotFromControllerCheckBox.visible = false;
}
break;
- case 'enable360SnapshotButton':
- take360SnapshotButton.text = "Take 360 Snapshot";
- take360SnapshotButton.enabled = cameraToggleButton.camIsOn;
+ case 'finishedProcessing360Snapshot':
+ root.processing360Snapshot = false;
break;
default:
console.log('Unrecognized message from spectatorCamera.js:', JSON.stringify(message));
diff --git a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
index e16d6a864f..8e8c0db6c4 100644
--- a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
+++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
@@ -408,8 +408,11 @@
}
}
function onEquirectangularSnapshotTaken() {
+ if (monitorShowsCameraView) {
+ setDisplay(true);
+ }
sendToQml({
- method: 'enable360SnapshotButton'
+ method: 'finishedProcessing360Snapshot'
});
}
function maybeTake360Snapshot() {
@@ -419,6 +422,9 @@
localOnly: true,
volume: 1.0
});
+ if (HMD.active && monitorShowsCameraView) {
+ setDisplay(false);
+ }
Window.takeSecondaryCamera360Snapshot(Entities.getEntityProperties(camera, ["positon"]).position);
}
}