cleanup on aisle everywhere
This commit is contained in:
parent
fde99ef76b
commit
586a774cde
@ -26,11 +26,6 @@ bool Collision::AABB(const ColliderComponent& colA, const ColliderComponent& col
|
||||
{
|
||||
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;
|
||||
}
|
||||
else
|
||||
|
@ -18,7 +18,6 @@ class Collision
|
||||
public:
|
||||
static bool AABB(const SDL_Rect& recA, const SDL_Rect& recB);
|
||||
static bool AABB(const ColliderComponent& colA, const ColliderComponent& colB);
|
||||
// void showColType();
|
||||
};
|
||||
|
||||
|
||||
|
@ -30,7 +30,6 @@ int main(int argc, const char * argv[])
|
||||
std::ifstream fin(configPath);
|
||||
|
||||
if(fin.is_open()){
|
||||
// std::cout<<"config.json is opened successfully"<<std::endl;
|
||||
std::ifstream jsonText("src/config/config.json");
|
||||
std::ostringstream tmp;
|
||||
tmp << jsonText.rdbuf();
|
||||
@ -80,8 +79,6 @@ int main(int argc, const char * argv[])
|
||||
|
||||
if(fin.fail()){
|
||||
std::cout<<"config.json load failed"<<std::endl;
|
||||
} else{
|
||||
// std::cout<<"config.json loaded"<<std::endl;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -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;
|
||||
// }
|
||||
|
Loading…
Reference in New Issue
Block a user