RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-03-18 13:41:06 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(world): add CWorld::GetM2Scene

Browse Source
This commit is contained in:
fallenoak 2026-02-09 15:38:48 -06:00
parent c604ae6d19
commit 9f3160b1d2
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/world/CWorld.cpp
View File

@ -12,6 +12,7 @@ uint32_t CWorld::s_enables;
uint32_t CWorld::s_enables2; uint32_t CWorld::s_enables2;
uint32_t CWorld::s_gameTimeFixed; uint32_t CWorld::s_gameTimeFixed;
float CWorld::s_gameTimeSec; float CWorld::s_gameTimeSec;
CM2Scene* CWorld::s_m2Scene;
uint32_t CWorld::s_tickTimeFixed; uint32_t CWorld::s_tickTimeFixed;
uint32_t CWorld::s_tickTimeMs; uint32_t CWorld::s_tickTimeMs;
float CWorld::s_tickTimeSec; float CWorld::s_tickTimeSec;
@ -66,6 +67,10 @@ float CWorld::GetGameTimeSec() {
return CWorld::s_gameTimeSec; return CWorld::s_gameTimeSec;
} }
CM2Scene* CWorld::GetM2Scene() {
return CWorld::s_m2Scene;
}
uint32_t CWorld::GetTickTimeFixed() { uint32_t CWorld::GetTickTimeFixed() {
return CWorld::s_tickTimeFixed; return CWorld::s_tickTimeFixed;
} }
@ -97,8 +102,6 @@ void CWorld::Initialize() {
CWorld::s_gameTimeFixed = 0; CWorld::s_gameTimeFixed = 0;
CWorld::s_gameTimeSec = 0.0f; CWorld::s_gameTimeSec = 0.0f;
// TODO
if (GxCaps().m_shaderTargets[GxSh_Pixel] > GxShPS_none) { if (GxCaps().m_shaderTargets[GxSh_Pixel] > GxShPS_none) {
CWorld::s_enables |= Enables::Enable_PixelShader; CWorld::s_enables |= Enables::Enable_PixelShader;
} }
@ -109,6 +112,10 @@ void CWorld::Initialize() {
// TODO // TODO
CWorld::s_m2Scene = M2CreateScene();
// TODO
uint32_t m2Flags = M2GetCacheFlags(); uint32_t m2Flags = M2GetCacheFlags();
CShaderEffect::InitShaderSystem( CShaderEffect::InitShaderSystem(
(m2Flags & 0x8) != 0, (m2Flags & 0x8) != 0,

3
src/world/CWorld.hpp
View File

@ -7,6 +7,7 @@
#include <cstdint> #include <cstdint>
class CM2Model; class CM2Model;
class CM2Scene;
class Weather; class Weather;
class CWorld { class CWorld {
@ -58,6 +59,7 @@ class CWorld {
static float GetCurTimeSec(); static float GetCurTimeSec();
static uint32_t GetGameTimeFixed(); static uint32_t GetGameTimeFixed();
static float GetGameTimeSec(); static float GetGameTimeSec();
static CM2Scene* GetM2Scene();
static uint32_t GetTickTimeFixed(); static uint32_t GetTickTimeFixed();
static uint32_t GetTickTimeMs(); static uint32_t GetTickTimeMs();
static float GetTickTimeSec(); static float GetTickTimeSec();
@ -72,6 +74,7 @@ class CWorld {
static float s_curTimeSec; static float s_curTimeSec;
static uint32_t s_gameTimeFixed; static uint32_t s_gameTimeFixed;
static float s_gameTimeSec; static float s_gameTimeSec;
static CM2Scene* s_m2Scene;
static uint32_t s_tickTimeFixed; static uint32_t s_tickTimeFixed;
static uint32_t s_tickTimeMs; static uint32_t s_tickTimeMs;
static float s_tickTimeSec; static float s_tickTimeSec;