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

- adjustments in GL code.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-25 15:14:09 +01:00
parent ad74493d5e
commit b958a5d748
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gl/dynlights/a_dynlight.cpp
View file

@ -575,7 +575,7 @@ void ADynamicLight::CollectWithinRadius(const fixedvec3 &pos, subsector_t *subSe
if (other->validcount != ::validcount) if (other->validcount != ::validcount)
{ {
subsector_t *othersub = R_PointInSubsector(other->v1->x + other->dx / 2, other->v1->y + other->dy / 2); subsector_t *othersub = R_PointInSubsector(other->v1->x + other->dx / 2, other->v1->y + other->dy / 2);
if (othersub->validcount != ::validcount) CollectWithinRadius(PosRelative(other), othersub, radius); if (othersub->validcount != ::validcount) CollectWithinRadius(_f_PosRelative(other), othersub, radius);
} }
} }
} }
@ -603,7 +603,7 @@ void ADynamicLight::CollectWithinRadius(const fixedvec3 &pos, subsector_t *subSe
{ {
fixedvec2 refpos = { other->v1->x + other->dx / 2 + FLOAT2FIXED(sb->Scale.X), other->v1->y + other->dy / 2 + FLOAT2FIXED(sb->Scale.Y) }; fixedvec2 refpos = { other->v1->x + other->dx / 2 + FLOAT2FIXED(sb->Scale.X), other->v1->y + other->dy / 2 + FLOAT2FIXED(sb->Scale.Y) };
subsector_t *othersub = R_PointInSubsector(refpos.x, refpos.y); subsector_t *othersub = R_PointInSubsector(refpos.x, refpos.y);
if (othersub->validcount != ::validcount) CollectWithinRadius(PosRelative(othersub->sector), othersub, radius); if (othersub->validcount != ::validcount) CollectWithinRadius(_f_PosRelative(othersub->sector), othersub, radius);
} }
} }
if (!subSec->sector->PortalBlocksSight(sector_t::floor)) if (!subSec->sector->PortalBlocksSight(sector_t::floor))
@ -614,7 +614,7 @@ void ADynamicLight::CollectWithinRadius(const fixedvec3 &pos, subsector_t *subSe
{ {
fixedvec2 refpos = { other->v1->x + other->dx / 2 + FLOAT2FIXED(sb->Scale.X), other->v1->y + other->dy / 2 + FLOAT2FIXED(sb->Scale.Y) }; fixedvec2 refpos = { other->v1->x + other->dx / 2 + FLOAT2FIXED(sb->Scale.X), other->v1->y + other->dy / 2 + FLOAT2FIXED(sb->Scale.Y) };
subsector_t *othersub = R_PointInSubsector(refpos.x, refpos.y); subsector_t *othersub = R_PointInSubsector(refpos.x, refpos.y);
if (othersub->validcount != ::validcount) CollectWithinRadius(PosRelative(othersub->sector), othersub, radius); if (othersub->validcount != ::validcount) CollectWithinRadius(_f_PosRelative(othersub->sector), othersub, radius);
} }
} }
} }

2
src/gl/dynlights/gl_dynlight1.cpp
View file

@ -90,7 +90,7 @@ bool gl_GetLight(int group, Plane & p, ADynamicLight * light, bool checkside, bo
Vector fn, pos; Vector fn, pos;
int i = 0; int i = 0;
fixedvec3 lpos = light->PosRelative(group); fixedvec3 lpos = light->_f_PosRelative(group);
float x = FIXED2FLOAT(lpos.x); float x = FIXED2FLOAT(lpos.x);
float y = FIXED2FLOAT(lpos.y); float y = FIXED2FLOAT(lpos.y);
float z = FIXED2FLOAT(lpos.z); float z = FIXED2FLOAT(lpos.z);

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

@ -485,7 +485,7 @@ void OpenGLFrameBuffer::Clear(int left, int top, int right, int bottom, int palc
void OpenGLFrameBuffer::FillSimplePoly(FTexture *texture, FVector2 *points, int npoints, void OpenGLFrameBuffer::FillSimplePoly(FTexture *texture, FVector2 *points, int npoints,
double originx, double originy, double scalex, double scaley, double originx, double originy, double scalex, double scaley,
angle_t rotation, FDynamicColormap *colormap, int lightlevel) DAngle rotation, FDynamicColormap *colormap, int lightlevel)
{ {
if (GLRenderer != NULL) if (GLRenderer != NULL)
{ {

2
src/gl/system/gl_framebuffer.h
View file

@ -68,7 +68,7 @@ public:
void FillSimplePoly(FTexture *tex, FVector2 *points, int npoints, void FillSimplePoly(FTexture *tex, FVector2 *points, int npoints,
double originx, double originy, double scalex, double scaley, double originx, double originy, double scalex, double scaley,
angle_t rotation, FDynamicColormap *colormap, int lightlevel); DAngle rotation, FDynamicColormap *colormap, int lightlevel);
FNativePalette *CreatePalette(FRemapTable *remap); FNativePalette *CreatePalette(FRemapTable *remap);