diff options
| author | robojumper <robojumper@gmail.com> | 2026-05-07 21:23:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-07 21:23:47 +0200 |
| commit | f7b4c029fd5176e817e3de7209727480c445a3d2 (patch) | |
| tree | 9cddc9fa36ec13e7dac76c54d74257c61fe20b47 /src/egg/gfx/eggLightObject.cpp | |
| parent | ddb116187922a3f73ae3c97a136f499b7d724a2c (diff) | |
| parent | f4d163797f3c21e5a705b75043e0a8fbe7dc2460 (diff) | |
Merge pull request #313 from robojumper/vec-mtx-cleanup
Cleanup
Diffstat (limited to 'src/egg/gfx/eggLightObject.cpp')
| -rw-r--r-- | src/egg/gfx/eggLightObject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/egg/gfx/eggLightObject.cpp b/src/egg/gfx/eggLightObject.cpp index 5bf0b97b..f58493d5 100644 --- a/src/egg/gfx/eggLightObject.cpp +++ b/src/egg/gfx/eggLightObject.cpp @@ -114,18 +114,18 @@ void LightObject::CalcView(nw4r::math::MTX34 const &viewMtx) { } else { if (getField0x3C() == 1) { nw4r::math::VEC3 tmp(-viewMtx._20, -viewMtx._21, -viewMtx._22); - if (PSVECMag(tmp) > 0.0f) { + if (VECMag(tmp) > 0.0f) { nw4r::math::VEC3 angle; C_VECHalfAngle(mDir, tmp, angle); nw4r::math::VEC3Scale(&field_0x6C, &angle, -1.0f); - PSVECNormalize(field_0x6C, field_0x6C); + VECNormalize(field_0x6C, field_0x6C); } else { field_0x6C.x = field_0x6C.y = 0.0f; field_0x6C.z = 1.0f; } } - PSMTXMultVec(viewMtx, mPos, mViewPos); - PSMTXMultVec(viewMtx, mAt, mViewAt); + MTXMultVec(viewMtx, mPos, mViewPos); + MTXMultVec(viewMtx, mAt, mViewAt); nw4r::math::VEC3TransformNormal(&field_0x94, &viewMtx, &field_0x6C); } } @@ -238,12 +238,12 @@ void LightObject::CopyToG3D_View(nw4r::g3d::LightObj &g3dObj, const nw4r::math:: break; } case 0: { - PSMTXMultVec(viewMtx, mViewPos, pos); + MTXMultVec(viewMtx, mViewPos, pos); dir.x = dir.y = dir.z = 0.0f; break; } case 2: { - PSMTXMultVec(viewMtx, mViewPos, pos); + MTXMultVec(viewMtx, mViewPos, pos); nw4r::math::VEC3TransformNormal(&dir, &viewMtx, &field_0x94); break; } |