diff options
author | Filippos Karapetis | 2014-12-22 22:11:07 +0200 |
---|---|---|
committer | Filippos Karapetis | 2014-12-23 00:07:44 +0200 |
commit | 58f7c12fa941265a79b453df9b32ec41c49d53c4 (patch) | |
tree | 6a31c21d3e3742e874953ab15fbee9727a989b10 /engines | |
parent | d1bc69426eac2458b46ab7fede31c6dd71314ccb (diff) | |
download | scummvm-rg350-58f7c12fa941265a79b453df9b32ec41c49d53c4.tar.gz scummvm-rg350-58f7c12fa941265a79b453df9b32ec41c49d53c4.tar.bz2 scummvm-rg350-58f7c12fa941265a79b453df9b32ec41c49d53c4.zip |
ZVISION: Remove dead code
Diffstat (limited to 'engines')
-rw-r--r-- | engines/zvision/graphics/render_table.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp index c30e0bd472..df73247344 100644 --- a/engines/zvision/graphics/render_table.cpp +++ b/engines/zvision/graphics/render_table.cpp @@ -81,27 +81,6 @@ const Common::Point RenderTable::convertWarpedCoordToFlatCoord(const Common::Poi return newPoint; } -uint16 mixTwoRGB(uint16 colorOne, uint16 colorTwo, float percentColorOne) { - assert(percentColorOne < 1.0f); - - float rOne = float((colorOne & Graphics::ColorMasks<555>::kRedMask) >> Graphics::ColorMasks<555>::kRedShift); - float rTwo = float((colorTwo & Graphics::ColorMasks<555>::kRedMask) >> Graphics::ColorMasks<555>::kRedShift); - float gOne = float((colorOne & Graphics::ColorMasks<555>::kGreenMask) >> Graphics::ColorMasks<555>::kGreenShift); - float gTwo = float((colorTwo & Graphics::ColorMasks<555>::kGreenMask) >> Graphics::ColorMasks<555>::kGreenShift); - float bOne = float((colorOne & Graphics::ColorMasks<555>::kBlueMask) >> Graphics::ColorMasks<555>::kBlueShift); - float bTwo = float((colorTwo & Graphics::ColorMasks<555>::kBlueMask) >> Graphics::ColorMasks<555>::kBlueShift); - - float rFinal = rOne * percentColorOne + rTwo * (1.0f - percentColorOne); - float gFinal = gOne * percentColorOne + gTwo * (1.0f - percentColorOne); - float bFinal = bOne * percentColorOne + bTwo * (1.0f - percentColorOne); - - uint16 returnColor = (byte(rFinal + 0.5f) << Graphics::ColorMasks<555>::kRedShift) | - (byte(gFinal + 0.5f) << Graphics::ColorMasks<555>::kGreenShift) | - (byte(bFinal + 0.5f) << Graphics::ColorMasks<555>::kBlueShift); - - return returnColor; -} - void RenderTable::mutateImage(uint16 *sourceBuffer, uint16 *destBuffer, uint32 destWidth, const Common::Rect &subRect) { uint32 destOffset = 0; |