zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 23:41:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge http://github.com/rheit/zdoom

Browse source
This commit is contained in:
raa-eruanna 2016-10-20 03:30:51 -04:00
commit a4393d352f
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_plane.cpp
View file

@ -1123,8 +1123,8 @@ static void R_DrawSkyColumnStripe(int start_x, int y1, int y2, int columns, doub
dc_dest = (ylookup[y1] + start_x) * pixelsize + dc_destorg; dc_dest = (ylookup[y1] + start_x) * pixelsize + dc_destorg;
dc_count = y2 - y1; dc_count = y2 - y1;
uint32_t solid_top = frontskytex->GetSWSkyCapColor(false); uint32_t solid_top = frontskytex->GetSkyCapColor(false);
uint32_t solid_bottom = frontskytex->GetSWSkyCapColor(true); uint32_t solid_bottom = frontskytex->GetSkyCapColor(true);
if (r_swtruecolor) if (r_swtruecolor)
{ {

14
src/textures/texture.cpp
View file

@ -862,9 +862,9 @@ namespace
} }
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
{ {
r += BPART(data[i]); b += BPART(data[i]);
g += GPART(data[i]); g += GPART(data[i]);
b += RPART(data[i]); r += RPART(data[i]);
} }
r = r / size; r = r / size;
@ -883,7 +883,7 @@ namespace
} }
} }
PalEntry FTexture::GetSWSkyCapColor(bool bottom) PalEntry FTexture::GetSkyCapColor(bool bottom)
{ {
PalEntry col; PalEntry col;
int w; int w;
@ -902,15 +902,15 @@ PalEntry FTexture::GetSWSkyCapColor(bool bottom)
const uint32_t *buffer = (const uint32_t *)bitmap.GetPixels(); const uint32_t *buffer = (const uint32_t *)bitmap.GetPixels();
if (buffer) if (buffer)
{ {
SWCeilingSkyColor = averageColor((DWORD *)buffer, w * MIN(30, h), 0); CeilingSkyColor = averageColor((DWORD *)buffer, w * MIN(30, h), 0);
if (h>30) if (h>30)
{ {
SWFloorSkyColor = averageColor(((DWORD *)buffer) + (h - 30)*w, w * 30, 0); FloorSkyColor = averageColor(((DWORD *)buffer) + (h - 30)*w, w * 30, 0);
} }
else SWFloorSkyColor = SWCeilingSkyColor; else FloorSkyColor = CeilingSkyColor;
} }
} }
return bottom ? SWFloorSkyColor : SWCeilingSkyColor; return bottom ? FloorSkyColor : CeilingSkyColor;
} }

6
src/textures/textures.h
View file

@ -272,7 +272,7 @@ public:
} }
void SetScaledSize(int fitwidth, int fitheight); void SetScaledSize(int fitwidth, int fitheight);
PalEntry GetSWSkyCapColor(bool bottom); PalEntry GetSkyCapColor(bool bottom);
virtual void HackHack (int newheight); // called by FMultipatchTexture to discover corrupt patches. virtual void HackHack (int newheight); // called by FMultipatchTexture to discover corrupt patches.
@ -306,8 +306,8 @@ protected:
private: private:
bool bSWSkyColorDone = false; bool bSWSkyColorDone = false;
PalEntry SWFloorSkyColor; PalEntry FloorSkyColor;
PalEntry SWCeilingSkyColor; PalEntry CeilingSkyColor;
public: public:
static void FlipSquareBlock (BYTE *block, int x, int y); static void FlipSquareBlock (BYTE *block, int x, int y);