mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Consistent naming for Math_ functions (#542)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* maths

* Factoriali -> Factorial

* soon, soon

* renames

* rand

* docs

* merged

* formatting

* little more cleanup

* asm crept back in

* changes to MathF

* smooth criminal

* functions.h
This commit is contained in:
petrie911 2020-12-26 04:44:53 -06:00 • committed by GitHub
parent 81c269b417
commit 8fa6cb6ff9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1329 changed files with 8413 additions and 8374 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View file

@ -124,12 +124,12 @@ void MirRay_MakeShieldLight(MirRay* this, GlobalContext* globalCtx) {
lightPt.z = (dataEntry->unk_18 * reflectionPt.z) + this->sourcePt.z;
// Fade up
Math_ApproxS(&this->lightPointRad, dataEntry->lgtPtMaxRad, 6);
Math_StepToS(&this->lightPointRad, dataEntry->lgtPtMaxRad, 6);
Lights_PointNoGlowSetInfo(&this->lightInfo, lightPt.x, lightPt.y, lightPt.z, dataEntry->color.r,
dataEntry->color.g, dataEntry->color.b, this->lightPointRad);
} else {
// Fade down
Math_ApproxS(&this->lightPointRad, 0, 6);
Math_StepToS(&this->lightPointRad, 0, 6);
Lights_PointSetColorAndRadius(&this->lightInfo, dataEntry->color.r, dataEntry->color.g, dataEntry->color.b,
this->lightPointRad);
}