diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-15 12:59:55 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-15 12:59:55 (GMT) |
| commit | 73b6ff4efb4bbe31993a595987b9abc59a5a2e76 (patch) | |
| tree | 7320e993bf6df6c59ef956087f3fa63f17b19b5d /src/simulation | |
| parent | 6b68c04cd613847e4f2bbe1f0cd8a2a13a9d4660 (diff) | |
| download | powder-73b6ff4efb4bbe31993a595987b9abc59a5a2e76.zip powder-73b6ff4efb4bbe31993a595987b9abc59a5a2e76.tar.gz | |
Use VideoBuffer in place of thumbnail
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/SaveRenderer.cpp | 20 | ||||
| -rw-r--r-- | src/simulation/SaveRenderer.h | 6 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index 283ab10..05601d9 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -32,10 +32,10 @@ SaveRenderer::SaveRenderer(){ #endif } -Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations, bool fire) +VideoBuffer * SaveRenderer::Render(GameSave * save, bool decorations, bool fire) { int width, height; - Thumbnail * tempThumb; + VideoBuffer * tempThumb; width = save->blockWidth; height = save->blockHeight; bool doCollapse = save->Collapsed(); @@ -104,7 +104,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations, bool fire) } } - tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL)); + tempThumb = new VideoBuffer(pData, width*CELL, height*CELL); delete[] pData; delete[] texData; pData = NULL; @@ -139,7 +139,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations, bool fire) dst+=(width*CELL);///PIXELSIZE; src+=XRES+BARSIZE; } - tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL)); + tempThumb = new VideoBuffer(pData, width*CELL, height*CELL); if(pData) free(pData); #endif @@ -150,7 +150,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save, bool decorations, bool fire) return tempThumb; } -Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize, bool decorations, bool fire) +VideoBuffer * SaveRenderer::Render(unsigned char * saveData, int dataSize, bool decorations, bool fire) { GameSave * tempSave; try { @@ -158,14 +158,12 @@ Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize, bool de } catch (std::exception & e) { //Todo: make this look a little less shit - VideoBuffer buffer(64, 64); - buffer.BlendCharacter(32, 32, 'x', 255, 255, 255, 255); + VideoBuffer * buffer = new VideoBuffer(64, 64); + buffer->BlendCharacter(32, 32, 'x', 255, 255, 255, 255); - Thumbnail * thumb = new Thumbnail(0, 0, buffer.Buffer, ui::Point(64, 64)); - - return thumb; + return buffer; } - Thumbnail * thumb = Render(tempSave, decorations, fire); + VideoBuffer * thumb = Render(tempSave, decorations, fire); delete tempSave; return thumb; } diff --git a/src/simulation/SaveRenderer.h b/src/simulation/SaveRenderer.h index 7570bb7..6f791d3 100644 --- a/src/simulation/SaveRenderer.h +++ b/src/simulation/SaveRenderer.h @@ -6,7 +6,7 @@ #include "Singleton.h" class GameSave; -class Thumbnail; +class VideoBuffer; class Graphics; class Simulation; class Renderer; @@ -17,8 +17,8 @@ class SaveRenderer: public Singleton<SaveRenderer> { Renderer * ren; public: SaveRenderer(); - Thumbnail * Render(GameSave * save, bool decorations = true, bool fire = true); - Thumbnail * Render(unsigned char * saveData, int saveDataSize, bool decorations = true, bool fire = true); + VideoBuffer * Render(GameSave * save, bool decorations = true, bool fire = true); + VideoBuffer * Render(unsigned char * saveData, int saveDataSize, bool decorations = true, bool fire = true); virtual ~SaveRenderer(); private: |
