Changeset 5701

Timestamp:

2014-07-29 13:18:12 (9 years ago)

Author:

mijoilmo

Message:

frakt
hiirellä navigointi

Location:

2014/30/MikkoI/frakt

Files:

• frakt.suo (modified) (previous)
• frakt/frakt/Game1.cs (modified) (11 diffs)
• frakt/frakt/bin/x86/Debug/07-29-14 11;41;39.png (added)
• frakt/frakt/bin/x86/Debug/07-29-14 11;54;28.png (added)
• frakt/frakt/bin/x86/Debug/frakt.exe (modified) (previous)
• frakt/frakt/bin/x86/Debug/frakt.pdb (modified) (previous)
• frakt/frakt/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• frakt/frakt/obj/x86/Debug/frakt.csprojResolveAssemblyReference.cache (modified) (previous)
• frakt/frakt/obj/x86/Debug/frakt.exe (modified) (previous)
• frakt/frakt/obj/x86/Debug/frakt.pdb (modified) (previous)
• frakt/fraktContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• frakt/fraktContent/obj/x86/Debug/fraktContent.contentprojResolveAssemblyReference.cache (modified) (previous)

2014/30/MikkoI/frakt/frakt/frakt/Game1.cs

@@ -45 +45 @@
         int[] calcResolution = new int[2] { 10, 10 };
         int calcIterations = 1;
+        int iterationColors = 1;
+
+        decimal[] downPos;
+        decimal[] upPos;
 
         GameTime gameTime;
@@ -56 +60 @@
             graphics.PreferredBackBufferHeight = 500;
             Content.RootDirectory = "Content";
+            IsMouseVisible = true;
         }
 
@@ -77 +82 @@
         void renderImage()
         {
+
+            viewportSize.X = Window.ClientBounds.Width;
+            viewportSize.Y = Window.ClientBounds.Height;
+
             GraphicsDevice.Textures[0] = null;
 
@@ -85 +94 @@
 
             imageSize = new Vector2(calcResolution[0], calcResolution[1]);
-            if (image!=null) image.Dispose();
+            if (image != null) image.Dispose();
             System.Drawing.Bitmap[] images = new System.Drawing.Bitmap[threads];
 
@@ -93 +102 @@
             image = new System.Drawing.Bitmap((int)imageSize.X, (int)imageSize.Y);
 
-            
+
             Thread[] apurit = new Thread[threads];
 
@@ -106 +115 @@
                     int loppu = ((int)imageSize.Y / threads) * (yy + 1);
                     if (yy == threads - 1) { loppu = (int)imageSize.Y; }
-                    
+
                     Test(alku, loppu);
                 });
@@ -159 +168 @@
                         if (doesPointEscape(this.pointData[x, y]))
                         {
-                            image.SetPixel(x, y, getColor(iterations, calcIterations + 1));
+                            image.SetPixel(x, y, getColor(iterations, iterationColors + 1));
                             break;
                         }
@@ -182 +191 @@
             decimal branchLevel = 2M;
             nvec[0] =
-                branchLevel * vec[0] - vec[1] * vec[1] - branchLevel * vec[1] * vec[0] * vec[0]; // branch
-            //vec[0] * vec[0] - vec[1] * vec[1] + vec[2]; // mandelbrot
+                //branchLevel * vec[0] - vec[1] * vec[1] - branchLevel * vec[1] * vec[0] * vec[0]; // branch
+            vec[0] * vec[0] - vec[1] * vec[1] + vec[2]; // mandelbrot
             nvec[1] =
-                branchLevel * vec[1] - vec[0] * vec[0] - branchLevel * vec[0] * vec[1] * vec[1]; // branch
-            //2M * vec[0] * vec[1] + vec[3]; // mandelbrot
+                //branchLevel * vec[1] - vec[0] * vec[0] - branchLevel * vec[0] * vec[1] * vec[1]; // branch
+            2M * vec[0] * vec[1] + vec[3]; // mandelbrot
             nvec[2] = vec[2];
             nvec[3] = vec[3];
@@ -418 +427 @@
             }
 
+            if (isKeyPressed(Keys.RightShift))
+            {
+                if (keyboardState.IsKeyDown(Keys.LeftShift))
+                {
+                    iterationColors *= 2;
+                }
+                else
+                {
+                    iterationColors += 1;
+                }
+                renderImage();
+            }
+            else if (isKeyPressed(Keys.RightControl))
+            {
+                if (keyboardState.IsKeyDown(Keys.LeftShift))
+                {
+                    iterationColors /= 2;
+                }
+                else
+                {
+                    iterationColors -= 1;
+                }
+                if (iterationColors < 1) { iterationColors = 1; };
+                renderImage();
+            }
+
             if (isKeyPressed(Keys.Add))
             {
@@ -496 +531 @@
             }
 
+            if (IsActive)
+            {
+                if (mouseState.LeftButton == ButtonState.Pressed && oldMouseState.LeftButton != ButtonState.Pressed)
+                {
+                    //mouse is down and dragging
+                    if (!(Window.ClientBounds.Width == 0 || Window.ClientBounds.Height == 0))
+                    {
+                        downPos = getMousePos(mouseState);
+                    }
+                }
+                if (mouseState.LeftButton == ButtonState.Released && oldMouseState.LeftButton != ButtonState.Released)
+                {
+                    //mouse is up
+                    if (!(Window.ClientBounds.Width == 0 || Window.ClientBounds.Height == 0) && downPos != null)
+                    {
+                        upPos = getMousePos(mouseState);
+                        rezToMouse(downPos, upPos);
+                    }
+                }
+            }
+
             // TODO: Add your update logic here
 
@@ -504 +560 @@
         }
 
-        void startRender()
-        {
-            viewportSize.X = Window.ClientBounds.Width;
-            viewportSize.Y = Window.ClientBounds.Height;
+        decimal[] getMousePos(MouseState mouse)
+        {
+            return new decimal[2] {
+                    (((decimal)mouse.X - (decimal)viewportSize.X / 2) / (decimal)viewportSize.X) * gridScale[0] + gridOffset[0],
+                    (((decimal)mouse.Y - (decimal)viewportSize.Y / 2) / (decimal)viewportSize.Y) * gridScale[1] + gridOffset[1]
+                };
+        }
+
+        void rezToMouse(decimal[] topleft, decimal[] botright)
+        {
+            decimal scale = Math.Max(Math.Abs(botright[0] - topleft[0]), Math.Abs(botright[1] - topleft[1]));
+            if (scale == 0) { return; }
+            decimal[] center = new decimal[2] { topleft[0] + (botright[0] - topleft[0]) / 2, topleft[1] + (botright[1] - topleft[1]) / 2 };
+            gridOffset = center;
+            gridScale = new decimal[2] { scale, scale };
+            renderImage();
         }