View difference between Paste ID: QinKfetW and WZnMsqsL

-#Libraries
+
 from pygame.locals import *
 from pygame import gfxdraw
 from random import randint
-from random import randint as randint
+import math
-import math
+
-
+
-#Initialization of pygame and variables
+options = input("Default Settings> (y/n):")
 
-xres = int(input("X Resolution:"))
+
-yres = int(input("Y Resolution:"))
+    def __init__(self,options):
-g = float(input("Acceleration due to gravity:"))
+
-r = int(input("Particle Radius:"))
+
         self.bls = []
-#Class containing world settings and info
+        if options == "n":
             self.x = int(input("X Resolution:"))
-    def __init__(self,x,y,g,r):
+            self.y = int(input("Y Resolution:"))
-        self.x = x
+            self.g = float(input("Acceleration due to gravity:"))
-        self.y = y
+            self.r = int(input("Particle radius:"))
-        self.num = int(input("How Many Balls? (0 for random):"))
+            self.c = input("Colour according to rms or component velocity? (rms/com):")
             self.f = abs(int(input("Drag (Higher = Less Drag):")))
-            self.num = randint(1,1000)
+        else:
-        self.screen = pygame.display.set_mode((x,y))
+            self.x,self.y,self.g,self.r,self.f,self.c = 500,500,9.81,4,500,"rms"
         self.num = int(input("How Many Balls? (0 for random):"))
         if (self.num == 0):
-        self.g = g
+            self.num = randint(1,1000)
-        self.bls = []
+        if self.f <= 1 and self.f >=0:
-        self.graphing = False
+            self.f = 1
         self.screen = pygame.display.set_mode((self.x,self.y))
-#Class for particles
+
 
-#Initialization of particle variables
+
     def __init__(self):
-        self.radius = r
+        self.radius = world.r
         self.ydisplacement = (world.y/2)
         self.xdisplacement = (world.x/2)
-        self.yvelocity = randint(0,50)
+        self.yvelocity = randint(int(-world.y/3),int(world.y/3))
-        self.xvelocity = randint(-150,150)
+        self.xvelocity = randint(int(-world.x/3),int(world.x/3))
         self.xlist = []
         self.ylist = []
         self.time = 0
         self.falltime = 0
         self.bouncetime = 0
 
-#Calculating Motion of particles
+
         self.time = self.time + 0.001
         self.falltime = self.falltime + 0.001
         self.bouncetime = self.bouncetime + 0.001
         self.yvelocity = self.yvelocity + 2 * world.g * self.falltime
         self.ydisplacement = self.ydisplacement + self.yvelocity * self.falltime + 0.5 * world.g * self.falltime
         self.xdisplacement = self.xdisplacement + self.xvelocity * self.bouncetime
 
     def friction(self):
-                self.xvelocity = 0
+        if not self.xvelocity == 0 and self.xvelocity >= 0:
             self.xvelocity = self.xvelocity - self.xvelocity/world.f
-#Calculating bounces along Y axis
+        elif not self.xvelocity == 0 and self.xvelocity <= 0:
             self.xvelocity = self.xvelocity - self.xvelocity/world.f
         if self.xvelocity >= -0.2 and self.xvelocity <= 0.2:
             self.xvelocity = 0
-            self.ydisplacement = world.y - 1 - self.radius
+
-            if not self.xvelocity == 0 and self.xvelocity >= 0:
+
-                self.xvelocity = self.xvelocity - self.xvelocity/25
+
-            elif not self.xvelocity == 0 and self.xvelocity <= 0:
+
-                self.xvelocity = self.xvelocity - self.xvelocity/25
+            self.ydisplacement = world.y - self.radius
             self.bouncetime = 0
 
         if self.ydisplacement <= 0+self.radius:
             self.yvelocity = (-1) * self.yvelocity
-#Calculating bounces along X axis
+
             self.bouncetime =0
 
     def calc_xbounce(self):
-            self.xdisplacement = world.x - self.radius
+
             self.xvelocity = (-1) * self.xvelocity
             self.xdisplacement = world.x - self.radius
 
         if self.xdisplacement <= 0 + self.radius:
-#Collect particle metrics for plotting
+
-    def tracking(self):
+
-        self.xlist.append(self.xdisplacement + self.radius*2)
+
-        self.ylist.append(self.ydisplacement + self.radius*2)
+
-        if (len(self.xlist)>=2 and world.graphing):
+        self.col = int((((self.xvelocity**2)+(self.yvelocity**2))/2)**0.5)
-            for x in range(0,len(self.xlist)-2):
+        if world.c == "com":
-                pygame.draw.line(world.screen,(0,255,30),(self.xlist[x],self.ylist[x]),(self.xlist[x+1],self.ylist[x+1]),1)
+            pygame.gfxdraw.filled_circle(world.screen,int(self.xdisplacement),int(self.ydisplacement),self.radius,(self.col/2,abs(int(self.yvelocity)),abs(int(self.xvelocity))))
             pygame.gfxdraw.aacircle(world.screen,int(self.xdisplacement),int(self.ydisplacement),self.radius,(self.col/2,abs(int(self.yvelocity)),abs(int(self.xvelocity))))
-#Drawing Particles
+        else:
             pygame.gfxdraw.filled_circle(world.screen,int(self.xdisplacement),int(self.ydisplacement),self.radius,(50,self.col,self.col/2))
-        pygame.gfxdraw.filled_circle(world.screen,int(self.xdisplacement),int(self.ydisplacement),self.radius,(30,0,0))
+            pygame.gfxdraw.aacircle(world.screen,int(self.xdisplacement),int(self.ydisplacement),self.radius,(50,self.col,self.col/2))
-        pygame.gfxdraw.aacircle(world.screen,int(self.xdisplacement),int(self.ydisplacement),self.radius,(100,0,0))
+
-
+
-#Tick event to call other class functions in sequence
+
         self.friction()
         self.calc_ybounce()
         self.calc_xbounce()
         self.draw()
-        self.tracking()
+
 world = wld(options)
 for i in range(0,world.num):
-#Call world and ball classes to initialize and store particles in table.
+
-world = wld(xres,yres,g,r)
+
 while True:
     world.screen.fill((200,200,200))
     tick = world.clock.tick(world.FPS)
-#Main Loop
+
         world.bls[i].tick()
-#Clock and background
+    pygame.display.update()
 
     for event in pygame.event.get():
-#Quit handler
+
             pygame.quit()
             sys.exit()
         if event.type == pygame.KEYDOWN and event.key == pygame.K_SPACE and len(world.bls) <= 500:
             if world.graphing:
-        if event.type == pygame.KEYDOWN and event.key == pygame.K_SPACE:
+
             else:
                 world.graphing = True