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

Compare commits

base: RomanRom2:c9aaa245c9e53b5fad8387a9cdec9a703ef066b2
Branches Tags
RomanRom2:master
..
compare: RomanRom2:0b0b7927aad345f1147012fccc2929b1df610386
Branches Tags
RomanRom2:master

No commits in common. "c9aaa245c9e53b5fad8387a9cdec9a703ef066b2" and "0b0b7927aad345f1147012fccc2929b1df610386" have entirely different histories.
c9aaa245c9 ... 0b0b7927aa

6 changed files with 8 additions and 26 deletions
Show Stats Expand all files Collapse all files

6
src/event/Scheduler.cpp
View File

@ -286,10 +286,12 @@ int32_t SchedulerThreadProcProcess(uint32_t a1) {
}
}
float elapsedSec = (currTime - context->m_schedLastIdle) * 0.001;
uint32_t v9 = (currTime - context->m_schedLastIdle);
context->m_schedLastIdle = currTime;
double elapsedSec = v9 * 0.001;
SynthesizeTick(context, currTime, elapsedSec);
// TODO
// FrameTime::Update(currTime, elapsedSec);
IEvtTimerDispatch(context);

14
src/event/Synthesize.cpp
View File

@ -91,17 +91,3 @@ void SynthesizePoll(EvtContext* context) {
IEvtQueueDispatch(context, EVENT_ID_POLL, nullptr);
}
void SynthesizeTick(EvtContext* context, uint32_t currTime, float elapsedSec) {
context->m_critsect.Enter();
bool closed = context->m_schedState == EvtContext::SCHEDSTATE_CLOSED;
context->m_critsect.Leave();
if (closed) {
return;
}
EVENT_DATA_TICK data = { elapsedSec, currTime };
IEvtQueueDispatch(context, EVENT_ID_TICK, &data);
}

2
src/event/Synthesize.hpp
View File

@ -15,6 +15,4 @@ void SynthesizePaint(EvtContext* context);
void SynthesizePoll(EvtContext* context);
void SynthesizeTick(EvtContext* context, uint32_t currTime, float elapsedSec);
#endif

7
src/event/Types.hpp
View File

@ -12,7 +12,7 @@ enum EVENTID {
EVENT_ID_FOCUS = 2,
EVENT_ID_CLOSE = 3,
EVENT_ID_DESTROY = 4,
EVENT_ID_TICK = 5,
EVENT_ID_5 = 5,
EVENT_ID_IDLE = 6,
EVENT_ID_POLL = 7,
EVENT_ID_INITIALIZE = 8,
@ -259,9 +259,4 @@ struct EVENT_DATA_SIZE {
int32_t h;
};
struct EVENT_DATA_TICK {
float tickTimeSec;
uint32_t curTimeMs;
};
#endif

2
src/object/client/ClntObjMgr.hpp
View File

@ -13,7 +13,7 @@ class ClntObjMgr {
// Member variables
TSHashTable<CGObject_C, CHashKeyGUID> m_objects;
TSHashTable<CGObject_C, CHashKeyGUID> m_lazyCleanupObjects;
STORM_EXPLICIT_LIST(CGObject_C, m_link) m_lazyCleanupFifo[NUM_CLIENT_OBJECT_TYPES - 1];
// TODO
STORM_EXPLICIT_LIST(CGObject_C, m_link) m_visibleObjects;
STORM_EXPLICIT_LIST(CGObject_C, m_link) m_reenabledObjects;
// TODO

3
src/object/client/Util.cpp
View File

@ -83,7 +83,8 @@ void HandleObjectOutOfRangePass2(CGObject_C* object) {
}
ClntObjMgrGetCurrent()->m_lazyCleanupObjects.Insert(object, object->m_hashval, CHashKeyGUID(object->m_key));
ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->m_typeID - 1].LinkToTail(object);
// TODO link to type specific (disabled?) list in ClntObjMgrGetCurrent()
}
void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate) {