Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rectangle collision algorithm #75

Merged
merged 13 commits into from
Jul 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion game/test_suite/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from game.test_suite.tests.objects.test_initialization import TestInit
from game.test_suite.tests.objects.test_shooter import TestShooterObject
from game.test_suite.tests.objects.test_hitbox_object import TestHitboxObject
from game.test_suite.tests.collision_test import TestCollision


__all__ = [
'TestGameBoard',
Expand All @@ -17,5 +19,6 @@
'TestShooterObject',
'TestGrenade',
'TestInit',
'TestHitboxObject'
'TestHitboxObject',
'TestCollision'
]
77 changes: 77 additions & 0 deletions game/test_suite/tests/collision_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import unittest
from game.common.hitbox import Hitbox
from game.utils.collision_detection import check_collision


class TestCollision(unittest.TestCase):

def setUp(self):
self.hitOne = Hitbox(10, 10, (5, 5))
self.hitTwo = Hitbox(25, 25, (5, 6))

# Below are 3 examples of true cases and false cases. The hit boxes were graphed out beforehand
# in order to determine if the test cases are behaving as expected.

def test_collision_true_one(self):
self.hitOne.position = (5, 5)
self.hitOne.height = 5
self.hitOne.width = 8

self.hitTwo.position = (5, 6)
self.hitTwo.height = 5
self.hitTwo.width = 8
self.assertTrue(check_collision(self.hitOne, self.hitTwo))

def test_collision_false_one(self):
self.hitOne.position = (5, 5)
self.hitOne.height = 5
self.hitOne.width = 8

self.hitTwo.position = (20, 20)
self.hitTwo.height = 5
self.hitTwo.width = 8
self.assertFalse(check_collision(self.hitOne, self.hitTwo))

def test_collision_true_two(self):
self.hitOne.position = (5, 5)
self.hitOne.height = 6
self.hitOne.width = 4

self.hitTwo.position = (1, 3)
self.hitTwo.height = 6
self.hitTwo.width = 6
self.assertTrue(check_collision(self.hitOne, self.hitTwo))

def test_collision_false_two(self):
self.hitOne.position = (5, 5)
self.hitOne.height = 4
self.hitOne.width = 4

self.hitTwo.position = (20, 20)
self.hitTwo.height = 6
self.hitTwo.width = 2
self.assertFalse(check_collision(self.hitOne, self.hitTwo))

def test_collision_true_three(self):
self.hitOne.position = (60, 50)
self.hitOne.height = 40
self.hitOne.width = 80

self.hitTwo.position = (20, 20)
self.hitTwo.height = 50
self.hitTwo.width = 60
self.assertTrue(check_collision(self.hitOne, self.hitTwo))

def test_collision_false_three(self):
self.hitOne.position = (60, 50)
self.hitOne.height = 40
self.hitOne.width = 80

self.hitTwo.position = (20, 20)
self.hitTwo.height = 10
self.hitTwo.width = 20
self.assertFalse(check_collision(self.hitOne, self.hitTwo))


if __name__ == '__main__':
unittest.main
2 changes: 1 addition & 1 deletion game/test_suite/tests/objects/test_hitbox_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_set_get_tuple_x_boundary_high(self):
self.assertEqual(self.hitbox.position,
(GameStats.game_board_width, 10))

def test_set_get_tuple_X_invalid_high(self):
def test_set_get_tuple_x_invalid_high(self):
self.assertRaises(ValueError, self.setPosition,
(GameStats.game_board_width + 1, 10))

Expand Down
10 changes: 10 additions & 0 deletions game/utils/collision_detection.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
from game.common.hitbox import Hitbox
from game.common.stats import GameStats
from game.common.enums import *


def check_collision(hitbox_one, hitbox_two):
return (hitbox_one.topLeft[0] < hitbox_two.topRight[0] and
hitbox_one.topRight[0] > hitbox_two.topLeft[0] and
hitbox_one.topLeft[1] < hitbox_two.bottomLeft[1] and
hitbox_one.bottomRight[1] > hitbox_two.topRight[1])