From: Skullheadx <admonty1@gmail.com>
Date: Thu, 26 Jan 2023 21:57:54 +0000 (-0500)
Subject: clean up code
X-Git-Url: http://git.skullheadx.com/about.html?a=commitdiff_plain;h=7d6d5f9d684c9963a9935537c805e741ebdf4aed;p=Collision-Simulation.git

clean up code
---

diff --git a/collision.py b/collision.py
index f28028a..68af174 100644
--- a/collision.py
+++ b/collision.py
@@ -1,6 +1,7 @@
-from pygame import Vector2
 from itertools import combinations
 
+from pygame import Vector2
+
 
 def detectTopCollision(particle, box):
     if particle.top <= box.top:
diff --git a/display.py b/display.py
index 0de96b5..c1777e6 100644
--- a/display.py
+++ b/display.py
@@ -1,10 +1,11 @@
-import pygame
 import random
 
+import pygame
+
 from box import Box
+from collision import sweepAndPrune, handleParticleCollision, detectParticleCollision
 from colours import *
 from particle import Particle
-from collision import sweepAndPrune, handleParticleCollision, detectParticleCollision
 
 pygame.init()
 
@@ -69,7 +70,7 @@ class Display:
 
         for particle1, particle2 in sweepAndPrune(self.particles):
             if (particle1, particle2) not in self.collided_last_frame and (
-            particle2, particle1) not in self.collided_last_frame:
+                    particle2, particle1) not in self.collided_last_frame:
                 handleParticleCollision(particle1, particle2)
 
                 self.collided_last_frame.add((particle1, particle2))
diff --git a/particle.py b/particle.py
index 6619b74..d3c49a5 100644
--- a/particle.py
+++ b/particle.py
@@ -2,14 +2,12 @@ from math import copysign
 
 import pygame
 
-from box import Box
-from collision import handleBoxCollision, handleParticleCollision, detectTopCollision, handleTopCollision, \
+from collision import detectTopCollision, handleTopCollision, \
     detectBottomCollision, handleBottomCollision, detectLeftCollision, handleLeftCollision, handleRightCollision, \
     detectRightCollision
 from colours import *
 
 
-
 class Particle:
     speed_limit = 3
 
@@ -29,8 +27,7 @@ class Particle:
 
         self.colour = RED
 
-        self.collided_with_wall = {"top":False, "bottom": False, "left": False, "right": False}
-
+        self.collided_with_wall = {"top": False, "bottom": False, "left": False, "right": False}
 
     def get_next_frame(self, position, velocity, delta):
         vel = pygame.Vector2()
@@ -78,6 +75,5 @@ class Particle:
         if not detectRightCollision(self, self.collision_layer[0]):
             self.collided_with_wall["right"] = False
 
-
     def draw(self, surf):
         pygame.draw.circle(surf, self.colour, self.position, self.radius)