zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 15:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add functions to CameraLight

Browse source
This commit is contained in:
Magnus Norddahl 2017-02-03 09:00:46 +01:00
parent a0a40281b3
commit 892350ac2e
25 changed files with 83 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1409,7 +1409,7 @@ void OpenGLSWFrameBuffer::Draw3DPart(bool copy3d)
uint32_t color0, color1; uint32_t color0, color1;
if (Accel2D) if (Accel2D)
{ {
auto &map = swrenderer::CameraLight::Instance()->realfixedcolormap; auto map = swrenderer::CameraLight::Instance()->ShaderColormap();
if (map == nullptr) if (map == nullptr)
{ {
color0 = 0; color0 = 0;

4
src/polyrenderer/poly_renderer.cpp
View file

@ -69,10 +69,10 @@ void PolyRenderer::RenderView(player_t *player)
// Apply special colormap if the target cannot do it // Apply special colormap if the target cannot do it
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->realfixedcolormap && viewport->RenderTarget->IsBgra() && !(r_shadercolormaps && screen->Accel2D)) if (cameraLight->ShaderColormap() && viewport->RenderTarget->IsBgra() && !(r_shadercolormaps && screen->Accel2D))
{ {
R_BeginDrawerCommands(); R_BeginDrawerCommands();
DrawerCommandQueue::QueueCommand<ApplySpecialColormapRGBACommand>(cameraLight->realfixedcolormap, screen); DrawerCommandQueue::QueueCommand<ApplySpecialColormapRGBACommand>(cameraLight->ShaderColormap(), screen);
R_EndDrawerCommands(); R_EndDrawerCommands();
} }
} }

2
src/polyrenderer/scene/poly_decal.cpp
View file

@ -140,7 +140,7 @@ void RenderPolyDecal::Render(const TriMatrix &worldToClip, const Vec4f &clipPlan
args.SetColormap(front->ColorMap); args.SetColormap(front->ColorMap);
args.SetTexture(tex, decal->Translation, true); args.SetTexture(tex, decal->Translation, true);
args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->WallGlobVis(); args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->WallGlobVis();
if (fullbrightSprite || cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (fullbrightSprite || cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
{ {
args.uniforms.light = 256; args.uniforms.light = 256;
args.uniforms.flags |= TriUniforms::fixed_light; args.uniforms.flags |= TriUniforms::fixed_light;

2
src/polyrenderer/scene/poly_particle.cpp
View file

@ -76,7 +76,7 @@ void RenderPolyParticle::Render(const TriMatrix &worldToClip, const Vec4f &clipP
args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->ParticleGlobVis(); args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->ParticleGlobVis();
if (fullbrightSprite || cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (fullbrightSprite || cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
{ {
args.uniforms.light = 256; args.uniforms.light = 256;
args.uniforms.flags = TriUniforms::fixed_light; args.uniforms.flags = TriUniforms::fixed_light;

6
src/polyrenderer/scene/poly_plane.cpp
View file

@ -99,7 +99,7 @@ void RenderPolyPlane::Render3DFloor(const TriMatrix &worldToClip, const Vec4f &c
swrenderer::CameraLight *cameraLight = swrenderer::CameraLight::Instance(); swrenderer::CameraLight *cameraLight = swrenderer::CameraLight::Instance();
int lightlevel = 255; int lightlevel = 255;
if (cameraLight->fixedlightlev < 0 && sub->sector->e->XFloor.lightlist.Size()) if (cameraLight->FixedLightLevel() < 0 && sub->sector->e->XFloor.lightlist.Size())
{ {
lightlist_t *light = P_GetPlaneLight(sub->sector, &sub->sector->ceilingplane, false); lightlist_t *light = P_GetPlaneLight(sub->sector, &sub->sector->ceilingplane, false);
//basecolormap = light->extra_colormap; //basecolormap = light->extra_colormap;
@ -111,7 +111,7 @@ void RenderPolyPlane::Render3DFloor(const TriMatrix &worldToClip, const Vec4f &c
PolyDrawArgs args; PolyDrawArgs args;
args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->SlopePlaneGlobVis() * 48.0f; args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->SlopePlaneGlobVis() * 48.0f;
args.uniforms.light = (uint32_t)(lightlevel / 255.0f * 256.0f); args.uniforms.light = (uint32_t)(lightlevel / 255.0f * 256.0f);
if (cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
args.uniforms.light = 256; args.uniforms.light = 256;
args.uniforms.flags = 0; args.uniforms.flags = 0;
args.uniforms.subsectorDepth = subsectorDepth; args.uniforms.subsectorDepth = subsectorDepth;
@ -307,7 +307,7 @@ void RenderPolyPlane::Render(const TriMatrix &worldToClip, const Vec4f &clipPlan
PolyDrawArgs args; PolyDrawArgs args;
args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->SlopePlaneGlobVis() * 48.0f; args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->SlopePlaneGlobVis() * 48.0f;
args.uniforms.light = (uint32_t)(frontsector->lightlevel / 255.0f * 256.0f); args.uniforms.light = (uint32_t)(frontsector->lightlevel / 255.0f * 256.0f);
if (cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
args.uniforms.light = 256; args.uniforms.light = 256;
args.uniforms.flags = 0; args.uniforms.flags = 0;
args.uniforms.subsectorDepth = isSky ? RenderPolyScene::SkySubsectorDepth : subsectorDepth; args.uniforms.subsectorDepth = isSky ? RenderPolyScene::SkySubsectorDepth : subsectorDepth;

4
src/polyrenderer/scene/poly_playersprite.cpp
View file

@ -329,14 +329,14 @@ void RenderPolyPlayerSprites::RenderSprite(DPSprite *sprite, AActor *owner, floa
// If the main colormap has fixed lights, and this sprite is being drawn with that // If the main colormap has fixed lights, and this sprite is being drawn with that
// colormap, disable acceleration so that the lights can remain fixed. // colormap, disable acceleration so that the lights can remain fixed.
swrenderer::CameraLight *cameraLight = swrenderer::CameraLight::Instance(); swrenderer::CameraLight *cameraLight = swrenderer::CameraLight::Instance();
if (!noaccel && cameraLight->realfixedcolormap == nullptr && if (!noaccel && cameraLight->ShaderColormap() == nullptr &&
NormalLightHasFixedLights && mybasecolormap == &NormalLight && NormalLightHasFixedLights && mybasecolormap == &NormalLight &&
tex->UseBasePalette()) tex->UseBasePalette())
{ {
noaccel = true; noaccel = true;
} }
// [SP] If emulating GZDoom fullbright, disable acceleration // [SP] If emulating GZDoom fullbright, disable acceleration
if (r_fullbrightignoresectorcolor && cameraLight->fixedlightlev >= 0) if (r_fullbrightignoresectorcolor && cameraLight->FixedLightLevel() >= 0)
mybasecolormap = &FullNormalLight; mybasecolormap = &FullNormalLight;
if (r_fullbrightignoresectorcolor && !foggy && sprite->GetState()->GetFullbright()) if (r_fullbrightignoresectorcolor && !foggy && sprite->GetState()->GetFullbright())
mybasecolormap = &FullNormalLight; mybasecolormap = &FullNormalLight;

2
src/polyrenderer/scene/poly_sprite.cpp
View file

@ -141,7 +141,7 @@ void RenderPolySprite::Render(const TriMatrix &worldToClip, const Vec4f &clipPla
PolyDrawArgs args; PolyDrawArgs args;
args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->SpriteGlobVis(); args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->SpriteGlobVis();
args.uniforms.flags = 0; args.uniforms.flags = 0;
if (fullbrightSprite || cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (fullbrightSprite || cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
{ {
args.uniforms.light = 256; args.uniforms.light = 256;
args.uniforms.flags |= TriUniforms::fixed_light; args.uniforms.flags |= TriUniforms::fixed_light;

2
src/polyrenderer/scene/poly_wall.cpp
View file

@ -353,7 +353,7 @@ FTexture *RenderPolyWall::GetTexture()
int RenderPolyWall::GetLightLevel() int RenderPolyWall::GetLightLevel()
{ {
swrenderer::CameraLight *cameraLight = swrenderer::CameraLight::Instance(); swrenderer::CameraLight *cameraLight = swrenderer::CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
{ {
return 255; return 255;
} }

2
src/polyrenderer/scene/poly_wallsprite.cpp
View file

@ -102,7 +102,7 @@ void RenderPolyWallSprite::Render(const TriMatrix &worldToClip, const Vec4f &cli
PolyDrawArgs args; PolyDrawArgs args;
args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->WallGlobVis(); args.uniforms.globvis = (float)swrenderer::LightVisibility::Instance()->WallGlobVis();
if (fullbrightSprite || cameraLight->fixedlightlev >= 0 || cameraLight->fixedcolormap) if (fullbrightSprite || cameraLight->FixedLightLevel() >= 0 || cameraLight->FixedColormap())
{ {
args.uniforms.light = 256; args.uniforms.light = 256;
args.uniforms.flags = TriUniforms::fixed_light; args.uniforms.flags = TriUniforms::fixed_light;

12
src/swrenderer/line/r_line.cpp
View file

@ -899,7 +899,7 @@ namespace swrenderer
walltexcoords.Project(sidedef->TexelLength * lwallscale, WallC.sx1, WallC.sx2, WallT); walltexcoords.Project(sidedef->TexelLength * lwallscale, WallC.sx1, WallC.sx2, WallT);
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedcolormap == nullptr && cameraLight->fixedlightlev < 0) if (cameraLight->FixedColormap() == nullptr && cameraLight->FixedLightLevel() < 0)
{ {
wallshade = LIGHT2SHADE(curline->sidedef->GetLightLevel(foggy, frontsector->lightlevel) + R_ActualExtraLight(foggy)); wallshade = LIGHT2SHADE(curline->sidedef->GetLightLevel(foggy, frontsector->lightlevel) + R_ActualExtraLight(foggy));
double GlobVis = LightVisibility::Instance()->WallGlobVis(); double GlobVis = LightVisibility::Instance()->WallGlobVis();
@ -916,7 +916,7 @@ namespace swrenderer
bool SWRenderLine::IsFogBoundary(sector_t *front, sector_t *back) const bool SWRenderLine::IsFogBoundary(sector_t *front, sector_t *back) const
{ {
return r_fogboundary && CameraLight::Instance()->fixedcolormap == nullptr && front->ColorMap->Fade && return r_fogboundary && CameraLight::Instance()->FixedColormap() == nullptr && front->ColorMap->Fade &&
front->ColorMap->Fade != back->ColorMap->Fade && front->ColorMap->Fade != back->ColorMap->Fade &&
(front->GetTexture(sector_t::ceiling) != skyflatnum || back->GetTexture(sector_t::ceiling) != skyflatnum); (front->GetTexture(sector_t::ceiling) != skyflatnum || back->GetTexture(sector_t::ceiling) != skyflatnum);
} }
@ -935,10 +935,10 @@ namespace swrenderer
drawerargs.SetStyle(false, false, OPAQUE); drawerargs.SetStyle(false, false, OPAQUE);
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
else if (cameraLight->fixedcolormap != nullptr) else if (cameraLight->FixedColormap() != nullptr)
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
// clip wall to the floor and ceiling // clip wall to the floor and ceiling
auto ceilingclip = RenderOpaquePass::Instance()->ceilingclip; auto ceilingclip = RenderOpaquePass::Instance()->ceilingclip;

28
src/swrenderer/line/r_renderdrawsegment.cpp
View file

@ -106,7 +106,7 @@ namespace swrenderer
Clip3DFloors *clip3d = Clip3DFloors::Instance(); Clip3DFloors *clip3d = Clip3DFloors::Instance();
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev < 0) if (cameraLight->FixedLightLevel() < 0)
{ {
if (!(clip3d->fake3D & FAKE3D_CLIPTOP)) if (!(clip3d->fake3D & FAKE3D_CLIPTOP))
{ {
@ -148,15 +148,15 @@ namespace swrenderer
spryscale = ds->iscale + ds->iscalestep * (x1 - ds->x1); spryscale = ds->iscale + ds->iscalestep * (x1 - ds->x1);
rw_scalestep = ds->iscalestep; rw_scalestep = ds->iscalestep;
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
{ {
walldrawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); walldrawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
columndrawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); columndrawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
} }
else if (cameraLight->fixedcolormap != nullptr) else if (cameraLight->FixedColormap() != nullptr)
{ {
walldrawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); walldrawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
columndrawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); columndrawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
} }
// find positioning // find positioning
@ -284,7 +284,7 @@ namespace swrenderer
{ {
for (int x = x1; x < x2; ++x) for (int x = x1; x < x2; ++x)
{ {
if (cameraLight->fixedcolormap == nullptr && cameraLight->fixedlightlev < 0) if (cameraLight->FixedColormap() == nullptr && cameraLight->FixedLightLevel() < 0)
{ {
columndrawerargs.SetLight(basecolormap, rw_light, wallshade); columndrawerargs.SetLight(basecolormap, rw_light, wallshade);
} }
@ -456,10 +456,10 @@ namespace swrenderer
} }
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
else if (cameraLight->fixedcolormap != nullptr) else if (cameraLight->FixedColormap() != nullptr)
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
WallC.sz1 = ds->sz1; WallC.sz1 = ds->sz1;
WallC.sz2 = ds->sz2; WallC.sz2 = ds->sz2;
@ -682,7 +682,7 @@ namespace swrenderer
FDynamicColormap *basecolormap = frontsector->ColorMap; FDynamicColormap *basecolormap = frontsector->ColorMap;
wallshade = ds->shade; wallshade = ds->shade;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev < 0) if (cameraLight->FixedLightLevel() < 0)
{ {
if ((ds->bFakeBoundary & 3) == 2) if ((ds->bFakeBoundary & 3) == 2)
{ {
@ -857,7 +857,7 @@ namespace swrenderer
FDynamicColormap *basecolormap = frontsector->ColorMap; FDynamicColormap *basecolormap = frontsector->ColorMap;
wallshade = ds->shade; wallshade = ds->shade;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev < 0) if (cameraLight->FixedLightLevel() < 0)
{ {
if ((ds->bFakeBoundary & 3) == 2) if ((ds->bFakeBoundary & 3) == 2)
{ {

8
src/swrenderer/line/r_walldraw.cpp
View file

@ -323,10 +323,10 @@ namespace swrenderer
drawerargs.SetTextureFracBits(RenderViewport::Instance()->RenderTarget->IsBgra() ? FRACBITS : fracbits); drawerargs.SetTextureFracBits(RenderViewport::Instance()->RenderTarget->IsBgra() ? FRACBITS : fracbits);
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
bool fixed = (cameraLight->fixedcolormap != NULL || cameraLight->fixedlightlev >= 0); bool fixed = (cameraLight->FixedColormap() != NULL || cameraLight->FixedLightLevel() >= 0);
if (cameraLight->fixedcolormap) if (cameraLight->FixedColormap())
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
else else
drawerargs.SetLight(basecolormap, 0, 0); drawerargs.SetLight(basecolormap, 0, 0);
@ -410,7 +410,7 @@ namespace swrenderer
} }
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedcolormap != NULL || cameraLight->fixedlightlev >= 0 || !(frontsector->e && frontsector->e->XFloor.lightlist.Size())) if (cameraLight->FixedColormap() != NULL || cameraLight->FixedLightLevel() >= 0 || !(frontsector->e && frontsector->e->XFloor.lightlist.Size()))
{ {
ProcessNormalWall(uwal, dwal, texturemid, swal, lwal); ProcessNormalWall(uwal, dwal, texturemid, swal, lwal);
} }

8
src/swrenderer/plane/r_flatplane.cpp
View file

@ -112,14 +112,14 @@ namespace swrenderer
GlobVis = LightVisibility::Instance()->FlatPlaneGlobVis() / planeheight; GlobVis = LightVisibility::Instance()->FlatPlaneGlobVis() / planeheight;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
{ {
drawerargs.SetLight(basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); drawerargs.SetLight(basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
plane_shade = false; plane_shade = false;
} }
else if (cameraLight->fixedcolormap) else if (cameraLight->FixedColormap())
{ {
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
plane_shade = false; plane_shade = false;
} }
else else

4
src/swrenderer/plane/r_skyplane.cpp
View file

@ -148,9 +148,9 @@ namespace swrenderer
} }
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedcolormap) if (cameraLight->FixedColormap())
{ {
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
} }
else else
{ {

8
src/swrenderer/plane/r_slopeplane.cpp
View file

@ -154,14 +154,14 @@ namespace swrenderer
basecolormap = colormap; basecolormap = colormap;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
{ {
drawerargs.SetLight(basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); drawerargs.SetLight(basecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
plane_shade = false; plane_shade = false;
} }
else if (cameraLight->fixedcolormap) else if (cameraLight->FixedColormap())
{ {
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
plane_shade = false; plane_shade = false;
} }
else else

8
src/swrenderer/scene/r_light.cpp
View file

@ -189,15 +189,15 @@ namespace swrenderer
} }
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedcolormap) if (cameraLight->FixedColormap())
{ {
BaseColormap = cameraLight->fixedcolormap; BaseColormap = cameraLight->FixedColormap();
ColormapNum = 0; ColormapNum = 0;
} }
else if (cameraLight->fixedlightlev >= 0) else if (cameraLight->FixedLightLevel() >= 0)
{ {
BaseColormap = (r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap; BaseColormap = (r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap;
ColormapNum = cameraLight->fixedlightlev >> COLORMAPSHIFT; ColormapNum = cameraLight->FixedLightLevel() >> COLORMAPSHIFT;
} }
else if (fullbright) else if (fullbright)
{ {

10
src/swrenderer/scene/r_light.h
View file

@ -59,11 +59,17 @@ namespace swrenderer
public: public:
static CameraLight *Instance(); static CameraLight *Instance();
int FixedLightLevel() const { return fixedlightlev; }
FSWColormap *FixedColormap() const { return fixedcolormap; }
FSpecialColormap *ShaderColormap() const { return realfixedcolormap; }
void SetCamera(AActor *actor);
void ClearShaderColormap() { realfixedcolormap = nullptr; }
private:
int fixedlightlev = 0; int fixedlightlev = 0;
FSWColormap *fixedcolormap = nullptr; FSWColormap *fixedcolormap = nullptr;
FSpecialColormap *realfixedcolormap = nullptr; FSpecialColormap *realfixedcolormap = nullptr;
void SetCamera(AActor *actor);
}; };
class LightVisibility class LightVisibility

12
src/swrenderer/scene/r_opaque_pass.cpp
View file

@ -483,7 +483,7 @@ namespace swrenderer
// kg3D - fake lights // kg3D - fake lights
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
FDynamicColormap *basecolormap; FDynamicColormap *basecolormap;
if (cameraLight->fixedlightlev < 0 && frontsector->e && frontsector->e->XFloor.lightlist.Size()) if (cameraLight->FixedLightLevel() < 0 && frontsector->e && frontsector->e->XFloor.lightlist.Size())
{ {
light = P_GetPlaneLight(frontsector, &frontsector->ceilingplane, false); light = P_GetPlaneLight(frontsector, &frontsector->ceilingplane, false);
basecolormap = light->extra_colormap; basecolormap = light->extra_colormap;
@ -496,7 +496,7 @@ namespace swrenderer
} }
else else
{ {
basecolormap = (r_fullbrightignoresectorcolor && cameraLight->fixedlightlev >= 0) ? &FullNormalLight : frontsector->ColorMap; basecolormap = (r_fullbrightignoresectorcolor && cameraLight->FixedLightLevel() >= 0) ? &FullNormalLight : frontsector->ColorMap;
} }
portal = frontsector->ValidatePortal(sector_t::ceiling); portal = frontsector->ValidatePortal(sector_t::ceiling);
@ -521,7 +521,7 @@ namespace swrenderer
if (ceilingplane) if (ceilingplane)
ceilingplane->AddLights(frontsector->lighthead); ceilingplane->AddLights(frontsector->lighthead);
if (cameraLight->fixedlightlev < 0 && frontsector->e && frontsector->e->XFloor.lightlist.Size()) if (cameraLight->FixedLightLevel() < 0 && frontsector->e && frontsector->e->XFloor.lightlist.Size())
{ {
light = P_GetPlaneLight(frontsector, &frontsector->floorplane, false); light = P_GetPlaneLight(frontsector, &frontsector->floorplane, false);
basecolormap = light->extra_colormap; basecolormap = light->extra_colormap;
@ -534,7 +534,7 @@ namespace swrenderer
} }
else else
{ {
basecolormap = (r_fullbrightignoresectorcolor && cameraLight->fixedlightlev >= 0) ? &FullNormalLight : frontsector->ColorMap; basecolormap = (r_fullbrightignoresectorcolor && cameraLight->FixedLightLevel() >= 0) ? &FullNormalLight : frontsector->ColorMap;
} }
// killough 3/7/98: Add (x,y) offsets to flats, add deep water check // killough 3/7/98: Add (x,y) offsets to flats, add deep water check
@ -606,7 +606,7 @@ namespace swrenderer
else position = sector_t::floor; else position = sector_t::floor;
frontsector = &tempsec; frontsector = &tempsec;
if (cameraLight->fixedlightlev < 0 && sub->sector->e->XFloor.lightlist.Size()) if (cameraLight->FixedLightLevel() < 0 && sub->sector->e->XFloor.lightlist.Size())
{ {
light = P_GetPlaneLight(sub->sector, &frontsector->floorplane, false); light = P_GetPlaneLight(sub->sector, &frontsector->floorplane, false);
basecolormap = light->extra_colormap; basecolormap = light->extra_colormap;
@ -671,7 +671,7 @@ namespace swrenderer
frontsector = &tempsec; frontsector = &tempsec;
tempsec.ceilingplane.ChangeHeight(-1 / 65536.); tempsec.ceilingplane.ChangeHeight(-1 / 65536.);
if (cameraLight->fixedlightlev < 0 && sub->sector->e->XFloor.lightlist.Size()) if (cameraLight->FixedLightLevel() < 0 && sub->sector->e->XFloor.lightlist.Size())
{ {
light = P_GetPlaneLight(sub->sector, &frontsector->ceilingplane, false); light = P_GetPlaneLight(sub->sector, &frontsector->ceilingplane, false);
basecolormap = light->extra_colormap; basecolormap = light->extra_colormap;

6
src/swrenderer/scene/r_scene.cpp
View file

@ -98,9 +98,9 @@ namespace swrenderer
RenderActorView(player->mo); RenderActorView(player->mo);
// Apply special colormap if the target cannot do it // Apply special colormap if the target cannot do it
if (CameraLight::Instance()->realfixedcolormap && viewport->RenderTarget->IsBgra() && !(r_shadercolormaps && screen->Accel2D)) if (CameraLight::Instance()->ShaderColormap() && viewport->RenderTarget->IsBgra() && !(r_shadercolormaps && screen->Accel2D))
{ {
DrawerCommandQueue::QueueCommand<ApplySpecialColormapRGBACommand>(CameraLight::Instance()->realfixedcolormap, screen); DrawerCommandQueue::QueueCommand<ApplySpecialColormapRGBACommand>(CameraLight::Instance()->ShaderColormap(), screen);
} }
R_EndDrawerCommands(); R_EndDrawerCommands();
@ -185,7 +185,7 @@ namespace swrenderer
// copy to the screen does not use a special colormap shader. // copy to the screen does not use a special colormap shader.
if (!r_shadercolormaps && !RenderViewport::Instance()->RenderTarget->IsBgra()) if (!r_shadercolormaps && !RenderViewport::Instance()->RenderTarget->IsBgra())
{ {
CameraLight::Instance()->realfixedcolormap = NULL; CameraLight::Instance()->ClearShaderColormap();
} }
} }

8
src/swrenderer/things/r_decal.cpp
View file

@ -277,10 +277,10 @@ namespace swrenderer
SpriteDrawerArgs drawerargs; SpriteDrawerArgs drawerargs;
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
else if (cameraLight->fixedcolormap != NULL) else if (cameraLight->FixedColormap() != NULL)
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
else if (!foggy && (decal->RenderFlags & RF_FULLBRIGHT)) else if (!foggy && (decal->RenderFlags & RF_FULLBRIGHT))
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, 0); drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, 0);
else else

4
src/swrenderer/things/r_playersprite.cpp
View file

@ -91,7 +91,7 @@ namespace swrenderer
FDynamicColormap *basecolormap; FDynamicColormap *basecolormap;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev < 0 && viewsector->e && viewsector->e->XFloor.lightlist.Size()) if (cameraLight->FixedLightLevel() < 0 && viewsector->e && viewsector->e->XFloor.lightlist.Size())
{ {
for (i = viewsector->e->XFloor.lightlist.Size() - 1; i >= 0; i--) for (i = viewsector->e->XFloor.lightlist.Size() - 1; i >= 0; i--)
{ {
@ -486,7 +486,7 @@ namespace swrenderer
// If the main colormap has fixed lights, and this sprite is being drawn with that // If the main colormap has fixed lights, and this sprite is being drawn with that
// colormap, disable acceleration so that the lights can remain fixed. // colormap, disable acceleration so that the lights can remain fixed.
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (!noaccel && cameraLight->realfixedcolormap == nullptr && if (!noaccel && cameraLight->ShaderColormap() == nullptr &&
NormalLightHasFixedLights && vis.Light.BaseColormap == &NormalLight && NormalLightHasFixedLights && vis.Light.BaseColormap == &NormalLight &&
vis.pic->UseBasePalette()) vis.pic->UseBasePalette())
{ {

2
src/swrenderer/things/r_visiblesprite.cpp
View file

@ -87,7 +87,7 @@ namespace swrenderer
// kg3D - correct colors now // kg3D - correct colors now
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (!cameraLight->fixedcolormap && cameraLight->fixedlightlev < 0 && spr->sector->e && spr->sector->e->XFloor.lightlist.Size()) if (!cameraLight->FixedColormap() && cameraLight->FixedLightLevel() < 0 && spr->sector->e && spr->sector->e->XFloor.lightlist.Size())
{ {
if (!(clip3d->fake3D & FAKE3D_CLIPTOP)) if (!(clip3d->fake3D & FAKE3D_CLIPTOP))
{ {

8
src/swrenderer/things/r_wallsprite.cpp
View file

@ -187,10 +187,10 @@ namespace swrenderer
float lightstep = float((GlobVis / spr->wallc.sz2 - lightleft) / (spr->wallc.sx2 - spr->wallc.sx1)); float lightstep = float((GlobVis / spr->wallc.sz2 - lightleft) / (spr->wallc.sx2 - spr->wallc.sx1));
float light = lightleft + (x1 - spr->wallc.sx1) * lightstep; float light = lightleft + (x1 - spr->wallc.sx1) * lightstep;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0) if (cameraLight->FixedLightLevel() >= 0)
drawerargs.SetLight(usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); drawerargs.SetLight(usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel()));
else if (cameraLight->fixedcolormap != NULL) else if (cameraLight->FixedColormap() != NULL)
drawerargs.SetLight(cameraLight->fixedcolormap, 0, 0); drawerargs.SetLight(cameraLight->FixedColormap(), 0, 0);
else if (!spr->foggy && (spr->renderflags & RF_FULLBRIGHT)) else if (!spr->foggy && (spr->renderflags & RF_FULLBRIGHT))
drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, 0); drawerargs.SetLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, 0);
else else

6
src/swrenderer/viewport/r_spritedrawer.cpp
View file

@ -436,12 +436,12 @@ namespace swrenderer
colfunc = &SWPixelFormatDrawers::DrawShadedColumn; colfunc = &SWPixelFormatDrawers::DrawShadedColumn;
drawer_needs_pal_input = true; drawer_needs_pal_input = true;
CameraLight *cameraLight = CameraLight::Instance(); CameraLight *cameraLight = CameraLight::Instance();
dc_color = cameraLight->fixedcolormap ? cameraLight->fixedcolormap->Maps[APART(color)] : basecolormap->Maps[APART(color)]; dc_color = cameraLight->FixedColormap() ? cameraLight->FixedColormap()->Maps[APART(color)] : basecolormap->Maps[APART(color)];
basecolormap = &ShadeFakeColormap[16 - alpha]; basecolormap = &ShadeFakeColormap[16 - alpha];
if (cameraLight->fixedlightlev >= 0 && cameraLight->fixedcolormap == NULL) if (cameraLight->FixedLightLevel() >= 0 && !cameraLight->FixedColormap())
{ {
fixed_t shade = shadedlightshade; fixed_t shade = shadedlightshade;
if (shade == 0) FIXEDLIGHT2SHADE(cameraLight->fixedlightlev); if (shade == 0) FIXEDLIGHT2SHADE(cameraLight->FixedLightLevel());
SetLight(basecolormap, 0, shade); SetLight(basecolormap, 0, shade);
} }
else else

2
src/win32/fb_d3d9.cpp
View file

@ -1405,7 +1405,7 @@ void D3DFB::Draw3DPart(bool copy3d)
D3DCOLOR color0, color1; D3DCOLOR color0, color1;
if (Accel2D) if (Accel2D)
{ {
auto &map = swrenderer::CameraLight::Instance()->realfixedcolormap; auto map = swrenderer::CameraLight::Instance()->ShaderColormap();
if (map == NULL) if (map == NULL)
{ {
color0 = 0; color0 = 0;