diff --git a/src/playsim/a_corona.cpp b/src/playsim/a_corona.cpp index edeba7566f..0e0cb4a980 100644 --- a/src/playsim/a_corona.cpp +++ b/src/playsim/a_corona.cpp @@ -24,11 +24,9 @@ #include "a_corona.h" #include "a_dynlight.h" -#if 0 IMPLEMENT_CLASS(ACorona, false, false) void ACorona::Tick() { Super::Tick(); } -#endif \ No newline at end of file diff --git a/src/playsim/a_corona.h b/src/playsim/a_corona.h index c1863f8a2e..2c66f0a204 100644 --- a/src/playsim/a_corona.h +++ b/src/playsim/a_corona.h @@ -27,7 +27,6 @@ EXTERN_CVAR(Bool, gl_coronas) class AActor; -#if 0 class ACorona : public AActor { DECLARE_CLASS(ACorona, AActor) @@ -37,4 +36,3 @@ public: float CoronaFade = 0.0f; }; -#endif \ No newline at end of file diff --git a/src/playsim/actor.h b/src/playsim/actor.h index 6ebb7f1cd6..04b561521b 100644 --- a/src/playsim/actor.h +++ b/src/playsim/actor.h @@ -744,7 +744,7 @@ public: const double MinVel = EQUAL_EPSILON; // Map Object definition. -class AActor final : public DThinker +class AActor : public DThinker { DECLARE_CLASS_WITH_META (AActor, DThinker, PClassActor) HAS_OBJECT_POINTERS diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index 38786459ca..1d11c176d1 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp @@ -583,7 +583,6 @@ void HWDrawInfo::RenderPortal(HWPortal *p, FRenderState &state, bool usestencil) void HWDrawInfo::DrawCorona(FRenderState& state, ACorona* corona, double dist) { -#if 0 spriteframe_t* sprframe = &SpriteFrames[sprites[corona->sprite].spriteframes + (size_t)corona->SpawnState->GetFrame()]; FTextureID patch = sprframe->Texture[0]; if (!patch.isValid()) return; @@ -645,7 +644,6 @@ void HWDrawInfo::DrawCorona(FRenderState& state, ACorona* corona, double dist) vp[3].Set(x1, y1, 1.0f, u1, v1); state.Draw(DT_TriangleStrip, vertexindex, 4); -#endif } static ETraceStatus CheckForViewpointActor(FTraceResults& res, void* userdata) @@ -673,7 +671,6 @@ void HWDrawInfo::DrawCoronas(FRenderState& state) float timeElapsed = (screen->FrameTime - LastFrameTime) / 1000.0f; LastFrameTime = screen->FrameTime; -#if 0 for (ACorona* corona : Coronas) { auto cPos = corona->Vec3Offset(0., 0., corona->Height * 0.5); @@ -700,7 +697,6 @@ void HWDrawInfo::DrawCoronas(FRenderState& state) if (corona->CoronaFade > 0.0f) DrawCorona(state, corona, dist); } -#endif state.SetTextureMode(TM_NORMAL); screen->mViewpoints->Bind(state, vpIndex); @@ -720,10 +716,10 @@ void HWDrawInfo::EndDrawScene(sector_t * viewsector, FRenderState &state) { state.EnableFog(false); - /*if (gl_coronas && Coronas.Size() > 0) + if (gl_coronas && Coronas.Size() > 0) { DrawCoronas(state); - }*/ + } // [BB] HUD models need to be rendered here. const bool renderHUDModel = IsHUDModelForPlayerAvailable(players[consoleplayer].camera->player); diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.h b/src/rendering/hwrenderer/scene/hw_drawinfo.h index 68afcb2466..c24f7c0ca2 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.h +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.h @@ -151,7 +151,7 @@ struct HWDrawInfo TArray Portals; TArray Decals[2]; // the second slot is for mirrors which get rendered in a separate pass. TArray hudsprites; // These may just be stored by value. - //TArray Coronas; + TArray Coronas; uint64_t LastFrameTime = 0; TArray MissingUpperTextures; diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp index 7da37eac00..e8e75e00f7 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp @@ -707,13 +707,11 @@ void HWSprite::Process(HWDrawInfo *di, AActor* thing, sector_t * sector, area_t return; } -#if 0 if (thing->IsKindOf(NAME_Corona)) { di->Coronas.Push(static_cast(thing)); return; } -#endif const auto &vp = di->Viewpoint; AActor *camera = vp.camera; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 3c5e1c739f..fd9e8185a3 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -2629,7 +2629,7 @@ OptionMenu "OpenGLOptions" protected Option "$GLPREFMNU_SPRBILLFACECAMERA", gl_billboard_faces_camera, "OnOff" Option "$GLPREFMNU_PARTICLESTYLE", gl_particles_style, "Particles" Option "$GLPREFMNU_RENDERQUALITY", gl_seamless, "Precision" - //Option "$GLPREFMNU_CORONAS", gl_coronas, "OnOff" + Option "$GLPREFMNU_CORONAS", gl_coronas, "OnOff" StaticText " " Slider "$GLPREFMNU_MENUBLUR", gl_menu_blur, 0, 5.0, 0.5, 2 StaticText " " diff --git a/wadsrc/static/zscript/actors/shared/corona.zs b/wadsrc/static/zscript/actors/shared/corona.zs index 996921f821..0516c6c173 100644 --- a/wadsrc/static/zscript/actors/shared/corona.zs +++ b/wadsrc/static/zscript/actors/shared/corona.zs @@ -1,4 +1,4 @@ -/*class Corona : Actor native +class Corona : Actor native { Default { @@ -7,4 +7,4 @@ +NOINTERACTION +FORCEXYBILLBOARD } -}*/ +}