Skip to content
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

Fix a bug in LegoNavController, improve accuracy #1254

Merged
merged 2 commits into from
Dec 21, 2024
Merged

Fix a bug in LegoNavController, improve accuracy #1254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d28411e
Fix a bug in `LegoNavController`, improve accuracy
foxtacles Dec 21, 2024
e31daf2
Fix
foxtacles Dec 21, 2024
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
17 changes: 7 additions & 10 deletions LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,10 @@ MxLong LegoNavController::Notify(MxParam& p_param)
LegoROI* roi = CharacterManager()->GetActorROI(CharacterManager()->GetActorName(g_unk0x100f66cc), TRUE);
if (roi != NULL) {
MxMatrix mat;
ViewROI* roi = LegoOmni::GetInstance()->GetVideoManager()->GetViewROI();
const float* position = roi->GetWorldPosition();
const float* direction = roi->GetWorldDirection();
const float* up = roi->GetWorldUp();
ViewROI* viewRoi = LegoOmni::GetInstance()->GetVideoManager()->GetViewROI();
const float* position = viewRoi->GetWorldPosition();
const float* direction = viewRoi->GetWorldDirection();
const float* up = viewRoi->GetWorldUp();
CalcLocalTransform(position, direction, up, mat);
mat.TranslateBy(direction[0] * 2.0f, direction[1] - 1.0, direction[2] * 2.0f);
roi->UpdateTransformationRelativeToParent(mat);
Expand All @@ -744,12 +744,12 @@ MxLong LegoNavController::Notify(MxParam& p_param)
VideoManager()->ToggleFPS(g_fpsEnabled);
if (g_fpsEnabled) {
g_fpsEnabled = FALSE;
m_unk0x5d = FALSE;
}
else {
g_fpsEnabled = TRUE;
m_unk0x5d = FALSE;
}
default:
m_unk0x5d = FALSE;
break;
case '0':
case '1':
Expand All @@ -772,7 +772,7 @@ MxLong LegoNavController::Notify(MxParam& p_param)
else if (g_locationCalcStep) {
if (g_locationCalcStep == 1) {
// Calculate base offset into g_locations
g_nextLocation = (key - '0') * 5;
g_nextLocation = (key - '0') * 10;
g_locationCalcStep = 2;
}
else {
Expand Down Expand Up @@ -1018,9 +1018,6 @@ MxLong LegoNavController::Notify(MxParam& p_param)
case 0xbd:
g_unk0x100f66bc = LegoAnimationManager::e_unk1;
break;
default:
m_unk0x5d = FALSE;
break;
}
}
else {
Expand Down
Loading