projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added some thread safty ... much more still needed
[physics.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
1309824
..
f94fac6
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-31,7
+31,14
@@
/// ***** Private Method Headers *****
/// ***** Private Method Headers *****
-void init();
+void mainInit();
+void mainClean();
+
+void updatesInit();
+void updatesClean();
+
+void drawInit();
+void drawClean();
void sighandler( int sig );
void sighandler( int sig );
@@
-44,6
+51,9
@@
void handleInput();
void update(float);
void draw();
void update(float);
void draw();
+int startUpdateThread(void*);
+int startDrawThread(void*);
+
/// ***** Private Variables *****
// variable used to determine if it is time to shutdown
/// ***** Private Variables *****
// variable used to determine if it is time to shutdown
@@
-69,26
+79,36
@@
const int min_wait_milli = 20;
const int min_wait_micro = min_wait_milli * 1000;
const float game_step = 10;
const int min_wait_micro = min_wait_milli * 1000;
const float game_step = 10;
-
int startUpdateThread(void*)
;
-
int startDrawThread(void*)
;
+
bool updateInitialized = false
;
+
bool drawInitialized = false
;
/// ***** MAIN Method *****
int main(int argc, char** args)
{
/// ***** MAIN Method *****
int main(int argc, char** args)
{
-
i
nit();
+
mainI
nit();
run();
run();
-
c
lean();
+
mainC
lean();
return 0;
}
/// ***** Initializers/Cleaners *****
return 0;
}
/// ***** Initializers/Cleaners *****
-void
i
nit()
+void
mainI
nit()
{
installSignal();
{
installSignal();
- graphics::init();
- DPF(0, "Graphics initialized");
+ debug::init();
+}
+
+void mainClean()
+{
+ debug::clean();
+}
+
+void updatesInit()
+{
+ while(!drawInitialized)
+ SDL_Delay(100);
game::init();
DPF(0, "Game initialized");
game::init();
DPF(0, "Game initialized");
@@
-100,33
+120,52
@@
void init()
DPF(0, "Configs initialized");
DPF(0, "Initialization Complete");
DPF(0, "Configs initialized");
DPF(0, "Initialization Complete");
+
+ updateInitialized = true;
}
}
-void
c
lean()
+void
updatesC
lean()
{
{
- DPF(0, "
Cleaning up
");
+ DPF(0, "
Update Thread Cleaning
");
cfg::clean();
input::clean();
game::clean();
cfg::clean();
input::clean();
game::clean();
+}
+
+void drawInit()
+{
+ graphics::init();
+ DPF(0, "Graphics initialized");
+
+ drawInitialized = true;
+
+ while(!updateInitialized)
+ SDL_Delay(100);
+}
+
+void drawClean()
+{
+ DPF(0, "Draw Thread Cleaning");
graphics::clean();
}
/// ***** Private Methods *****
graphics::clean();
}
/// ***** Private Methods *****
+SDL_Thread* updatesThread = NULL;
+SDL_Thread* drawThread = NULL;
void run()
{
is_Running = true;
void run()
{
is_Running = true;
- SDL_Thread* updates = SDL_CreateThread(startUpdateThread, NULL);
+ updatesThread = SDL_CreateThread(startUpdateThread, NULL);
+ drawThread = SDL_CreateThread(startDrawThread, NULL);
- // for some reason this needs to be on the main thread ...?
- startDrawThread(NULL);
-
- SDL_WaitThread(updates, NULL);
+ SDL_WaitThread(updatesThread, NULL);
+ SDL_WaitThread(drawThread, NULL);
}
void updateFPSCounters()
}
void updateFPSCounters()
@@
-179,6
+218,8
@@
void draw()
int startUpdateThread(void*)
{
int startUpdateThread(void*)
{
+ updatesInit();
+
last_Second = tickCountMicro();
while(is_Running)
last_Second = tickCountMicro();
while(is_Running)
@@
-200,15
+241,21
@@
int startUpdateThread(void*)
}
}
}
}
+ updatesClean();
+
return 0;
}
int startDrawThread(void*)
{
return 0;
}
int startDrawThread(void*)
{
+ drawInit();
+
while(is_Running)
{
draw();
}
while(is_Running)
{
draw();
}
+ drawClean();
+
return 0;
}
return 0;
}