RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-02 16:52:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into feat-gx-add-locked-vertex-drawing-functions

Browse Source
This commit is contained in:
Phaneron 2023-04-06 14:25:50 -04:00 committed by GitHub
commit ff70fc19b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/glue/CGlueMgr.cpp
View File

@ -202,10 +202,10 @@ int32_t CGlueMgr::Idle(const void* a1, void* a2) {
if (CGlueMgr::m_idleState == IDLE_NONE) { if (CGlueMgr::m_idleState == IDLE_NONE) {
if (CGlueMgr::m_reload) { if (CGlueMgr::m_reload) {
if (!CGlueMgr::m_suspended) { if (!CGlueMgr::m_suspended) {
// TODO CGlueMgr::Suspend(); CGlueMgr::Suspend();
// TODO CGlueMgr::Resume(); CGlueMgr::Resume();
// TODO Sub4DA360(); // TODO Sub4DA360();
// TODO CGlueMgr::SetScreen(ByteB6A9E0); CGlueMgr::SetScreen(CGlueMgr::m_currentScreen);
} }
CGlueMgr::m_reload = 0; CGlueMgr::m_reload = 0;
@ -703,6 +703,19 @@ void CGlueMgr::Sub4D8BA0() {
} }
void CGlueMgr::Suspend() { void CGlueMgr::Suspend() {
CGlueMgr::m_suspended = 1;
// TODO
if (CGlueMgr::m_simpleTop) {
delete CGlueMgr::m_simpleTop;
CGlueMgr::m_simpleTop = nullptr;
}
// TODO
FrameXML_FreeHashNodes();
// TODO // TODO
} }

8
src/gx/Draw.cpp
View File

@ -9,11 +9,15 @@ void GxSceneClear(uint32_t mask, CImVector color) {
g_theGxDevicePtr->SceneClear(mask, color); g_theGxDevicePtr->SceneClear(mask, color);
} }
void GxScenePresent() { void GxScenePresent(uint32_t a2) {
g_theGxDevicePtr->ScenePresent();
}
void GxSub682A00() {
C3Vector v2 = { 0.0f, 0.0f, 0.0f }; C3Vector v2 = { 0.0f, 0.0f, 0.0f };
GxuFlushDrawList(GxuCat_2, v2); GxuFlushDrawList(GxuCat_2, v2);
g_theGxDevicePtr->ScenePresent(); GxScenePresent(0);
} }
void GxuFlushDrawList(EGxuDrawListCategory a1, const C3Vector& a2) { void GxuFlushDrawList(EGxuDrawListCategory a1, const C3Vector& a2) {

4
src/gx/Draw.hpp
View File

@ -12,7 +12,9 @@ void GxDraw(CGxBatch* batch, int32_t indexed);
void GxSceneClear(uint32_t, CImVector); void GxSceneClear(uint32_t, CImVector);
void GxScenePresent(void); void GxScenePresent(uint32_t a2);
void GxSub682A00();
void GxuFlushDrawList(EGxuDrawListCategory, const C3Vector&); void GxuFlushDrawList(EGxuDrawListCategory, const C3Vector&);

4
src/gx/Screen.cpp
View File

@ -115,14 +115,14 @@ int32_t OnPaint(const void* a1, void* a2) {
if (Screen::s_captureScreen) { if (Screen::s_captureScreen) {
// TODO // TODO
GxScenePresent(); GxSub682A00();
// TODO // TODO
return 1; return 1;
} }
GxScenePresent(); GxSub682A00();
} }
Screen::s_elapsedSec = 0.0f; Screen::s_elapsedSec = 0.0f;