Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 22:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134 from overte-org/feature/format_selection

Browse source 
Added screenshot format selection with PNG, JPEG and WEBP support
This commit is contained in:
ksuprynowicz 2022-09-17 19:21:48 +02:00 committed by GitHub
commit 4bd8633969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 161 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/scripting/WindowScriptingInterface.h
View file

@ -334,9 +334,9 @@ public slots:
* dimensions is adjusted in order to match the aspect ratio.
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-<user
* name>-on-YYYY-MM-DD_HH-MM-SS".
* <p>Still images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
* <code>".jpg"</code>. Animated images are saved in GIF format.</p>
* <p>Still images are saved in JPEG, PNG or WEBP format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, <code>".png"</code>, or <code>".webp"</code> &mdash; or if not provided then in the format chosen in general settings,
* Default is PNG. Animated images are saved in GIF format.</p>
*
* @example <caption>Using the snapshot function and signals.</caption>
* function onStillSnapshotTaken(path, notify) {
@ -371,11 +371,11 @@ public slots:
* @function Window.takeSecondaryCameraSnapshot
* @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
* signal.
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* name&gt;-on-YYYY-MM-DD_HH-MM-SS".
* <p>Images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
* <code>".jpg"</code>.</p>
* <p>Still images are saved in JPEG, PNG or WEBP format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, <code>".png"</code>, or <code>".webp"</code> &mdash; or if not provided then in the format chosen in general settings,
* Default is PNG. Animated images are saved in GIF format.</p>
*/
void takeSecondaryCameraSnapshot(const bool& notify = true, const QString& filename = QString());
@ -390,11 +390,11 @@ public slots:
* otherwise it is saved as an equirectangular image.
* @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
* signal.
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* name&gt;-on-YYYY-MM-DD_HH-MM-SS".
* <p>Images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
* <code>".jpg"</code>.</p>
* <p>Still images are saved in JPEG, PNG or WEBP format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, <code>".png"</code>, or <code>".webp"</code> &mdash; or if not provided then in the format chosen in general settings,
* Default is PNG. Animated images are saved in GIF format.</p>
*/
void takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition, const bool& cubemapOutputFormat = false, const bool& notify = true, const QString& filename = QString());

49
interface/src/ui/PreferencesDialog.cpp
View file

@ -238,15 +238,6 @@ void setupPreferences() {
auto preference = new BrowsePreference(SNAPSHOTS, "Put my snapshots here", getter, setter);
preferences->addPreference(preference);
}
{
auto getter = []()->float { return SnapshotAnimated::snapshotAnimatedDuration.get(); };
auto setter = [](float value) { SnapshotAnimated::snapshotAnimatedDuration.set(value); };
auto preference = new SpinnerPreference(SNAPSHOTS, "Animated Snapshot Duration", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setStep(1);
preferences->addPreference(preference);
}
{
auto getter = []()->bool {
@ -258,6 +249,46 @@ void setupPreferences() {
preferences->addPreference(new CheckPreference(SNAPSHOTS, "Display snapshot notifications", getter, setter));
}
{
auto getter = []()->int {
if (!DependencyManager::get<Snapshot>()->_snapshotFormat.isSet()) {
DependencyManager::get<Snapshot>()->setSnapshotFormat(DependencyManager::get<Snapshot>()->getAvailableSnapshotFormats()[0]);
}
return DependencyManager::get<Snapshot>()->getAvailableSnapshotFormats().indexOf(DependencyManager::get<Snapshot>()->getSnapshotFormat()); };
auto setter = [](int value) { DependencyManager::get<Snapshot>()->setSnapshotFormat(DependencyManager::get<Snapshot>()->getAvailableSnapshotFormats()[value]); };
auto preference = new RadioButtonsPreference(SNAPSHOTS, "Snapshot format", getter, setter);
QStringList items;
items << DependencyManager::get<Snapshot>()->getAvailableSnapshotFormatsWithDescriptions();
preference->setHeading("Snapshot format");
preference->setItems(items);
preferences->addPreference(preference);
}
{
auto getter = []()->int {
if (!DependencyManager::get<Snapshot>()->_animatedSnapshotFormat.isSet()) {
DependencyManager::get<Snapshot>()->setAnimatedSnapshotFormat(DependencyManager::get<Snapshot>()->getAvailableAnimatedSnapshotFormats()[0]);
}
return DependencyManager::get<Snapshot>()->getAvailableAnimatedSnapshotFormats().indexOf(DependencyManager::get<Snapshot>()->getAnimatedSnapshotFormat()); };
auto setter = [](int value) { DependencyManager::get<Snapshot>()->setAnimatedSnapshotFormat(DependencyManager::get<Snapshot>()->getAvailableAnimatedSnapshotFormats()[value]); };
auto preference = new RadioButtonsPreference(SNAPSHOTS, "Animated snapshot format", getter, setter);
QStringList items;
items << DependencyManager::get<Snapshot>()->getAvailableAnimatedSnapshotFormatsWithDescriptions();
preference->setHeading("Animated snapshot format");
preference->setItems(items);
preferences->addPreference(preference);
}
{
auto getter = []()->float { return SnapshotAnimated::snapshotAnimatedDuration.get(); };
auto setter = [](float value) { SnapshotAnimated::snapshotAnimatedDuration.set(value); };
auto preference = new SpinnerPreference(SNAPSHOTS, "Animated Snapshot Duration", getter, setter);
preference->setMin(1);
preference->setMax(5);
preference->setStep(1);
preferences->addPreference(preference);
}
{
auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); };
auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); };

