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

Disable coronas for now

Browse source
This commit is contained in:
nashmuhandes 2022-08-15 15:01:14 +08:00 committed by Christoph Oelckers
parent ea8e3da672
commit 80a31b074d
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rendering/hwrenderer/scene/hw_drawinfo.cpp
View file

@ -47,6 +47,7 @@
#include "v_draw.h" #include "v_draw.h"
#include "a_corona.h" #include "a_corona.h"
#include "texturemanager.h" #include "texturemanager.h"
#include "actorinlines.h"
EXTERN_CVAR(Float, r_visibility) EXTERN_CVAR(Float, r_visibility)
CVAR(Bool, gl_bandedswlight, false, CVAR_ARCHIVE) CVAR(Bool, gl_bandedswlight, false, CVAR_ARCHIVE)
@ -669,7 +670,8 @@ void HWDrawInfo::DrawCoronas(FRenderState& state)
for (ACorona* corona : Coronas) 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(); double dist = direction.Length();
// skip coronas that are too far // skip coronas that are too far
@ -680,7 +682,7 @@ void HWDrawInfo::DrawCoronas(FRenderState& state)
direction.MakeUnit(); direction.MakeUnit();
FTraceResults results; 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); 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); state.EnableFog(false);
if (gl_coronas && Coronas.Size() > 0) /*if (gl_coronas && Coronas.Size() > 0)
{ {
DrawCoronas(state); DrawCoronas(state);
} }*/
// [BB] HUD models need to be rendered here. // [BB] HUD models need to be rendered here.
const bool renderHUDModel = IsHUDModelForPlayerAvailable(players[consoleplayer].camera->player); const bool renderHUDModel = IsHUDModelForPlayerAvailable(players[consoleplayer].camera->player);

7
wadsrc/static/zscript/actors/shared/corona.zs
View file

@ -1,7 +1,10 @@
class Corona : Actor native /*class Corona : Actor native
{ {
Default Default
{ {
RenderStyle "Add";
RenderRadius 1024.0; RenderRadius 1024.0;
+NOINTERACTION
+FORCEXYBILLBOARD
} }
} }*/