atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] start work for new model

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-03 21:10:22 +02:00
parent 1b8ec043cc
commit abaca40325
2 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gale/Thread.cpp
View File

@ -17,8 +17,7 @@ gale::Thread::Thread() :
} }
gale::Thread::~Thread() { gale::Thread::~Thread() {
delete m_thread; stop();
m_thread = nullptr;
} }
void gale::Thread::start() { void gale::Thread::start() {
@ -35,10 +34,15 @@ void gale::Thread::start() {
} }
void gale::Thread::stop() { void gale::Thread::stop() {
if (m_state != state_running) { if (m_state == state_stop) {
return; return;
} }
m_state = state_stopping; while ( m_state == state_running
|| m_state == state_starting) {
// requesting a stop ...
GALE_INFO("wait Thread stopping");
usleep(500000);
}
m_thread->join(); m_thread->join();
gale::contextUnRegisterThread(m_thread); gale::contextUnRegisterThread(m_thread);
delete m_thread; delete m_thread;
@ -53,7 +57,9 @@ void gale::Thread::threadCall() {
continue; continue;
} }
if (onThreadCall() == true) { if (onThreadCall() == true) {
m_state = state_stopping;
return; return;
} }
} }
m_state = state_stopping;
} }

60
gale/context/Context.cpp
View File

@ -353,32 +353,60 @@ void gale::Context::OS_Move(const vec2& _pos) {
*/ */
} }
void gale::Context::OS_SetInput(enum gale::key::type _type,
enum gale::key::status _status,
int32_t _pointerID,
const vec2& _pos ) {
if (m_imulationActive == true) {
m_simulationFile.filePuts(etk::to_string(gale::getTime()));
m_simulationFile.filePuts(":INPUT:";);
m_simulationFile.filePuts(etk::to_string(_type));
m_simulationFile.filePuts(":");
m_simulationFile.filePuts(etk::to_string(_status));
m_simulationFile.filePuts(":");
m_simulationFile.filePuts(etk::to_string(_pointerID));
m_simulationFile.filePuts(":");
m_simulationFile.filePuts(etk::to_string(_pos));
m_simulationFile.filePuts("\n");
}
m_msgSystem.post([_type, _status, _pointerID, _pos](gale::Context& _context){
std::shared_ptr<gale::Application> appl = _context.getApplication();
if (appl == nullptr) {
return;
}
appl->onPointer(_type,
_pointerID,
_pos,
_status);
});
}
void gale::Context::OS_SetInputMotion(int _pointerID, const vec2& _pos ) { void gale::Context::OS_SetInputMotion(int _pointerID, const vec2& _pos ) {
m_msgSystem.post(std::make_shared<gale::context::LoopActionInput>(gale::key::type_finger, OS_SetInput(gale::key::type_finger,
gale::key::status_move, gale::key::status_move,
_pointerID, _pointerID,
_pos)); _pos));
} }
void gale::Context::OS_SetInputState(int _pointerID, bool _isDown, const vec2& _pos ) { void gale::Context::OS_SetInputState(int _pointerID, bool _isDown, const vec2& _pos ) {
m_msgSystem.post(std::make_shared<gale::context::LoopActionInput>(gale::key::type_finger, OS_SetInput(gale::key::type_finger,
(_isDown==true?gale::key::status_down:gale::key::status_up), (_isDown==true?gale::key::status_down:gale::key::status_up),
_pointerID, _pointerID,
_pos)); _pos));
} }
void gale::Context::OS_SetMouseMotion(int _pointerID, const vec2& _pos ) { void gale::Context::OS_SetMouseMotion(int _pointerID, const vec2& _pos ) {
m_msgSystem.post(std::make_shared<gale::context::LoopActionInput>(gale::key::type_mouse, OS_SetInput(gale::key::type_mouse,
gale::key::status_move, gale::key::status_move,
_pointerID, _pointerID,
_pos)); _pos));
} }
void gale::Context::OS_SetMouseState(int _pointerID, bool _isDown, const vec2& _pos ) { void gale::Context::OS_SetMouseState(int _pointerID, bool _isDown, const vec2& _pos ) {
m_msgSystem.post(std::make_shared<gale::context::LoopActionInput>(gale::key::type_mouse, OS_SetInput(gale::key::type_mouse,
(_isDown==true?gale::key::status_down:gale::key::status_up), (_isDown==true?gale::key::status_down:gale::key::status_up),
_pointerID, _pointerID,
_pos)); _pos));
} }
void gale::Context::OS_SetKeyboard(gale::key::Special& _special, void gale::Context::OS_SetKeyboard(gale::key::Special& _special,