diff options
| author | richiesams | 2013-08-19 23:47:33 -0500 |
|---|---|---|
| committer | richiesams | 2013-08-20 11:41:34 -0500 |
| commit | 760dd3e63202ff92d206fb83015f8b05e4aa969c (patch) | |
| tree | 31305ca9a8ce03674206f0a5beabc61af24dbc4d | |
| parent | 695257cb79f8666a74d4bc67996234eab391c67c (diff) | |
| download | scummvm-rg350-760dd3e63202ff92d206fb83015f8b05e4aa969c.tar.gz scummvm-rg350-760dd3e63202ff92d206fb83015f8b05e4aa969c.tar.bz2 scummvm-rg350-760dd3e63202ff92d206fb83015f8b05e4aa969c.zip | |
ZVISION: Rename _warpedBuffer to _workingWindowBuffer
To better represent its function
| -rw-r--r-- | engines/zvision/render_manager.cpp | 8 | ||||
| -rw-r--r-- | engines/zvision/render_manager.h | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp index 932c797c11..4e67cbbd7b 100644 --- a/engines/zvision/render_manager.cpp +++ b/engines/zvision/render_manager.cpp @@ -50,7 +50,7 @@ RenderManager::RenderManager(OSystem *system, const Common::Rect workingWindow, _accumulatedVelocityMilliseconds(0), _renderTable(_workingWidth, _workingHeight) { - _warpedBuffer = new uint16[_workingWidth *_workingHeight]; + _workingWindowBuffer = new uint16[_workingWidth *_workingHeight]; } RenderManager::~RenderManager() { @@ -58,7 +58,7 @@ RenderManager::~RenderManager() { delete _currentBackground; } - delete[] _warpedBuffer; + delete[] _workingWindowBuffer; } void RenderManager::update(uint deltaTimeInMillis) { @@ -133,9 +133,9 @@ void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 dest if (_renderTable.getRenderState() == RenderTable::FLAT) { _system->copyRectToScreen(surface.getBasePtr(subRect.left, subRect.top), surface.pitch, destinationX + _workingWindow.left, destinationY + _workingWindow.top, subRect.width(), subRect.height()); } else { - _renderTable.mutateImage((uint16 *)surface.getBasePtr(0, 0), _warpedBuffer, surface.w, surface.h, destinationX, destinationY, subRect, wrap, isTransposed); + _renderTable.mutateImage((uint16 *)surface.getBasePtr(0, 0), _workingWindowBuffer, surface.w, surface.h, destinationX, destinationY, subRect, wrap, isTransposed); - _system->copyRectToScreen(_warpedBuffer, _workingWidth * sizeof(uint16), destinationX + _workingWindow.left, destinationY + _workingWindow.top, subRect.width(), subRect.height()); + _system->copyRectToScreen(_workingWindowBuffer, _workingWidth * sizeof(uint16), destinationX + _workingWindow.left, destinationY + _workingWindow.top, subRect.width(), subRect.height()); } } diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h index 9683ee0bf2..5b517031ae 100644 --- a/engines/zvision/render_manager.h +++ b/engines/zvision/render_manager.h @@ -52,7 +52,9 @@ private: OSystem *_system; const Graphics::PixelFormat _pixelFormat; - uint16 *_warpedBuffer; + // A buffer the exact same size as the workingWindow + // It's used for panorama/tilt warping and for clearing the workingWindow to a single color + uint16 *_workingWindowBuffer; /** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */ const int _workingWidth; @@ -88,6 +90,7 @@ private: /** Holds any 'leftover' milliseconds between frames */ uint _accumulatedVelocityMilliseconds; + // TODO: Potentially merge this buffer and _workingWindowBuffer byte *_scaledVideoFrameBuffer; public: |