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

Merge http://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
raa-eruanna 2016-09-28 06:40:56 -04:00
commit dd9881b5fa
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/data/gl_vertexbuffer.cpp
View file

@ -221,7 +221,7 @@ void FFlatVertexBuffer::OutputResized(int width, int height)
vbo_shadowdata[7].Set((float)width, (float)height, 0, 0, 0); vbo_shadowdata[7].Set((float)width, (float)height, 0, 0, 0);
Map(); Map();
memcpy(map, &vbo_shadowdata[4], 4 * sizeof(FFlatVertex)); memcpy(&map[4], &vbo_shadowdata[4], 4 * sizeof(FFlatVertex));
Unmap(); Unmap();
} }

4
src/gl/system/gl_framebuffer.cpp
View file

@ -189,7 +189,9 @@ void OpenGLFrameBuffer::Update()
int clientHeight = GetClientHeight(); int clientHeight = GetClientHeight();
if (clientWidth > 0 && clientHeight > 0 && (Width != clientWidth || Height != clientHeight)) if (clientWidth > 0 && clientHeight > 0 && (Width != clientWidth || Height != clientHeight))
{ {
Resize(clientWidth, clientHeight); // Do not call Resize here because it's only for software canvases
Pitch = Width = clientWidth;
Height = clientHeight;
V_OutputResized(Width, Height); V_OutputResized(Width, Height);
GLRenderer->mVBO->OutputResized(Width, Height); GLRenderer->mVBO->OutputResized(Width, Height);
} }

2
src/p_acs.cpp
View file

@ -754,7 +754,7 @@ void ACSStringPool::ReadStrings(FSerializer &file, const char *key)
unsigned bucketnum = h % NUM_BUCKETS; unsigned bucketnum = h % NUM_BUCKETS;
Pool[ii].Hash = h; Pool[ii].Hash = h;
Pool[ii].Next = PoolBuckets[bucketnum]; Pool[ii].Next = PoolBuckets[bucketnum];
PoolBuckets[bucketnum] = i; PoolBuckets[bucketnum] = ii;
} }
file.EndObject(); file.EndObject();
} }

2
src/p_floor.cpp
View file

@ -342,7 +342,7 @@ bool P_CreateFloor(sector_t *sec, DFloor::EFloor floortype, line_t *line,
ceilingheight = sec->FindLowestCeilingPoint(&spot2); ceilingheight = sec->FindLowestCeilingPoint(&spot2);
floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight); floor->m_FloorDestDist = sec->floorplane.PointToDist(spot, newheight);
if (sec->floorplane.ZatPointDist(spot2, floor->m_FloorDestDist) > ceilingheight) if (sec->floorplane.ZatPointDist(spot2, floor->m_FloorDestDist) > ceilingheight)
floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2, floortype == ceilingheight - height); floor->m_FloorDestDist = sec->floorplane.PointToDist(spot2, ceilingheight - height);
break; break;
case DFloor::floorRaiseToHighest: case DFloor::floorRaiseToHighest: