Rectangle collision algorithm #75
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amanda-f-ndsu
added
the
wait for author
amanda-f-ndsu
requested review from
Checkers300,
HagenSR,
Anomalous-Creator,
erickbickler,
Mitchell-Borders and
ryan-liebsch
|
Even though it says it passed some unit tests are failing, you can click on the show all checks and it'll give you details |
HagenSR
requested changes
Jul 1, 2021
game/common/hitbox.py
Outdated
| from game.common.enums import * | ||
|
|
||
|
|
||
| class Hitbox(GameObject): |
There was a problem hiding this comment.
This version of hit box is outdated. Please pull dev again !
amanda-f-ndsu
removed
the
wait for author
erickbickler
approved these changes
Jul 6, 2021
| 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 |
There was a problem hiding this comment.
Tests shouldn't need docstrings, but it doesn't really matter
There was a problem hiding this comment.
in other words this can just be a regular comment using #... format instead of """...""" format
erickbickler
reviewed
Jul 6, 2021
game/utils/collision_detection.py
Outdated
| if (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]): |
There was a problem hiding this comment.
instead of doing an if here you can instead just do
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]There was a problem hiding this comment.
Ah yeah, I forgot I could just do that XD. I'll make those minor syntax changes next commit.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #34
Edit: This branch can be merged once approved