mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Name a few members in LegoVideoManager

Browse Source
This commit is contained in:
Christian Semmler
2024-01-10 13:45:52 -05:00
parent 5a2be934be
commit e55b2ad639
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/legovideomanager.h
View File

@@ -40,7 +40,7 @@ public:
inline Lego3DManager* Get3DManager() { return this->m_3dManager; } inline Lego3DManager* Get3DManager() { return this->m_3dManager; }
inline MxDirect3D* GetDirect3D() { return this->m_direct3d; } inline MxDirect3D* GetDirect3D() { return this->m_direct3d; }
inline void SetUnkE4(MxBool p_unk0xe4) { this->m_unk0xe4 = p_unk0xe4; } inline void SetRender3D(MxBool p_render3d) { this->m_render3d = p_render3d; }
private: private:
MxResult CreateDirect3D(); MxResult CreateDirect3D();
@@ -55,7 +55,7 @@ private:
undefined4 m_unk0x70; // 0x70 undefined4 m_unk0x70; // 0x70
MxDirect3D* m_direct3d; // 0x74 MxDirect3D* m_direct3d; // 0x74
undefined4 m_unk0x78[27]; // 0x78 undefined4 m_unk0x78[27]; // 0x78
MxBool m_unk0xe4; // 0xe4 MxBool m_render3d; // 0xe4
MxBool m_unk0xe5; // 0xe5 MxBool m_unk0xe5; // 0xe5
MxBool m_unk0xe6; // 0xe6 MxBool m_unk0xe6; // 0xe6
PALETTEENTRY m_paletteEntries[256]; // 0xe7 PALETTEENTRY m_paletteEntries[256]; // 0xe7
@@ -65,7 +65,7 @@ private:
MxPalette* m_palette; // 0x4f0 MxPalette* m_palette; // 0x4f0
MxStopWatch* m_stopWatch; // 0x4f4 MxStopWatch* m_stopWatch; // 0x4f4
double m_elapsedSeconds; // 0x4f8 double m_elapsedSeconds; // 0x4f8
MxBool m_unk0x500; // 0x500 MxBool m_fullScreenMovie; // 0x500
MxBool m_drawCursor; // 0x501 MxBool m_drawCursor; // 0x501
MxS32 m_cursorXCopy; // 0x504 MxS32 m_cursorXCopy; // 0x504
MxS32 m_cursorYCopy; // 0x508 MxS32 m_cursorYCopy; // 0x508
@@ -80,7 +80,7 @@ private:
SIZE m_fpsSize; // 0x544 SIZE m_fpsSize; // 0x544
undefined m_pad0x54c[8]; // 0x54c undefined m_pad0x54c[8]; // 0x54c
MxBool m_unk0x554; // 0x554 MxBool m_unk0x554; // 0x554
MxBool m_initialized; // 0x555 MxBool m_paused; // 0x555
undefined m_pad0x556[0x39]; // 0x556 undefined m_pad0x556[0x39]; // 0x556
}; };

26
LEGO1/lego/legoomni/src/video/legovideomanager.cpp
View File

