diff options
| author | jacob1 <jfu614@gmail.com> | 2012-10-02 23:45:35 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-05 14:49:54 (GMT) |
| commit | 5c59b9d6cb39a1786d3a859a0a8e9e44a6a86d9c (patch) | |
| tree | 22c123a7cf648badbb46278f1d07034c562cefd2 /src/client | |
| parent | 63c364652d58fc5b92cd9da628e6db164661ee4e (diff) | |
| download | powder-5c59b9d6cb39a1786d3a859a0a8e9e44a6a86d9c.zip powder-5c59b9d6cb39a1786d3a859a0a8e9e44a6a86d9c.tar.gz | |
don't render fire on stamps (reduces lag)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/ThumbnailBroker.cpp | 8 | ||||
| -rw-r--r-- | src/client/ThumbnailBroker.h | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/client/ThumbnailBroker.cpp b/src/client/ThumbnailBroker.cpp index c81ccc6..e884a98 100644 --- a/src/client/ThumbnailBroker.cpp +++ b/src/client/ThumbnailBroker.cpp @@ -28,16 +28,16 @@ ThumbnailBroker::~ThumbnailBroker() void ThumbnailBroker::RenderThumbnail(GameSave * gameSave, int width, int height, ThumbnailListener * tListener) { - RenderThumbnail(gameSave, true, width, height, tListener); + RenderThumbnail(gameSave, true, true, width, height, tListener); } -void ThumbnailBroker::RenderThumbnail(GameSave * gameSave, bool decorations, int width, int height, ThumbnailListener * tListener) +void ThumbnailBroker::RenderThumbnail(GameSave * gameSave, bool decorations, bool fire, int width, int height, ThumbnailListener * tListener) { AttachThumbnailListener(tListener); pthread_mutex_lock(&thumbnailQueueMutex); bool running = thumbnailQueueRunning; thumbnailQueueRunning = true; - renderRequests.push_back(ThumbRenderRequest(new GameSave(*gameSave), decorations, width, height, ListenerHandle(tListener->ListenerRand, tListener))); + renderRequests.push_back(ThumbRenderRequest(new GameSave(*gameSave), decorations, fire, width, height, ListenerHandle(tListener->ListenerRand, tListener))); pthread_mutex_unlock(&thumbnailQueueMutex); if(!running) @@ -122,7 +122,7 @@ void ThumbnailBroker::thumbnailQueueProcessTH() std::cout << typeid(*this).name() << " Processing render request" << std::endl; #endif - Thumbnail * thumbnail = SaveRenderer::Ref().Render(req.Save, req.Decorations); + Thumbnail * thumbnail = SaveRenderer::Ref().Render(req.Save, req.Decorations, req.Fire); delete req.Save; if(thumbnail) diff --git a/src/client/ThumbnailBroker.h b/src/client/ThumbnailBroker.h index cc736ef..ba6d3ae 100644 --- a/src/client/ThumbnailBroker.h +++ b/src/client/ThumbnailBroker.h @@ -59,11 +59,12 @@ private: public: int Width, Height; bool Decorations; + bool Fire; GameSave * Save; ListenerHandle CompletedListener; - ThumbRenderRequest(GameSave * save, bool decorations, int width, int height, ListenerHandle completedListener) : - Save(save), Width(width), Height(height), CompletedListener(completedListener), Decorations(decorations) {} - ThumbRenderRequest() : Save(0), Decorations(true), Width(0), Height(0), CompletedListener(ListenerHandle(0, (ThumbnailListener*)NULL)) {} + ThumbRenderRequest(GameSave * save, bool decorations, bool fire, int width, int height, ListenerHandle completedListener) : + Save(save), Width(width), Height(height), CompletedListener(completedListener), Decorations(decorations), Fire(fire) {} + ThumbRenderRequest() : Save(0), Decorations(true), Fire(true), Width(0), Height(0), CompletedListener(ListenerHandle(0, (ThumbnailListener*)NULL)) {} }; //Thumbnail retreival @@ -96,7 +97,7 @@ public: virtual ~ThumbnailBroker(); void FlushThumbQueue(); - void RenderThumbnail(GameSave * gameSave, bool decorations, int width, int height, ThumbnailListener * tListener); + void RenderThumbnail(GameSave * gameSave, bool decorations, bool fire, int width, int height, ThumbnailListener * tListener); void RenderThumbnail(GameSave * gameSave, int width, int height, ThumbnailListener * tListener); void RetrieveThumbnail(int saveID, int saveDate, int width, int height, ThumbnailListener * tListener); void RetrieveThumbnail(int saveID, int width, int height, ThumbnailListener * tListener); |