Zeronaut/BeagleRescue
Template
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup on aisle everywhere

Browse Source
This commit is contained in:
Alan Youngblood 2021-08-02 18:18:04 -04:00
parent fde99ef76b
commit 586a774cde
4 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/Collision.cpp
View File

@ -26,11 +26,6 @@ bool Collision::AABB(const ColliderComponent& colA, const ColliderComponent& col
{ {
if(AABB(colA.collider, colB.collider)) if(AABB(colA.collider, colB.collider))
{ {
// std::cout << colA.tag << " hit: " << colB.tag << std::endl;
// if(recA.x + recA.w >= recB.x) { printf("LeftCollision"); }
// if(recB.x + recB.w >= recA.x) { printf("RightCollision"); }
// if(recA.y + recA.h >= recB.y) { printf("TopCollision"); }
// if(recB.y + recB.h >= recA.y) { printf("BottomCollision"); }
return true; return true;
} }
else else

1
src/game/Collision.h
View File

@ -18,7 +18,6 @@ class Collision
public: public:
static bool AABB(const SDL_Rect& recA, const SDL_Rect& recB); static bool AABB(const SDL_Rect& recA, const SDL_Rect& recB);
static bool AABB(const ColliderComponent& colA, const ColliderComponent& colB); static bool AABB(const ColliderComponent& colA, const ColliderComponent& colB);
// void showColType();
}; };

3
src/game/Main.cpp
View File

@ -30,7 +30,6 @@ int main(int argc, const char * argv[])
std::ifstream fin(configPath); std::ifstream fin(configPath);
if(fin.is_open()){ if(fin.is_open()){
// std::cout<<"config.json is opened successfully"<<std::endl;
std::ifstream jsonText("src/config/config.json"); std::ifstream jsonText("src/config/config.json");
std::ostringstream tmp; std::ostringstream tmp;
tmp << jsonText.rdbuf(); tmp << jsonText.rdbuf();
@ -80,8 +79,6 @@ int main(int argc, const char * argv[])
if(fin.fail()){ if(fin.fail()){
std::cout<<"config.json load failed"<<std::endl; std::cout<<"config.json load failed"<<std::endl;
} else{
// std::cout<<"config.json loaded"<<std::endl;
} }
return 0; return 0;

8
src/game/StateMachine.cpp
View File

@ -74,11 +74,3 @@ void StateMachine::StateEngine(void)
} }
} }
} }
// unsigned char getCurrentState()
// {
// const StateStruct* pStateMap = GetStateMap();
// this->*pStateMap[currentState];
// unsigned char state = StateMachine.currentState;
// return state;
// }