@@ -30,13 +30,13 @@ LegoVideoManager::LegoVideoManager()
m_cursorYCopy = m_cursorY; m_cursorYCopy = m_cursorY;
m_cursorXCopy = m_cursorY; m_cursorXCopy = m_cursorY;
m_unk0x514 = 0; m_unk0x514 = 0;
m_unk0x500 = FALSE; m_fullScreenMovie = FALSE;
m_drawFPS = FALSE; m_drawFPS = FALSE;
m_unk0x528 = 0; m_unk0x528 = 0;
m_arialFont = NULL; m_arialFont = NULL;
m_unk0xe5 = FALSE; m_unk0xe5 = FALSE;
m_unk0x554 = FALSE; m_unk0x554 = FALSE;
m_initialized = FALSE; m_paused = FALSE;
} }
// FUNCTION: LEGO1 0x1007ab40 // FUNCTION: LEGO1 0x1007ab40
@@ -179,7 +179,7 @@ MxResult LegoVideoManager::Create(MxVideoParam& p_videoParam, MxU32 p_frequencyM
m_3dManager->SetPointOfView(*m_viewROI); m_3dManager->SetPointOfView(*m_viewROI);
m_unk0x100d9d00 = new LegoUnknown100d9d00; m_unk0x100d9d00 = new LegoUnknown100d9d00;
m_unk0xe4 = FALSE; m_render3d = FALSE;
m_stopWatch = new MxStopWatch; m_stopWatch = new MxStopWatch;
m_stopWatch->Start(); m_stopWatch->Start();
@@ -247,13 +247,13 @@ MxResult LegoVideoManager::Tickle()
while (cursor.Next(presenter)) while (cursor.Next(presenter))
presenter->Tickle(); presenter->Tickle();
if (m_unk0xe4 && !m_initialized) if (m_render3d && !m_paused)
m_3dManager->GetLego3DView()->GetView()->Clear(); m_3dManager->GetLego3DView()->GetView()->Clear();
MxRect32 rect(0, 0, m_videoParam.GetRect().GetWidth() - 1, m_videoParam.GetRect().GetHeight() - 1); MxRect32 rect(0, 0, m_videoParam.GetRect().GetWidth() - 1, m_videoParam.GetRect().GetHeight() - 1);
InvalidateRect(rect); InvalidateRect(rect);
if (!m_initialized && (m_unk0xe4 || m_unk0xe5)) { if (!m_paused && (m_render3d || m_unk0xe5)) {
cursor.Reset(); cursor.Reset();
while (cursor.Next(presenter) && presenter->GetDisplayZ() >= 0) while (cursor.Next(presenter) && presenter->GetDisplayZ() >= 0)
@@ -275,7 +275,7 @@ MxResult LegoVideoManager::Tickle()
if (m_drawFPS) if (m_drawFPS)
DrawFPS(); DrawFPS();
} }
else if (m_unk0x500) { else if (m_fullScreenMovie) {
MxPresenter* presenter; MxPresenter* presenter;
MxPresenterListCursor cursor(m_presenters); MxPresenterListCursor cursor(m_presenters);
@@ -283,8 +283,8 @@ MxResult LegoVideoManager::Tickle()
presenter->PutData(); presenter->PutData();
} }
if (!m_initialized) { if (!m_paused) {
if (m_unk0xe4 && m_videoParam.Flags().GetFlipSurfaces()) { if (m_render3d && m_videoParam.Flags().GetFlipSurfaces()) {
m_3dManager->GetLego3DView() m_3dManager->GetLego3DView()
->GetView() ->GetView()
->ForceUpdate(0, 0, m_videoParam.GetRect().GetWidth(), m_videoParam.GetRect().GetHeight()); ->ForceUpdate(0, 0, m_videoParam.GetRect().GetWidth(), m_videoParam.GetRect().GetHeight());
@@ -364,8 +364,8 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
m_displaySurface->GetVideoParam().Flags().SetF1bit3(p_scale); m_displaySurface->GetVideoParam().Flags().SetF1bit3(p_scale);
m_unk0xe4 = FALSE; m_render3d = FALSE;
m_unk0x500 = TRUE; m_fullScreenMovie = TRUE;
} }
else { else {
m_displaySurface->FUN_100ba640(); m_displaySurface->FUN_100ba640();
@@ -388,8 +388,8 @@ void LegoVideoManager::EnableFullScreenMovie(MxBool p_enable, MxBool p_scale)
UpdateRegion(); UpdateRegion();
OverrideSkyColor(TRUE); OverrideSkyColor(TRUE);
m_unk0xe4 = TRUE; m_render3d = TRUE;
m_unk0x500 = FALSE; m_fullScreenMovie = FALSE;
} }
} }
@@ -431,7 +431,7 @@ void LegoVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_h
p_height = m_videoParam.GetRect().GetHeight(); p_height = m_videoParam.GetRect().GetHeight();
} }
if (!m_initialized) { if (!m_paused) {
m_3dManager->GetLego3DView()->GetView()->ForceUpdate(p_x, p_y, p_width, p_height); m_3dManager->GetLego3DView()->GetView()->ForceUpdate(p_x, p_y, p_width, p_height);
} }
} }

2
LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
View File

@@ -118,7 +118,7 @@ MxResult MxTransitionManager::StartTransition(
inputManager->m_unk0x336 = FALSE; inputManager->m_unk0x336 = FALSE;
LegoVideoManager* videoManager = VideoManager(); LegoVideoManager* videoManager = VideoManager();
videoManager->SetUnkE4(FALSE); videoManager->SetRender3D(FALSE);
SetAppCursor(1); SetAppCursor(1);
return SUCCESS; return SUCCESS;