diff options
| author | RichieSams | 2013-09-07 11:52:20 -0500 |
|---|---|---|
| committer | RichieSams | 2013-09-07 11:52:20 -0500 |
| commit | 1e1d5cafe50b6860875c2bb392c1180852e5037d (patch) | |
| tree | 7a669e7fd42c3a5a1e891abdb688f2e7e13a2476 | |
| parent | db83d1b5e58e461051ec3d74efa89f332ddae1f9 (diff) | |
| download | scummvm-rg350-1e1d5cafe50b6860875c2bb392c1180852e5037d.tar.gz scummvm-rg350-1e1d5cafe50b6860875c2bb392c1180852e5037d.tar.bz2 scummvm-rg350-1e1d5cafe50b6860875c2bb392c1180852e5037d.zip | |
ZVISION: Re-enable rendering to the backbuffer
| -rw-r--r-- | engines/zvision/render_manager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp index b10a35d531..f528acfcac 100644 --- a/engines/zvision/render_manager.cpp +++ b/engines/zvision/render_manager.cpp @@ -78,16 +78,16 @@ void RenderManager::update(uint deltaTimeInMillis) { } void RenderManager::renderBackbufferToScreen() { - //RenderTable::RenderState state = _renderTable.getRenderState(); - //if (state == RenderTable::PANORAMA || state == RenderTable::TILT) { - // _renderTable.mutateImage((uint16 *)_workingWindowBuffer.getPixels(), (uint16 *)_backBuffer.getBasePtr(_workingWindow.left, _workingWindow.top), _backBuffer.w); - //} else { - //_system->copyRectToScreen(_workingWindowBuffer.getPixels(), _workingWindowBuffer.pitch, _workingWindow.left, _workingWindow.top, _workingWindowBuffer.w, _workingWindowBuffer.h); - //} + RenderTable::RenderState state = _renderTable.getRenderState(); + if (state == RenderTable::PANORAMA || state == RenderTable::TILT) { + _renderTable.mutateImage((uint16 *)_workingWindowBuffer.getPixels(), (uint16 *)_backBuffer.getBasePtr(_workingWindow.left, _workingWindow.top), _backBuffer.w); + } else { + renderRectToWorkingWindow((uint16 *)_workingWindowBuffer.getPixels(), _workingWindow.left, _workingWindow.top, _workingWindowBuffer.w, _workingWindowBuffer.h, false); + } // TODO: Add menu rendering - //_system->copyRectToScreen(_backBuffer.getPixels(), _backBuffer.pitch, 0, 0, _backBuffer.w, _backBuffer.h); + _system->copyRectToScreen(_backBuffer.getPixels(), _backBuffer.pitch, 0, 0, _backBuffer.w, _backBuffer.h); } void RenderManager::clearWorkingWindowTo555Color(uint16 color) { @@ -153,7 +153,7 @@ void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 dest if (!subRect.isValidRect() || subRect.isEmpty()) return; - _system->copyRectToScreen(surface.getBasePtr(subRect.left, subRect.top), surface.pitch, destinationX, destinationY, subRect.width(), subRect.height()/*, wrap*/); + renderRectToWorkingWindow((uint16 *)surface.getBasePtr(subRect.left, subRect.top), destinationX, destinationY, subRect.width(), subRect.height(), wrap); } void RenderManager::renderImageToScreen(const Common::String &fileName, int16 destinationX, int16 destinationY, bool wrap) { |