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

Getting theregit add -A!

Browse source
This commit is contained in:
Zach Fox 2016-11-09 13:56:57 -08:00
parent e656a4413f
commit c39a8da3b8
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
interface/src/Application.cpp
View file

@ -149,7 +149,6 @@
#include "ui/AddressBarDialog.h" #include "ui/AddressBarDialog.h"
#include "ui/AvatarInputs.h" #include "ui/AvatarInputs.h"
#include "ui/DialogsManager.h" #include "ui/DialogsManager.h"
#include "ui/Gif.h"
#include "ui/LoginDialog.h" #include "ui/LoginDialog.h"
#include "ui/overlays/Cube3DOverlay.h" #include "ui/overlays/Cube3DOverlay.h"
#include "ui/Snapshot.h" #include "ui/Snapshot.h"
@ -5456,8 +5455,17 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
// If this is an animated snapshot (GIF)... // If this is an animated snapshot (GIF)...
else if (!format.compare("animated")) else if (!format.compare("animated"))
{ {
GifWriter _animatedSnapshotGifWriter; // If we're in the middle of capturing a GIF...
uint8_t _currentAnimatedSnapshotFrame = 0; if (_currentAnimatedSnapshotFrame != 0)
{
// Protect against clobbering it and return immediately.
// (Perhaps with a "snapshot failed" message?
return;
}
// Reset the current animated snapshot frame
_currentAnimatedSnapshotFrame = 0;
// File path stuff -- lots of this is temporary // File path stuff -- lots of this is temporary
// until I figure out how to save the .GIF to the same location as the still .JPG // until I figure out how to save the .GIF to the same location as the still .JPG
char* cstr; char* cstr;
@ -5469,7 +5477,7 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
strcpy(cstr, fname.c_str()); // Copy the string into a character array strcpy(cstr, fname.c_str()); // Copy the string into a character array
// Connect the animatedSnapshotTimer QTimer to the lambda slot function // Connect the animatedSnapshotTimer QTimer to the lambda slot function
connect(&animatedSnapshotTimer, &QTimer::timeout, [&]() { connect(&animatedSnapshotTimer, &QTimer::timeout, [&, path, aspectRatio] {
// If this is the last frame... // If this is the last frame...
if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES) if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES)
{ {
@ -5485,19 +5493,23 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
// 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"
QImage frame = (qApp->getActiveDisplayPlugin()->getScreenshot(aspectRatio)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888); QImage* frame = new QImage(qApp->getActiveDisplayPlugin()->getScreenshot(aspectRatio));
*frame = frame->scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
// If this is the first frame... // If this is the first frame...
if (_currentAnimatedSnapshotFrame == 0) if (_currentAnimatedSnapshotFrame == 0)
{ {
// Write out the header and beginning of the GIF file // Write out the header and beginning of the GIF file
GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY); GifBegin(&_animatedSnapshotGifWriter, cstr, frame->width(), frame->height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
} }
// Write the frame to the gif // Write the frame to the gif
GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY); GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame->bits(), frame->width(), frame->height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
// Increment the current snapshot frame count // Increment the current snapshot frame count
_currentAnimatedSnapshotFrame++; _currentAnimatedSnapshotFrame++;
// Free the dynamic memory
delete frame;
}); });
// Start the animatedSnapshotTimer QTimer // Start the animatedSnapshotTimer QTimer

4
interface/src/Application.h
View file

@ -60,6 +60,7 @@
#include "scripting/DialogsManagerScriptingInterface.h" #include "scripting/DialogsManagerScriptingInterface.h"
#include "ui/ApplicationOverlay.h" #include "ui/ApplicationOverlay.h"
#include "ui/BandwidthDialog.h" #include "ui/BandwidthDialog.h"
#include "ui/Gif.h"
#include "ui/LodToolsDialog.h" #include "ui/LodToolsDialog.h"
#include "ui/LogDialog.h" #include "ui/LogDialog.h"
#include "ui/OctreeStatsDialog.h" #include "ui/OctreeStatsDialog.h"
@ -609,6 +610,9 @@ private:
model::SkyboxPointer _defaultSkybox { new ProceduralSkybox() } ; model::SkyboxPointer _defaultSkybox { new ProceduralSkybox() } ;
gpu::TexturePointer _defaultSkyboxTexture; gpu::TexturePointer _defaultSkyboxTexture;
gpu::TexturePointer _defaultSkyboxAmbientTexture; gpu::TexturePointer _defaultSkyboxAmbientTexture;
GifWriter _animatedSnapshotGifWriter;
uint8_t _currentAnimatedSnapshotFrame = 0;
}; };