Merge branch 'main' of github.com:1552937/Python-Orbit-Sim

Author: BCurbs

Body.py

@@ -1,11 +1,13 @@
 # Nathaniel Morin
 # 8/22/2021
 
+from asyncio.tasks import Task
+from concurrent.futures.thread import ThreadPoolExecutor
 import pygame
 import math
 import numpy as np
 import itertools
-
+import asyncio
 pygame.init()
 
 # Body class
@@ -24,7 +26,7 @@ class Body:
 	# What portion of the *radius* of the smaller body (between its and the other body's center) needs to be non-overlapping for it to not collide.
 	# 1 means that it just needs to be tangential for a collision to be detected, since it means that the whole radius needs to be outside the other body for it not to collide
 	# 0 means that it needs to be submerged up to its center before it collides
-	collisionDistanceFactor = 0.6
+	collisionDistanceFactor = 1
 	# How many times longer the displayed vector is than the distance they will travel in the next frame
 	vectorDisplayFactor = 10000
 	# What portion of the real magnitude of the gravity vectors are displayed
@@ -136,11 +138,8 @@ def findGravitationalAttraction(body1, body2):
 	@staticmethod
 	def addVectors(vec1, vec2):
 		return [vec1[0]+vec2[0], vec1[1]+vec2[1]]
-
-	# A function that iterates over a list of bodies and handles collisions between them
-	# returns the new list of bodies (post-collisions)
 	@staticmethod
-	def checkForBodyCollision(lst):
+	def checkForBodyCollisionNoThread(lst):
 		# Iterates over all possible body combinations
 		pairs = list(itertools.combinations(lst, 2))
 		for pair in pairs:
@@ -150,7 +149,7 @@ def checkForBodyCollision(lst):
 				# true if body1 is bigger and they are colliding
 				absorb = dist <= body1.displayRad + body2.displayRad*Body.collisionDistanceFactor and body1.mass >= body2.mass
 				# if body2 is bigger and they are colliding
-				if dist <= body2.displayRad + body1.displayRad*0.5 and body2.mass >= body1.mass:
+				if dist <= body2.displayRad + body1.displayRad*Body.collisionDistanceFactor and body2.mass >= body1.mass:
 					absorb = True
 					# swapping them so that body1 refers to the larger
 					temp = body2
@@ -163,6 +162,49 @@ def checkForBodyCollision(lst):
 					if body2 in lst:
 						lst.remove(body2)
 
+	# A function that iterates over a list of bodies and handles collisions between them
+	# returns the new list of bodies (post-collisions)
+	@staticmethod
+	async def checkForBodyCollision(lst):
+		# Iterates over all possible body combinations
+		list = await asyncio.gather(*[Body.calculateBody(body, lst) for body in lst])
+		list_new = []
+		list2 = []
+		for ele, ele2 in list:
+			list2 = list2 + ele2
+		for ele, ele2 in list:
+			if not ele == False and not ele in list2:
+				list_new.append(ele)
+		return list_new
+		
+	@staticmethod
+	async def calculateBody(body1, lst):
+		with ThreadPoolExecutor() as executor:
+			loop = asyncio.get_running_loop()
+			a, list = await loop.run_in_executor(executor, Body.calculateBodyHelper, body1, lst)
+		return a, list
+
+	@staticmethod
+	def calculateBodyHelper(body1, lst):
+		list = []
+		doMoreColisions = True
+		for body2 in lst:
+			
+			if(doMoreColisions and body2!=body1):
+				if body1.released and body2.released:
+					dist = Body.findDisplayDistance(body1.pos, body2.pos)
+					# true if body1 is bigger and they are colliding
+					absorb = dist <= body1.displayRad + body2.displayRad*Body.collisionDistanceFactor #and body1.mass >= body2.mass
+					# if body2 is bigger and they are colliding
+					if absorb and body1.mass < body2.mass:#dist <= body2.displayRad + body1.displayRad*0.5 and body2.mass >= body1.mass:
+						doMoreColisions = False
+						return False, list
+					# absorb = Body.collisionApproximationLinesAreIntersecting(body1, body2, body1.srf)
+					elif absorb:
+						list.append(body2)
+						body1.vec = Body.addVectors(body1.vec, body2.vec)
+						body1.setMass(body1.mass + body2.mass)
+		return body1, list
 	# function that iterates over a list of bodies and handles shifts to their vectors due to gravitational interactions
 	@staticmethod
 	def applyGravity(lst):