eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-10-17 05:09:20 +02:00
Code Issues 150 Wiki Activity

refactor(sonar): rename locals that shadow outer declarations (cpp:S1117)

Browse Source 
Only local variables and definition parameters are renamed; shadowing
struct fields and enumerators in headers are left for a separate change.
This commit is contained in:
jerrrrycho
2026-10-10 16:45:39 +02:00
parent 846cb12430
commit e524d38128
17 changed files with 297 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
utilities/motiontelemetry.cpp
View File

@@ -73,9 +73,9 @@ void motiontelemetry::update()
double dt = Timer::GetDeltaTime();
glm::dvec3 front = t->Dynamic()->VectorFront();
glm::dvec3 frontvector = t->Dynamic()->VectorFront();
glm::dvec3 up = t->Dynamic()->VectorUp();
glm::dvec3 left = t->Dynamic()->VectorLeft();
glm::dvec3 leftvector = t->Dynamic()->VectorLeft();
glm::dvec3 pos = t->Dynamic()->GetPosition();
glm::dvec3 vel = (pos - last_pos) / dt;
@@ -86,18 +86,18 @@ void motiontelemetry::update()
if (conf.includegravity)
{
glm::dvec3 gravity(0.0, 9.81, 0.0);
local_acc = glm::dvec3(-glm::dot(gravity, left), glm::dot(gravity, up), glm::dot(gravity, front));
local_acc = glm::dvec3(-glm::dot(gravity, leftvector), glm::dot(gravity, up), glm::dot(gravity, frontvector));
}
if (conf.latposbased)
local_acc.x -= glm::dot(acc, left);
local_acc.x -= glm::dot(acc, leftvector);
else
local_acc.x -= t->Occupied()->AccN;
local_acc.y += glm::dot(acc, up) + t->Occupied()->AccVert * conf.axlebumpscale;
if (conf.fwdposbased)
local_acc.z += glm::dot(acc, front);
local_acc.z += glm::dot(acc, frontvector);
else
local_acc.z += t->Occupied()->AccSVBased;
@@ -106,16 +106,16 @@ void motiontelemetry::update()
// roll calculation, maybe too complicated?
// transform to left-handed
front.z *= -1;
frontvector.z *= -1;
up.z *= -1;
// make sure that vectors are orthonormal
glm::dvec3 oright = glm::normalize(glm::cross(up, front));
glm::dvec3 oup = glm::cross(front, oright);
glm::dvec3 oright = glm::normalize(glm::cross(up, frontvector));
glm::dvec3 oup = glm::cross(frontvector, oright);
// right and up vector without roll
glm::dvec3 right0 = glm::normalize(glm::cross(glm::dvec3(0.0, 1.0, 0.0), front));
glm::dvec3 up0 = glm::cross(front, right0);
glm::dvec3 right0 = glm::normalize(glm::cross(glm::dvec3(0.0, 1.0, 0.0), frontvector));
glm::dvec3 up0 = glm::cross(frontvector, right0);
double cosroll = glm::dot(up0, oup);
double sinroll;
@@ -127,7 +127,7 @@ void motiontelemetry::update()
else
sinroll = (up0.z * cosroll - oup.z) / right0.z;
glm::dvec3 rot(asin(-front.y), atan2(front.x, front.z), asin(sinroll));
glm::dvec3 rot(asin(-frontvector.y), atan2(frontvector.x, frontvector.z), asin(sinroll));
double velocity = t->Occupied()->V;
double yaw_vel = (rot.y - last_yaw) / dt;