diff --git a/src/playsim/a_corona.cpp b/src/playsim/a_corona.cpp index 0e0cb4a980..edeba7566f 100644 --- a/src/playsim/a_corona.cpp +++ b/src/playsim/a_corona.cpp @@ -24,9 +24,11 @@ #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 2c66f0a204..c1863f8a2e 100644 --- a/src/playsim/a_corona.h +++ b/src/playsim/a_corona.h @@ -27,6 +27,7 @@ EXTERN_CVAR(Bool, gl_coronas) class AActor; +#if 0 class ACorona : public AActor { DECLARE_CLASS(ACorona, AActor) @@ -36,3 +37,4 @@ public: float CoronaFade = 0.0f; }; +#endif \ No newline at end of file diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index 8cef0b0517..359bc7b7a9 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp @@ -171,7 +171,7 @@ void HWDrawInfo::StartScene(FRenderViewpoint &parentvp, HWViewpointUniforms *uni for (int i = 0; i < GLDL_TYPES; i++) drawlists[i].Reset(); hudsprites.Clear(); - Coronas.Clear(); +// Coronas.Clear(); vpIndex = 0; // Fullbright information needs to be propagated from the main view. @@ -580,6 +580,7 @@ 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; @@ -641,6 +642,7 @@ 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) @@ -668,6 +670,7 @@ 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); @@ -694,6 +697,7 @@ void HWDrawInfo::DrawCoronas(FRenderState& state) if (corona->CoronaFade > 0.0f) DrawCorona(state, corona, dist); } +#endif state.SetTextureMode(TM_NORMAL); screen->mViewpoints->Bind(state, vpIndex); diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.h b/src/rendering/hwrenderer/scene/hw_drawinfo.h index 931d888dcd..5ed4a09ff4 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 d732394d73..97fe05738e 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp @@ -704,11 +704,13 @@ 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;