Skip to content
This repository has been archived by the owner on Dec 18, 2021. It is now read-only.

Commit

Permalink
Move collision code into collision/ directory
Browse files Browse the repository at this point in the history
Grumbel committed Oct 31, 2018
1 parent 5c7849e commit 3156cd0
Showing 11 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/supertux/collision.cpp → src/collision/collision.cpp
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "supertux/collision.hpp"
#include "collision/collision.hpp"

#include <algorithm>

5 changes: 3 additions & 2 deletions src/supertux/collision.hpp → src/collision/collision.hpp
Original file line number Diff line number Diff line change
@@ -17,9 +17,10 @@
#ifndef HEADER_SUPERTUX_SUPERTUX_COLLISION_HPP
#define HEADER_SUPERTUX_SUPERTUX_COLLISION_HPP

#include "supertux/collision_hit.hpp"
#include <limits>
#include <algorithm> /* min/max */
#include <algorithm>

#include "collision/collision_hit.hpp"

class Vector;
class Rectf;
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "supertux/collision_object.hpp"
#include "collision/collision_object.hpp"

#include "supertux/moving_object.hpp"

Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@

#include <stdint.h>

#include "collision/collision_hit.hpp"
#include "math/rectf.hpp"
#include "supertux/collision_hit.hpp"

class GameObject;
class MovingObject;
Original file line number Diff line number Diff line change
@@ -15,14 +15,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.

#include "supertux/collision_system.hpp"
#include "collision/collision_system.hpp"

#include "collision/collision.hpp"
#include "editor/editor.hpp"
#include "math/aatriangle.hpp"
#include "math/rect.hpp"
#include "object/tilemap.hpp"
#include "object/player.hpp"
#include "supertux/collision.hpp"
#include "object/tilemap.hpp"
#include "supertux/constants.hpp"
#include "supertux/moving_object.hpp"
#include "supertux/sector.hpp"
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
#include <vector>
#include <stdint.h>

#include "supertux/collision.hpp"
#include "collision/collision.hpp"

class DrawingContext;
class MovingObject;
2 changes: 1 addition & 1 deletion src/object/particlesystem_interactive.cpp
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@

#include "object/particlesystem_interactive.hpp"

#include "collision/collision.hpp"
#include "math/aatriangle.hpp"
#include "object/tilemap.hpp"
#include "supertux/collision.hpp"
#include "supertux/globals.hpp"
#include "supertux/sector.hpp"
#include "supertux/tile.hpp"
4 changes: 2 additions & 2 deletions src/supertux/moving_object.hpp
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@
#ifndef HEADER_SUPERTUX_SUPERTUX_MOVING_OBJECT_HPP
#define HEADER_SUPERTUX_SUPERTUX_MOVING_OBJECT_HPP

#include "collision/collision_hit.hpp"
#include "collision/collision_object.hpp"
#include "math/rectf.hpp"
#include "supertux/collision_hit.hpp"
#include "supertux/collision_object.hpp"
#include "supertux/game_object.hpp"

class Sector;
4 changes: 2 additions & 2 deletions src/supertux/sector.cpp
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@

#include "audio/sound_manager.hpp"
#include "badguy/badguy.hpp"
#include "collision/collision.hpp"
#include "collision/collision_system.hpp"
#include "editor/editor.hpp"
#include "math/aatriangle.hpp"
#include "math/rect.hpp"
@@ -39,8 +41,6 @@
#include "physfs/ifile_stream.hpp"
#include "scripting/sector.hpp"
#include "squirrel/squirrel_environment.hpp"
#include "supertux/collision.hpp"
#include "supertux/collision_system.hpp"
#include "supertux/constants.hpp"
#include "supertux/debug.hpp"
#include "supertux/game_object_factory.hpp"
10 changes: 5 additions & 5 deletions tests/collision_test.cpp
Original file line number Diff line number Diff line change
@@ -16,23 +16,23 @@

#include <gtest/gtest.h>

#include "supertux/collision.hpp"
#include "collision/collision.hpp"
#include "math/rectf.hpp"

TEST(collisionTest, intersects_test)
{
{
Rectf r1(1.0,4.0,2.0,5.0);
Rectf r2(6.0,8.0,10.0,9.0);
ASSERT_EQ(false, collision::intersects(r1, r2));

ASSERT_EQ(false, collision::intersects(r1, r2));

Rectf r3(8.0,3.0,10.0,5.0);
Rectf r4(2.0,7.0,4.0,9.0);

ASSERT_EQ(false, collision::intersects(r3, r4));

Rectf r5(4.0,1.0,5.0,2.0);
Rectf r6(8.0,6.0,9.0,10.0);
Rectf r6(8.0,6.0,9.0,10.0);

ASSERT_EQ(false, collision::intersects(r5, r6));

0 comments on commit 3156cd0

Please sign in to comment.