projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
created input, graphics and game namespaces
[physics.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
629ca9b
..
ca17fdf
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-2,10
+2,8
@@
#include <GL/glu.h>
#include <SDL/SDL.h>
#include <GL/glu.h>
#include <SDL/SDL.h>
-#include <vector>
-using std::vector;
-
#include "debug.h"
#include "debug.h"
+#include "handleSignal.h"
#include "game.h"
#include "ticks.h"
#include "game.h"
#include "ticks.h"
@@
-13,31
+11,22
@@
using std::vector;
#include "graphics/graphics.h"
#include "input/inputManager.h"
#include "graphics/graphics.h"
#include "input/inputManager.h"
-
/// ***** Private Method Headers *****
/// ***** Private Method Headers *****
+
void init();
void init();
+void sighandler( int sig );
+
void run();
void run();
-void clean
Up
();
+void clean();
void blockUpdate();
void updateFPSCounters();
void blockUpdate();
void updateFPSCounters();
-void
i
nput();
+void
handleI
nput();
void update(float);
void draw();
void update(float);
void draw();
-
-/// ***** MAIN Method *****
-int main()
-{
- init();
- run();
- cleanUp();
- return 0;
-}
-
-
/// ***** Private Variables *****
// variable used to determine if it is time to shutdown
/// ***** Private Variables *****
// variable used to determine if it is time to shutdown
@@
-63,38
+52,47
@@
int update_Count, draw_Count;
long int last_Second;
long int last_Second;
-/// *****
Private Methods
*****
-
void init
()
+/// *****
MAIN Method
*****
+
int main
()
{
{
- graphicsInit();
+ init();
+ run();
+ clean();
+ return 0;
+}
- gameInit();
+/// ***** Initializers/Cleaners *****
- // TODO
- // add a game state
+void init()
+{
+ installSignal();
-#ifdef DEBUGGING
- cout << "Initialization Complete" << endl;
-#endif
+ graphics::init();
- // create starting entities
+ game::init();
+
+ input::init();
#ifdef DEBUGGING
#ifdef DEBUGGING
- cout << "
World Created
" << endl;
+ cout << "
Initialization Complete
" << endl;
#endif
}
#endif
}
-void clean
Up
()
+void clean()
{
#ifdef DEBUGGING
cout << "Cleaning up" << endl;
#endif
{
#ifdef DEBUGGING
cout << "Cleaning up" << endl;
#endif
-
gameC
lean();
+
input::c
lean();
- graphicsCleanUp();
+ game::clean();
+
+ graphics::clean();
}
}
+/// ***** Private Methods *****
+
void run()
{
is_Running = true;
void run()
{
is_Running = true;
@@
-129,7
+127,7
@@
void blockUpdate()
// run the updates
for (int i = 1; i <= iupdate_sum; i++)
{
// run the updates
for (int i = 1; i <= iupdate_sum; i++)
{
-
i
nput();
+
handleI
nput();
update(time_step*i / 1000);
}
// remove the updates that where run from the sum
update(time_step*i / 1000);
}
// remove the updates that where run from the sum
@@
-150,18
+148,20
@@
void updateFPSCounters()
last_Second = tickCountMicro();
last_Second = tickCountMicro();
- //cout << "ups:\t" << ups << endl;
- //cout << "fps:\t" << fps << endl;
+#ifdef FPSUPS
+ cout << "ups:\t" << ups << endl;
+ cout << "fps:\t" << fps << endl;
+#endif
}
}
}
}
-void
i
nput()
+void
handleI
nput()
{
{
- input
U
pdate();
+ input
::u
pdate();
- game
I
nput();
+ game
::i
nput();
- if(wasReleased(SDLK_ESCAPE))
+ if(
input::
wasReleased(SDLK_ESCAPE))
is_Running = false;
}
is_Running = false;
}
@@
-169,14
+169,14
@@
void update(float time_step)
{
update_Count++;
{
update_Count++;
- game
U
pdate(time_step);
+ game
::u
pdate(time_step);
}
void draw()
{
draw_Count++;
}
void draw()
{
draw_Count++;
- game
D
raw();
+ game
::d
raw();
SDL_GL_SwapBuffers();
SDL_GL_SwapBuffers();