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

build error

Browse source
This commit is contained in:
SamGondelman 2019-04-23 08:45:38 -07:00
parent 018d249666
commit 48aef3e6d9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -8441,7 +8441,7 @@ void Application::loadAvatarBrowser() const {
void Application::addSnapshotOperator(const SnapshotOperator& snapshotOperator) { void Application::addSnapshotOperator(const SnapshotOperator& snapshotOperator) {
std::lock_guard<std::mutex> lock(_snapshotMutex); std::lock_guard<std::mutex> lock(_snapshotMutex);
_snapshotOperators.push(snapshotOperator); _snapshotOperators.push(snapshotOperator);
_hasPrimarySnapshot |= std::get<2>(snapshotOperator); _hasPrimarySnapshot = _hasPrimarySnapshot || std::get<2>(snapshotOperator);
} }
bool Application::takeSnapshotOperators(std::queue<SnapshotOperator>& snapshotOperators) { bool Application::takeSnapshotOperators(std::queue<SnapshotOperator>& snapshotOperators) {
@ -8453,7 +8453,7 @@ bool Application::takeSnapshotOperators(std::queue<SnapshotOperator>& snapshotOp
} }
void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio, const QString& filename) { void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio, const QString& filename) {
addSnapshotOperator({ [notify, includeAnimated, aspectRatio, filename](const QImage& snapshot) { addSnapshotOperator(std::make_tuple([notify, includeAnimated, aspectRatio, filename](const QImage& snapshot) {
QString path = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation()); QString path = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation());
// If we're not doing an animated snapshot as well... // If we're not doing an animated snapshot as well...
@ -8468,15 +8468,15 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa
SnapshotAnimated::saveSnapshotAnimated(path, aspectRatio, DependencyManager::get<WindowScriptingInterface>()); SnapshotAnimated::saveSnapshotAnimated(path, aspectRatio, DependencyManager::get<WindowScriptingInterface>());
}); });
} }
}, aspectRatio, true }); }, aspectRatio, true));
} }
void Application::takeSecondaryCameraSnapshot(const bool& notify, const QString& filename) { void Application::takeSecondaryCameraSnapshot(const bool& notify, const QString& filename) {
addSnapshotOperator({ [notify, filename](const QImage& snapshot) { addSnapshotOperator(std::make_tuple([notify, filename](const QImage& snapshot) {
QString snapshotPath = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation()); QString snapshotPath = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation());
emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(snapshotPath, notify); emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(snapshotPath, notify);
}, 0, false }); }, 0.0f, false));
} }
void Application::takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition, const bool& cubemapOutputFormat, const bool& notify, const QString& filename) { void Application::takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition, const bool& cubemapOutputFormat, const bool& notify, const QString& filename) {

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

@ -168,7 +168,7 @@ void Snapshot::takeNextSnapshot() {
if (_taking360Snapshot) { if (_taking360Snapshot) {
if (!_waitingOnSnapshot) { if (!_waitingOnSnapshot) {
_waitingOnSnapshot = true; _waitingOnSnapshot = true;
qApp->addSnapshotOperator({ [this](const QImage& snapshot) { qApp->addSnapshotOperator(std::make_tuple([this](const QImage& snapshot) {
// Order is: // Order is:
// 0. Down // 0. Down
// 1. Front // 1. Front
@ -202,7 +202,7 @@ void Snapshot::takeNextSnapshot() {
_waitingOnSnapshot = false; _waitingOnSnapshot = false;
_snapshotIndex++; _snapshotIndex++;
}, 0, false }); }, 0.0f, false));
} }
} else { } else {
_snapshotTimer.stop(); _snapshotTimer.stop();

4
interface/src/ui/SnapshotAnimated.cpp
View file

@ -60,7 +60,7 @@ void SnapshotAnimated::saveSnapshotAnimated(QString pathStill, float aspectRatio
void SnapshotAnimated::captureFrames() { void SnapshotAnimated::captureFrames() {
if (SnapshotAnimated::snapshotAnimatedTimerRunning) { if (SnapshotAnimated::snapshotAnimatedTimerRunning) {
qApp->addSnapshotOperator({ [](const QImage& snapshot) { qApp->addSnapshotOperator(std::make_tuple([](const QImage& snapshot) {
// Get a screenshot from the display, then scale the screenshot down, // Get a screenshot from the display, then scale the screenshot down,
// then convert it to the image format the GIF library needs, // then convert it to the image format the GIF library needs,
// then save all that to the QImage named "frame" // then save all that to the QImage named "frame"
@ -86,7 +86,7 @@ void SnapshotAnimated::captureFrames() {
SnapshotAnimated::snapshotAnimatedTimerRunning = false; SnapshotAnimated::snapshotAnimatedTimerRunning = false;
} }
} }
}, SnapshotAnimated::aspectRatio, true }); }, SnapshotAnimated::aspectRatio, true));
} else { } else {
// Notify the user that we're processing the snapshot // Notify the user that we're processing the snapshot
// This also pops up the "Share" dialog. The unprocessed GIF will be visualized as a loading icon until processingGifCompleted() is called. // This also pops up the "Share" dialog. The unprocessed GIF will be visualized as a loading icon until processingGifCompleted() is called.