From 3b4df470f888c80a5c73e7095ad3c7b7d304d3b5 Mon Sep 17 00:00:00 2001
From: BedlessCookie <127573752+CookieOnTheSouthSide@users.noreply.github.com>
Date: Mon, 13 Nov 2023 22:21:26 -0500
Subject: [PATCH] True Vectors and Trails update to main.py

---
 main.py | 53 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/main.py b/main.py
index ea06633..11c87a3 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,11 @@
 from typing import Final
-from math import sqrt, atan2, sin, cos
+from math import sqrt
 from random import randint
 
 import pygame
+import pygame.gfxdraw
 from pygame.math import Vector2
+
 """
 Next Implementation: 3d
 """
@@ -12,40 +14,45 @@
 class Particle:
     MASS: Final[int] = 10
     SIZE: Final[int] = 4
-    GRAVITATIONAL_CONSTANT: Final[int] = 6.673 * (10 ** -11)
+    GRAVITATIONAL_CONSTANT: Final[float] = 6.673 * (10 ** -11)
 
-    def __init__(self, position: list[int, int] = (0, 0),
-                 velocity: list[float, float] = (0, 0)):
-        self.x_pos = position[0]
-        self.y_pos = position[1]
+    def __init__(self, position: tuple[int, int] = (0, 0),
+                 velocity: tuple[float, float] = (0, 0)):
+        self.pos = Vector2(position)
         self.velocity = Vector2(velocity)
+        self.trail = []
+
+    def calculate_velocity(self, center_pos: Vector2 = 0, center_mass: int | float = 0):
+        distance = (center_pos - self.pos)
+        force_gravity = (center_mass * self.MASS / distance.magnitude()) * self.GRAVITATIONAL_CONSTANT
+        norm_factor = 1 / distance.magnitude()
+        direction = (distance * norm_factor) * force_gravity * 40000000
 
-    def calculate_velocity(self, center_x: int | float = 0, center_y: int | float = 0, center_mass: int | float = 0):
-        distance = sqrt(((center_x - self.x_pos)**2) + ((center_y - self.y_pos)**2))
-        force_gravity = (center_mass * self.MASS / distance) * self.GRAVITATIONAL_CONSTANT
-        direction = Vector2(center_y - self.y_pos, center_x - self.x_pos).normalize() * force_gravity * 40000000
- 
         self.velocity += direction
 
     def update(self):
-        self.x_pos += self.velocity[0]
-        self.y_pos += self.velocity[1]
+        self.pos += self.velocity
 
     def render(self, surface: pygame.Surface):
-        pygame.draw.circle(surface, (0, 255, 255), (self.x_pos, self.y_pos), self.SIZE)
+        self.trail.append((int(self.pos.x), int(self.pos.y)))
+        for point in self.trail:
+            pygame.gfxdraw.circle(surface, point[0], point[1], 1, (0, 255, 255, 255))
+
+        if len(self.trail) > 1000:
+            self.trail.pop(0)
 
 
 class LargeMass(Particle):
     def __init__(self, x: int | float = 0, y: int | float = 0,
-                 size: int | float = 1, velocity: list[int, int] = (0, 0),
+                 size: int | float = 1, velocity: tuple[int, int] = (0, 0),
                  mass: int = 40):
-        super().__init__(position=[x, y], velocity=velocity)
+        super().__init__(position=(x, y), velocity=velocity)
         self.size = size
         self.mass = mass
         self.gravity = size * mass
 
     def render(self, surface: pygame.Surface):
-        pygame.draw.circle(surface, (255, 165, 0), (self.x_pos, self.y_pos), self.SIZE)
+        pygame.draw.circle(surface, (255, 165, 0), self.pos, self.SIZE)
 
 
 class Game:
@@ -55,12 +62,12 @@ def __init__(self):
         self.clock = pygame.time.Clock()
 
         self.particles = []
-        self.center = LargeMass(self.screen.get_width()/2, self.screen.get_height()/2, 50, [0, 0], 100)
+        self.center = LargeMass(self.screen.get_width() / 2, self.screen.get_height() / 2, 100, [1, 1], 500)
 
     def setup(self):
-        for i in range(1000):
-            particle = Particle([randint(10, 790), randint(10, 790)],
-                                [randint(-30, 30), randint(-30, 30)])
+        for i in range(100):
+            particle = Particle((randint(10, 790), randint(10, 790)),
+                                (randint(1, 25), randint(0, 10)))
             self.particles.append(particle)
 
     def run(self):
@@ -68,7 +75,7 @@ def run(self):
         self.setup()
         while not done:
             # Drawing
-            self.screen.fill('black')
+            self.screen.fill("black")
 
             for p1 in self.particles:
                 p1.render(self.screen)
@@ -81,7 +88,7 @@ def run(self):
 
             # self.center.update()
             for thing in self.particles:
-                thing.calculate_velocity(self.center.x_pos, self.center.y_pos, self.center.mass)
+                thing.calculate_velocity(self.center.pos, self.center.mass)
                 thing.update()
 
             self.clock.tick(60)