Skip to content

Fix division by zero in cLighting::Animate before Init #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caiiiycuk wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −7
Open

Fix division by zero in cLighting::Animate before Init #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions Source/Render/src/lighting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,18 @@ void cLighting::Animate(float dt)
{
dt*=1e-3f;
time+=dt;
while(time>=param.generate_time)
{
time-=param.generate_time;
PreGenerate g;
g.pos_begin=pos_begin;
g.pos_end=pos_end[rnd() % pos_end.size()];
pre_generate.push_back(g);
if (pos_end.empty()) {
//Init() not called yet, nothing to generate arcs towards
time = min(time, param.generate_time);
} else {
while(time>=param.generate_time)
{
time-=param.generate_time;
PreGenerate g;
g.pos_begin=pos_begin;
g.pos_end=pos_end[rnd() % pos_end.size()];
pre_generate.push_back(g);
}
}

float fade_dt=dt/param.fade_time;
Expand Down
6 changes: 6 additions & 0 deletions Source/Units/SecondGun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,6 +2211,12 @@ void terWeaponLighting::quant()
//the fire is delayed thanks to startFireDelay() so it wont kill before arc is displayed
if (!lighting_) {
lighting_ = new cLighting;
//Init before attaching so Animate() never sees empty pos_end
Vect3f v0,v1;
aimController()->getTargetingPosition(v0,v1);
std::vector<Vect3f> vect;
vect.push_back(target_pos);
lighting_->Init(v0, vect, setup().laserWidth / 2.0f);
terScene->AttachObj(lighting_);
} else {
target_->SetHotCount(5);
Expand Down
Loading