From 80a31b074d3e797637038341b04e5f7bc0cfbf70 Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Mon, 15 Aug 2022 15:01:14 +0800 Subject: [PATCH] Disable coronas for now --- src/rendering/hwrenderer/scene/hw_drawinfo.cpp | 10 ++++++---- wadsrc/static/zscript/actors/shared/corona.zs | 7 +++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp index 85c872b67..8cef0b051 100644 --- a/src/rendering/hwrenderer/scene/hw_drawinfo.cpp +++ b/src/rendering/hwrenderer/scene/hw_drawinfo.cpp @@ -47,6 +47,7 @@ #include "v_draw.h" #include "a_corona.h" #include "texturemanager.h" +#include "actorinlines.h" EXTERN_CVAR(Float, r_visibility) CVAR(Bool, gl_bandedswlight, false, CVAR_ARCHIVE) @@ -669,7 +670,8 @@ void HWDrawInfo::DrawCoronas(FRenderState& state) for (ACorona* corona : Coronas) { - DVector3 direction = Viewpoint.Pos - corona->Pos(); + auto cPos = corona->Vec3Offset(0., 0., corona->Height * 0.5); + DVector3 direction = Viewpoint.Pos - cPos; double dist = direction.Length(); // skip coronas that are too far @@ -680,7 +682,7 @@ void HWDrawInfo::DrawCoronas(FRenderState& state) direction.MakeUnit(); FTraceResults results; - if (!Trace(corona->Pos(), corona->Sector, direction, dist, MF_SOLID, ML_BLOCKEVERYTHING, corona, results, 0, CheckForViewpointActor, &Viewpoint)) + if (!Trace(cPos, corona->Sector, direction, dist, MF_SOLID, ML_BLOCKEVERYTHING, corona, results, 0, CheckForViewpointActor, &Viewpoint)) { corona->CoronaFade = std::min(corona->CoronaFade + timeElapsed * fadeSpeed, 1.0f); } @@ -711,10 +713,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/wadsrc/static/zscript/actors/shared/corona.zs b/wadsrc/static/zscript/actors/shared/corona.zs index 986f441e4..996921f82 100644 --- a/wadsrc/static/zscript/actors/shared/corona.zs +++ b/wadsrc/static/zscript/actors/shared/corona.zs @@ -1,7 +1,10 @@ -class Corona : Actor native +/*class Corona : Actor native { Default { + RenderStyle "Add"; RenderRadius 1024.0; + +NOINTERACTION + +FORCEXYBILLBOARD } -} +}*/