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

It crashes, but it's the start of a new architecture

Browse source
This commit is contained in:
Zach Fox 2016-11-08 15:50:39 -08:00
parent ed1d087a68
commit b6dd795b00
3 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
interface/src/Application.cpp
View file

@ -5430,9 +5430,7 @@ void Application::toggleLogDialog() {
}
}
uint8_t _currentAnimatedSnapshotFrame;
GifWriter _animatedSnapshotGifWriter;
#define SNAPSNOT_ANIMATED_WIDTH (640)
#define SNAPSNOT_ANIMATED_WIDTH (900)
#define SNAPSNOT_ANIMATED_FRAMERATE_FPS (20)
#define SNAPSNOT_ANIMATED_FRAME_DELAY (100/SNAPSNOT_ANIMATED_FRAMERATE_FPS)
#define SNAPSNOT_ANIMATED_DURATION_SECS (3)
@ -5446,6 +5444,8 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath()));
player->play();
GifWriter _animatedSnapshotGifWriter;
uint8_t _currentAnimatedSnapshotFrame;
QString path;
// If this is a still snapshot...
@ -5460,7 +5460,6 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
else if (!format.compare("animated"))
{
char* cstr;
connect(&animatedSnapshotTimer, &QTimer::timeout, this, &Application::animatedSnapshotTimerCb);
_currentAnimatedSnapshotFrame = 0;
// File path stuff
path = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
@ -5469,38 +5468,33 @@ void Application::takeSnapshot(bool notify, const QString& format, float aspectR
string fname = path.toStdString();
cstr = new char[fname.size() + 1];
strcpy(cstr, fname.c_str());
// Start the GIF
QImage frame = (getActiveDisplayPlugin()->getScreenshot(1.91)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
Application::animatedSnapshotTimerCb();
animatedSnapshotTimer.start(50);
connect(&animatedSnapshotTimer, &QTimer::timeout, this, [&] {
if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES)
{
animatedSnapshotTimer.stop();
GifEnd(&_animatedSnapshotGifWriter);
emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, false);
return;
}
QImage frame = (getActiveDisplayPlugin()->getScreenshot(aspectRatio)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
if (_currentAnimatedSnapshotFrame == 0)
{
GifBegin(&_animatedSnapshotGifWriter, cstr, frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
}
uint32_t frameNumBytes = frame.width() * frame.height() * 4;
uint8_t* pixelArray = new uint8_t[frameNumBytes];
GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
_currentAnimatedSnapshotFrame++;
delete[frameNumBytes] pixelArray;
});
animatedSnapshotTimer.start(SNAPSNOT_ANIMATED_FRAME_DELAY * 10);
}
});
}
void Application::animatedSnapshotTimerCb()
{
if (_currentAnimatedSnapshotFrame == SNAPSNOT_ANIMATED_NUM_FRAMES)
{
animatedSnapshotTimer.stop();
GifEnd(&_animatedSnapshotGifWriter);
QString path = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
path.append(QDir::separator());
path.append("test.gif");
emit DependencyManager::get<WindowScriptingInterface>()->snapshotTaken(path, false);
return;
}
QImage frame = (getActiveDisplayPlugin()->getScreenshot(1.91)).scaledToWidth(SNAPSNOT_ANIMATED_WIDTH).convertToFormat(QImage::Format_RGBA8888);
uint32_t frameNumBytes = frame.width() * frame.height() * 4;
uint8_t* pixelArray = new uint8_t[frameNumBytes];
GifWriteFrame(&_animatedSnapshotGifWriter, (uint8_t*)frame.bits(), frame.width(), frame.height(), SNAPSNOT_ANIMATED_FRAME_DELAY);
_currentAnimatedSnapshotFrame++;
delete[frameNumBytes] pixelArray;
}
void Application::shareSnapshot(const QString& path) {
postLambdaEvent([path] {
// not much to do here, everything is done in snapshot code...

1
interface/src/Application.h
View file

@ -267,7 +267,6 @@ public:
float getAverageSimsPerSecond() const { return _simCounter.rate(); }
void takeSnapshot(bool notify, const QString& format = "still", float aspectRatio = 0.0f);
void animatedSnapshotTimerCb();
void shareSnapshot(const QString& filename);
model::SkyboxPointer getDefaultSkybox() const { return _defaultSkybox; }

4
interface/src/ui/Gif.h
View file

@ -368,8 +368,8 @@ void GifMakePalette(const uint8_t* lastFrame, const uint8_t* nextFrame, uint32_t
GIF_TEMP_FREE(destroyableImage);
// add the bottom node for the transparency index
pPal->treeSplit[1 << (bitDepth - 1)] = 0;
pPal->treeSplitElt[1 << (bitDepth - 1)] = 0;
pPal->treeSplit[1i64 << (bitDepth - 1)] = 0;
pPal->treeSplitElt[1i64 << (bitDepth - 1)] = 0;
pPal->r[0] = pPal->g[0] = pPal->b[0] = 0;
}