Changeset 9287

Timestamp:

2017-07-31 19:53:46 (6 years ago)

Author:

mianhayr

Message:

 

Location:

2017/30/MikkoH/Sq

Files:

• .vs/Sq/v14/.suo (modified) (previous)
• Sq/Sq/Sq.cs (modified) (4 diffs)
• Sq/Sq/bin/x86/Debug/Sq.exe (modified) (previous)
• Sq/Sq/bin/x86/Debug/Sq.pdb (modified) (previous)
• Sq/Sq/obj/x86/Debug/Sq.exe (modified) (previous)
• Sq/Sq/obj/x86/Debug/Sq.pdb (modified) (previous)

2017/30/MikkoH/Sq/Sq/Sq/Sq.cs

@@ -6 +6 @@
 {
     List<Vector> ps, crc;
-    double rad = 50, radc = 0.01, mag = 4;
+    int dist = 10, pts = 150, mag = 100, minmag = 1, maxmag = 300, magc = 4, minrad = 1, maxrad = 100;
+    double rad = 50, radc = 0.01;
 
     public override void Begin()
@@ -14 +15 @@
         Level.Background.Color = Color.Black;
 
-        ps = CreateSquare(100, 10);
-        crc = CreateCircle(50, 150);
+        ps = CreateSquare(mag, dist);
+        crc = CreateCircle(rad, pts);
     }   
 
@@ -30 +31 @@
 
     // r = radius, n = number of pts
-    List<Vector> CreateCircle(int r, int n)
+    List<Vector> CreateCircle(double r, double n)
     {
         List<Vector> crc = new List<Vector>();
@@ -51 +52 @@
         c.BrushColor = Color.Red;
 
+        // draws and squeezes the square
         for (int i = 0; i < ps.Count; i++)
         {
             c.DrawLine(ps[i % ps.Count], ps[(i + ps.Count / 4) % ps.Count]);
-            ps[i] = Vector.FromLengthAndAngle(ps[i].Magnitude + mag, ps[i].Angle);
-            if (ps[i].Magnitude < 1 || ps[i].Magnitude > 300)
-                mag = -mag;
+            ps[i] = Vector.FromLengthAndAngle(ps[i].Magnitude + magc, ps[i].Angle);
+            if (ps[i].Magnitude < minmag || ps[i].Magnitude > maxmag)
+                magc = -magc;
         }
 
         c.BrushColor = Color.Blue;
 
+        // draws and squeezes the circle
         for (int i = 0; i < crc.Count; i++)
         {
             c.DrawLine(crc[i % crc.Count], crc[(i + 2) % crc.Count]);
             crc[i] = new Vector(Math.Sin(i) * rad, Math.Cos(i) * rad);
-            if (rad < 1 || rad > 100) radc = -radc;
+            if (rad < minrad || rad > maxrad) radc = -radc;
             rad -= radc;
         }