PPM screen recording
This commit is contained in:
parent
706bd0fa97
commit
5b51e67044
@ -2,7 +2,10 @@
|
|||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <iostream>
|
||||||
|
#include <iterator>
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include "Format.h"
|
#include "Format.h"
|
||||||
#include "graphics/Graphics.h"
|
#include "graphics/Graphics.h"
|
||||||
|
|
||||||
@ -37,6 +40,30 @@ std::string format::UnixtimeToDateMini(time_t unixtime)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::vector<char> format::VideoBufferToPPM(const VideoBuffer & vidBuf)
|
||||||
|
{
|
||||||
|
std::vector<char> data;
|
||||||
|
char buffer[256];
|
||||||
|
sprintf(buffer, "P6\n%d %d\n255\n", vidBuf.Width, vidBuf.Height);
|
||||||
|
data.insert(data.end(), buffer, buffer+strlen(buffer));
|
||||||
|
|
||||||
|
unsigned char * currentRow = new unsigned char[vidBuf.Width*3];
|
||||||
|
for(int y = 0; y < vidBuf.Height; y++)
|
||||||
|
{
|
||||||
|
int rowPos = 0;
|
||||||
|
for(int x = 0; x < vidBuf.Width; x++)
|
||||||
|
{
|
||||||
|
currentRow[rowPos++] = PIXR(vidBuf.Buffer[(y*vidBuf.Width)+x]);
|
||||||
|
currentRow[rowPos++] = PIXG(vidBuf.Buffer[(y*vidBuf.Width)+x]);
|
||||||
|
currentRow[rowPos++] = PIXB(vidBuf.Buffer[(y*vidBuf.Width)+x]);
|
||||||
|
}
|
||||||
|
data.insert(data.end(), currentRow, currentRow+(vidBuf.Width*3));
|
||||||
|
}
|
||||||
|
delete currentRow;
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
struct PNGChunk
|
struct PNGChunk
|
||||||
{
|
{
|
||||||
int Length;
|
int Length;
|
||||||
|
@ -24,5 +24,6 @@ namespace format
|
|||||||
std::string UnixtimeToDate(time_t unixtime, std::string dateFomat = "%d %b %Y");
|
std::string UnixtimeToDate(time_t unixtime, std::string dateFomat = "%d %b %Y");
|
||||||
std::string UnixtimeToDateMini(time_t unixtime);
|
std::string UnixtimeToDateMini(time_t unixtime);
|
||||||
std::vector<char> VideoBufferToPNG(const VideoBuffer & vidBuf);
|
std::vector<char> VideoBufferToPNG(const VideoBuffer & vidBuf);
|
||||||
|
std::vector<char> VideoBufferToPPM(const VideoBuffer & vidBuf);
|
||||||
unsigned long CalculateCRC(unsigned char * data, int length);
|
unsigned long CalculateCRC(unsigned char * data, int length);
|
||||||
}
|
}
|
@ -31,6 +31,7 @@ class GameController: public ClientListener
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
//Simulation * sim;
|
//Simulation * sim;
|
||||||
|
int screenshotIndex;
|
||||||
PreviewController * activePreview;
|
PreviewController * activePreview;
|
||||||
GameView * gameView;
|
GameView * gameView;
|
||||||
GameModel * gameModel;
|
GameModel * gameModel;
|
||||||
|
@ -175,7 +175,11 @@ GameView::GameView():
|
|||||||
showDebug(false),
|
showDebug(false),
|
||||||
introText(2048),
|
introText(2048),
|
||||||
introTextMessage(introTextData),
|
introTextMessage(introTextData),
|
||||||
wallBrush(false)
|
wallBrush(false),
|
||||||
|
doScreenshot(false),
|
||||||
|
recording(false),
|
||||||
|
screenshotIndex(0),
|
||||||
|
recordingIndex(0)
|
||||||
{
|
{
|
||||||
|
|
||||||
int currentX = 1;
|
int currentX = 1;
|
||||||
@ -927,6 +931,35 @@ void GameView::NotifyBrushChanged(GameModel * sender)
|
|||||||
activeBrush = sender->GetBrush();
|
activeBrush = sender->GetBrush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GameView::screenshot()
|
||||||
|
{
|
||||||
|
doScreenshot = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GameView::record()
|
||||||
|
{
|
||||||
|
if(recording)
|
||||||
|
{
|
||||||
|
recording = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
class RecordingConfirmation: public ConfirmDialogueCallback {
|
||||||
|
public:
|
||||||
|
GameView * v;
|
||||||
|
RecordingConfirmation(GameView * v): v(v) {}
|
||||||
|
virtual void ConfirmCallback(ConfirmPrompt::DialogueResult result) {
|
||||||
|
if (result == ConfirmPrompt::ResultOkay)
|
||||||
|
{
|
||||||
|
v->recording = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
virtual ~RecordingConfirmation() { }
|
||||||
|
};
|
||||||
|
new ConfirmPrompt("Recording", "You're about to start recording all drawn frames. This may use a load of hard disk space.", new RecordingConfirmation(this));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GameView::setToolButtonOffset(int offset)
|
void GameView::setToolButtonOffset(int offset)
|
||||||
{
|
{
|
||||||
int offset_ = offset;
|
int offset_ = offset;
|
||||||
@ -1246,6 +1279,12 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
|
|||||||
case '`':
|
case '`':
|
||||||
c->ShowConsole();
|
c->ShowConsole();
|
||||||
break;
|
break;
|
||||||
|
case 'p':
|
||||||
|
screenshot();
|
||||||
|
break;
|
||||||
|
case 'r':
|
||||||
|
record();
|
||||||
|
break;
|
||||||
case 'e':
|
case 'e':
|
||||||
c->OpenElementSearch();
|
c->OpenElementSearch();
|
||||||
break;
|
break;
|
||||||
@ -1782,6 +1821,22 @@ void GameView::OnDraw()
|
|||||||
}
|
}
|
||||||
ren->RenderEnd();
|
ren->RenderEnd();
|
||||||
|
|
||||||
|
if(doScreenshot)
|
||||||
|
{
|
||||||
|
VideoBuffer screenshot(ren->DumpFrame());
|
||||||
|
std::vector<char> data = format::VideoBufferToPNG(screenshot);
|
||||||
|
Client::Ref().WriteFile(data, "screenshot_" + format::NumberToString<int>(screenshotIndex++) + ".png");
|
||||||
|
doScreenshot = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(recording)
|
||||||
|
{
|
||||||
|
VideoBuffer screenshot(ren->DumpFrame());
|
||||||
|
std::vector<char> data = format::VideoBufferToPPM(screenshot);
|
||||||
|
Client::Ref().WriteFile(data, "frame_" + format::NumberToString<int>(recordingIndex++) + ".ppm");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if(selectMode!=SelectNone)
|
if(selectMode!=SelectNone)
|
||||||
{
|
{
|
||||||
if(selectMode==PlaceSave)
|
if(selectMode==PlaceSave)
|
||||||
@ -1856,7 +1911,17 @@ void GameView::OnDraw()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(showHud && !introText)
|
if(recording)
|
||||||
|
{
|
||||||
|
std::stringstream sampleInfo;
|
||||||
|
sampleInfo << recordingIndex;
|
||||||
|
sampleInfo << ". \x8E REC";
|
||||||
|
|
||||||
|
int textWidth = Graphics::textwidth((char*)sampleInfo.str().c_str());
|
||||||
|
g->fillrect(XRES-20-textWidth, 12, textWidth+8, 15, 0, 0, 0, 255*0.5);
|
||||||
|
g->drawtext(XRES-16-textWidth, 16, (const char*)sampleInfo.str().c_str(), 255, 50, 20, 255);
|
||||||
|
}
|
||||||
|
else if(showHud && !introText)
|
||||||
{
|
{
|
||||||
//Draw info about simulation under cursor
|
//Draw info about simulation under cursor
|
||||||
int wavelengthGfx = 0;
|
int wavelengthGfx = 0;
|
||||||
|
@ -35,6 +35,12 @@ class GameView: public ui::Window
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
DrawMode drawMode;
|
DrawMode drawMode;
|
||||||
|
|
||||||
|
bool doScreenshot;
|
||||||
|
bool recording;
|
||||||
|
int screenshotIndex;
|
||||||
|
int recordingIndex;
|
||||||
|
|
||||||
bool isMouseDown;
|
bool isMouseDown;
|
||||||
bool zoomEnabled;
|
bool zoomEnabled;
|
||||||
bool zoomCursorFixed;
|
bool zoomCursorFixed;
|
||||||
@ -114,6 +120,9 @@ private:
|
|||||||
virtual ui::Point lineSnapCoords(ui::Point point1, ui::Point point2);
|
virtual ui::Point lineSnapCoords(ui::Point point1, ui::Point point2);
|
||||||
virtual ui::Point rectSnapCoords(ui::Point point1, ui::Point point2);
|
virtual ui::Point rectSnapCoords(ui::Point point1, ui::Point point2);
|
||||||
|
|
||||||
|
void screenshot();
|
||||||
|
void record();
|
||||||
|
|
||||||
void enableShiftBehaviour();
|
void enableShiftBehaviour();
|
||||||
void disableShiftBehaviour();
|
void disableShiftBehaviour();
|
||||||
void enableCtrlBehaviour();
|
void enableCtrlBehaviour();
|
||||||
|
Loading…
Reference in New Issue
Block a user