diff --git a/Bin/leakcheck.sh b/Bin/leakcheck.sh new file mode 100755 index 0000000..6e31a11 --- /dev/null +++ b/Bin/leakcheck.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +valgrind --leak-check=yes --track-origins=yes ./Unuk diff --git a/linecount.sh b/linecount.sh new file mode 100755 index 0000000..b07bd61 --- /dev/null +++ b/linecount.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "cpp - `find . -name '*.cpp' -print0 | wc -l --files0-from=- | tail -n1`" +echo "h - `find . -name '*.h' -print0 | wc -l --files0-from=- | tail -n1`" diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp index 8905b81..bb8529f 100644 --- a/src/Unuk/Game.cpp +++ b/src/Unuk/Game.cpp @@ -17,8 +17,6 @@ Game::Game(void) { m_assets = false; - //m_player = new Player(); - //m_player->SetSprite(); m_rotationAngle = 0.0f; } @@ -27,12 +25,10 @@ Game::~Game(void) { } bool Game::Init(void) { + LoadAssets(); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); - - LoadAssets(); m_assets = true; - return true; } @@ -142,7 +138,6 @@ void Game::OnResize(int width, int height) { void Game::LoadAssets(void) { m_player = new Player(); - m_player->SetSprite(); } void Game::DeleteAssets(void) { diff --git a/src/Unuk/Game.h b/src/Unuk/Game.h index ff7d2a1..2e10979 100644 --- a/src/Unuk/Game.h +++ b/src/Unuk/Game.h @@ -16,6 +16,8 @@ public: void UpdateProjection(); void OnResize(int width, int height); + bool IsInit(void) { return m_assets; } + private: void LoadAssets(void); void DeleteAssets(void); diff --git a/src/Unuk/Player.cpp b/src/Unuk/Player.cpp index cb518d5..efc8039 100644 --- a/src/Unuk/Player.cpp +++ b/src/Unuk/Player.cpp @@ -6,7 +6,7 @@ #include "Player.h" Player::Player(void) : m_posx(0), m_posy(0) { - //m_player = new Sprite("../Data/Media/test.bmp"); + m_player = new Sprite("../Data/Media/test.bmp"); } Player::~Player(void) { @@ -37,9 +37,9 @@ void Player::Render(void) { m_player->Render(); } -void Player::SetSprite(void) { - m_player = new Sprite("../Data/Media/test.bmp"); -} +//void Player::SetSprite(void) { +// m_player = new Sprite("../Data/Media/test.bmp"); +//} void Player::SetPosition(GLdouble posx, GLdouble posy) { // Set the position of the player sprite. diff --git a/src/Unuk/main.cpp b/src/Unuk/main.cpp index 43a3cb8..7ca1fda 100644 --- a/src/Unuk/main.cpp +++ b/src/Unuk/main.cpp @@ -170,7 +170,6 @@ int main() { // Initialize OpenGL. InitGL(); - game.Init(); Debug::logger->message("Game Initialize!"); Debug::logger->message("\n\n-----Engine Initialization Complete-----"); @@ -206,11 +205,15 @@ int main() { // Render the scene. float elapsedTime = GetElapsedSeconds(); //game.ProcessEvents(); + //game.Init(); + if(!game.IsInit()) { + game.Init(); + } game.Prepare(elapsedTime); game.Render(); SDL_GL_SwapBuffers(); } - game.Shutdown(); + //game.Shutdown(); // Clean ourselves up and exit. Quit(0);