53
interface/src/ui/Snapshot.cpp
View file

@ -4,6 +4,7 @@
//
// Created by Stojce Slavkovski on 1/26/14.
// Copyright 2014 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -44,12 +45,13 @@
// filename format: overte-snap-by-%username%-on-%date%_%time%_@-%location%.png
// %1 <= username, %2 <= date and time, %3 <= current location
const QString FILENAME_PATH_FORMAT = "overte-snap-by-%1-on-%2.png";
const QString FILENAME_PATH_FORMAT = "overte-snap-by-%1-on-%2";
const QString DEFAULT_FORMAT = "png";
const QString DATETIME_FORMAT = "yyyy-MM-dd_hh-mm-ss";
const QString SNAPSHOTS_DIRECTORY = "Snapshots";
const QString URL = "overte_url";
static const int SNAPSHOT_360_TIMER_INTERVAL = 350;
static const QList<QString> SUPPORTED_IMAGE_FORMATS = { "jpg", "jpeg", "png" };
static const QList<QString> SUPPORTED_IMAGE_FORMATS = { "jpg", "jpeg", "png", "webp" };
Snapshot::Snapshot() {
_snapshotTimer.setSingleShot(false);
@ -110,6 +112,7 @@ QString Snapshot::saveSnapshot(QImage image, const QString& filename, const QStr
return "";
}
static const float CUBEMAP_SIDE_PIXEL_DIMENSION = 2048.0f;
static const float SNAPSHOT_360_FOV = 90.0f;
static const float SNAPSHOT_360_NEARCLIP = 0.3f;
@ -389,7 +392,11 @@ QFile* Snapshot::savedFileForSnapshot(QImage& shot,
imageQuality = 50;
}
} else {
filename = FILENAME_PATH_FORMAT.arg(username, now.toString(DATETIME_FORMAT));
QString selectedFormat(DEFAULT_FORMAT);
if (_snapshotFormat.get() != "") {
selectedFormat = _snapshotFormat.get();
}
filename = FILENAME_PATH_FORMAT.arg(username, now.toString(DATETIME_FORMAT)) + "." + selectedFormat;
QFileInfo snapshotFileInfo(filename);
QString filenameSuffix = snapshotFileInfo.suffix();
filenameSuffix = filenameSuffix.toLower();
@ -516,3 +523,43 @@ QString Snapshot::getSnapshotsLocation() {
void Snapshot::setSnapshotsLocation(const QString& location) {
_snapshotsLocation.set(location);
}
QString Snapshot::getSnapshotFormat(){
return _snapshotFormat.get();
}
void Snapshot::setSnapshotFormat(const QString& format){
if (getAvailableSnapshotFormats().contains(format)) {
_snapshotFormat.set(format);
} else {
qDebug() << "Snapshot format not supported: " << format;
}
}
QString Snapshot::getAnimatedSnapshotFormat(){
return _animatedSnapshotFormat.get();
}
void Snapshot::setAnimatedSnapshotFormat(const QString& format){
if (getAvailableAnimatedSnapshotFormats().contains(format)) {
_animatedSnapshotFormat.set(format);
} else {
qDebug() << "Snapshot format not supported: " << format;
}
}
QStringList Snapshot::getAvailableSnapshotFormats() {
return QStringList({"png", "jpg", "webp"});
}
QStringList Snapshot::getAvailableSnapshotFormatsWithDescriptions() {
return QStringList({"PNG - lossless, large file size", "JPG - lossy, fast compression", "WEBP - lossy, higher quality and file size than JPG"});
}
QStringList Snapshot::getAvailableAnimatedSnapshotFormats() {
return QStringList({"gif"});
}
QStringList Snapshot::getAvailableAnimatedSnapshotFormatsWithDescriptions() {
return QStringList({"GIF"});
}

60
interface/src/ui/Snapshot.h
View file

@ -65,6 +65,8 @@ public:
Setting::Handle<QString> _snapshotsLocation{ "snapshotsLocation" };
Setting::Handle<bool> _snapshotNotifications{ "snapshotNotifications", true };
Setting::Handle<QString> _snapshotFormat{ "snapshotFormat" };
Setting::Handle<QString> _animatedSnapshotFormat{ "animatedSnapshotFormat" };
void uploadSnapshot(const QString& filename, const QUrl& href = QUrl(""));
signals:
@ -97,6 +99,64 @@ public slots:
* @param {String} location - The path to save snapshots to.
*/
Q_INVOKABLE void setSnapshotsLocation(const QString& location);
/*@jsdoc
* Gets the currently selected snapshot format.
* @function Snapshot.getSnapshotFormat
* @returns {string} Currently selected snapshot format.
*/
Q_INVOKABLE QString getSnapshotFormat();
/*@jsdoc
* Sets the snapshot format.
* @function Snapshot.setSnapshotFormat
* @param {String} format - one of the format names returned by Snapshot.getAvailableSnapshotFormats().
*/
Q_INVOKABLE void setSnapshotFormat(const QString& format);
/*@jsdoc
* Gets the currently selected animated snapshot format.
* @function Snapshot.getAnimatedSnapshotFormat
* @returns {Array.<string>} Currently selected snapshot format.
*/
Q_INVOKABLE QString getAnimatedSnapshotFormat();
/*@jsdoc
* Sets the snapshot format.
* @function Snapshot.setAnimatedSnapshotFormat
* @param {String} format - one of the format names returned by Snapshot.getAvailableSnapshotFormats().
*/
Q_INVOKABLE void setAnimatedSnapshotFormat(const QString& format);
/*@jsdoc
* Returns a list of supported snapshot formats.
* @function Snapshot.getAvailableSnapshotFormats
* @returns {Array.<string>} List of supported snapshot formats.
*/
Q_INVOKABLE QStringList getAvailableSnapshotFormats();
/*@jsdoc
* Returns a list of supported snapshot formats with short descriptions.
* @function Snapshot.getAvailableSnapshotFormatsWithDescriptions
* @returns {Array.<string>} List of supported snapshot formats with short descriptions.
*/
Q_INVOKABLE QStringList getAvailableSnapshotFormatsWithDescriptions();
/*@jsdoc
* Returns a list of supported animated snapshot formats.
* @function Snapshot.getAvailableAnimatedSnapshotFormats
* @returns {Array.<string>} List of supported animated snapshot formats.
*/
Q_INVOKABLE QStringList getAvailableAnimatedSnapshotFormats();
/*@jsdoc
* Returns a list of supported animated snapshot formats with short descriptions.
* @function Snapshot.getAvailableAnimatedSnapshotFormatsWithDescriptions
* @returns {Array.<string>} List of supported animated snapshot formats with short descriptions.
*/
Q_INVOKABLE QStringList getAvailableAnimatedSnapshotFormatsWithDescriptions();
private slots:
void takeNextSnapshot();