Changeset 5705 for 2014/30

Timestamp:

2014-08-18 20:43:16 (9 years ago)

Author:

mijoilmo

Message:

update

Location:

2014/30/MikkoI/frakt

Files:

• frakt.suo (modified) (previous)
• frakt/frakt/Game1.cs (modified) (20 diffs)
• frakt/frakt/bin/x86/Debug/frakt.exe (modified) (previous)
• frakt/frakt/bin/x86/Debug/frakt.pdb (modified) (previous)
• frakt/frakt/obj/x86/Debug/frakt.exe (modified) (previous)
• frakt/frakt/obj/x86/Debug/frakt.pdb (modified) (previous)

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

@@ -39 +39 @@
         string errorMessage = "";
 
+        bool rendering = false;
+
+        bool allowPanorama = false;
+
         decimal[,][] pointData;
 
         decimal[] gridOffset = new decimal[2] { 0, 0 };
         decimal[] gridScale = new decimal[2] { 4, 4 };
-        int[] calcResolution = new int[2] { 10, 10 };
+        decimal[] calcResolution = new decimal[2] { 10, 10 };
         int calcIterations = 1;
         int iterationColors = 1;
@@ -53 +57 @@
 
         Color[] data;
+
+        int maxThreads = 4;
 
         public WooooFract()
@@ -82 +88 @@
         void renderImage()
         {
-
+            rendering = true;
             viewportSize.X = Window.ClientBounds.Width;
             viewportSize.Y = Window.ClientBounds.Height;
@@ -91 +97 @@
             //if (calcResolution[1] > 2048) { calcResolution[1] = 2048; }
 
-            int threads = 1;
-
-            imageSize = new Vector2(calcResolution[0], calcResolution[1]);
+            int threads = Math.Min(maxThreads, (int)Math.Min(calcResolution[0], calcResolution[1]));
+
+            imageSize = new Vector2((int)calcResolution[0], (int)calcResolution[1]);
+
             if (image != null) image.Dispose();
+            this.pointData = null;
+
             System.Drawing.Bitmap[] images = new System.Drawing.Bitmap[threads];
 
@@ -116 +125 @@
                     if (yy == threads - 1) { loppu = (int)imageSize.Y; }
 
-                    Test(alku, loppu);
+                    images[yy] = Test(alku, loppu);
                 });
 
@@ -127 +136 @@
             }
 
-            /*//yhdistä threadien omat imaget
-            int totalHeight = 0;
-            for (var g = 0; g < threads; g++) { totalHeight += images[g].Height; }
-
-            image = new System.Drawing.Bitmap((int)imageSize.X, (int)totalHeight);
-
-            */
+            using (System.Drawing.Graphics grfx = System.Drawing.Graphics.FromImage(image))
+            {
+                int totalY = 0;
+                for (var y = 0; y < threads; y++)
+                {
+                    grfx.DrawImage(images[y], 0, totalY);
+                    totalY += images[y].Height;
+                }
+            }
 
             Vector2 refSize = new Vector2(Math.Min(image.Width, 2048), Math.Min(image.Height, 2048));
@@ -149 +160 @@
             referenceImage = new Texture2D(GraphicsDevice, (int)refSize.X, (int)refSize.Y);
             referenceImage.SetData<Color>(pixels);
-        }
-
-        void Test(int alku, int loppu)
+            rendering = false;
+        }
+
+        System.Drawing.Bitmap Test(int alku, int loppu)
         {
             Random random = new Random();
@@ -168 +180 @@
                         if (doesPointEscape(this.pointData[x, y]))
                         {
-                            image.SetPixel(x, y, getColor(iterations, iterationColors + 1));
+                            thisImage.SetPixel(x, y - alku, getColor(iterations, iterationColors + 1));
                             break;
                         }
@@ -178 +190 @@
                 }
             }
+            return thisImage;
         }
 
         bool doesPointEscape(decimal[] vec)
         {
-            if (vec[0] * vec[0] + vec[1] * vec[1] > 4) return true;
-            return false;
+            return vec[0] * vec[0] + vec[1] * vec[1] > 4;
         }
 
@@ -244 +256 @@
                 {
                     case "I"://set iterations
-                        calcIterations = Convert.ToInt32(commandSplit[1]);
+                        switch (commandSplit[1])
+                        {
+                            case "C":
+                                iterationColors = Convert.ToInt32(commandSplit[2]);
+                                break;
+                            default:
+                                calcIterations = Convert.ToInt32(commandSplit[1]);
+                                break;
+                        }
                         break;
                     case "R"://set resolution
@@ -250 +270 @@
                         {
                             case "X":
-                                calcResolution[0] = Convert.ToInt32(commandSplit[2]);
+                                calcResolution = Factorize(calcResolution, decimal.Parse(commandSplit[2]), true);
                                 break;
                             case "Y":
-                                calcResolution[1] = Convert.ToInt32(commandSplit[2]);
-                                break;
-                            case "F":
-                                calcResolution[0] = Window.ClientBounds.Width;
-                                calcResolution[1] = Window.ClientBounds.Height;
-                                break;
-                            case "A":
-                                calcResolution[0] = Math.Max(calcResolution[0], calcResolution[1]);
-                                calcResolution[1] = Math.Max(calcResolution[0], calcResolution[1]);
-                                break;
-                            case "I":
-                                calcResolution[0] = Math.Min(calcResolution[0], calcResolution[1]);
-                                calcResolution[1] = Math.Min(calcResolution[0], calcResolution[1]);
+                                calcResolution = Factorize(calcResolution, decimal.Parse(commandSplit[2]), false);
+                                break;
+                            case "S"://Hard set
+                                switch (commandSplit[2])
+                                {
+                                    case "X":
+                                        calcResolution[0] = Convert.ToInt32(commandSplit[3]);
+                                        break;
+                                    case "Y":
+                                        calcResolution[1] = Convert.ToInt32(commandSplit[3]);
+                                        break;
+                                    case "F":
+                                        calcResolution[0] = Window.ClientBounds.Width;
+                                        calcResolution[1] = Window.ClientBounds.Height;
+                                        break;
+                                    case "A":
+                                        calcResolution[0] = Math.Max(calcResolution[0], calcResolution[1]);
+                                        calcResolution[1] = Math.Max(calcResolution[0], calcResolution[1]);
+                                        break;
+                                    case "I":
+                                        calcResolution[0] = Math.Min(calcResolution[0], calcResolution[1]);
+                                        calcResolution[1] = Math.Min(calcResolution[0], calcResolution[1]);
+                                        break;
+                                    default:
+                                        calcResolution[0] = int.Parse(commandSplit[2]);
+                                        calcResolution[1] = int.Parse(commandSplit[2]);
+                                        break;
+                                }
                                 break;
                             default:
-                                calcResolution[0] = Convert.ToInt32(commandSplit[1]);
-                                calcResolution[1] = Convert.ToInt32(commandSplit[1]);
+                                calcResolution = Factorize(calcResolution, decimal.Parse(commandSplit[1]));
                                 break;
                         }
                         break;
-                    case "P"://set position
+                    case "O"://set offset
                         switch (commandSplit[1])
                         {
@@ -291 +325 @@
                                 break;
                         }
+                        break;
+                    case "P":
+                        allowPanorama = !allowPanorama;
                         break;
                     case "H"://hide / show hud
@@ -343 +380 @@
                 errorMessage = e.Message;
             }
+        }
+
+        decimal[] Factorize(decimal[] input, decimal factor, bool overr = false)
+        {
+            if (input[0] > input[1] || overr)
+            {
+                input[1] = (input[1] / input[0]) * factor;
+                input[0] = factor;
+            }
+            else
+            {
+                input[0] = (input[0] / input[1]) * factor;
+                input[1] = factor;
+            }
+            return input;
+        }
+
+        int[] Factorize(int[] input, double factor, bool overr = false)
+        {
+            if (input[0] > input[1] || overr)
+            {
+                input[1] = (int)(((double)input[1] / (double)input[0]) * factor);
+                input[0] = (int)factor;
+            }
+            else
+            {
+                input[0] = (int)(((double)input[0] / (double)input[1]) * factor);
+                input[1] = (int)factor;
+            }
+            return input;
         }
 
@@ -479 +546 @@
                     calcResolution[1] -= 1;
                 }
-                if (calcResolution[0] < 1 || calcResolution[1] < 1) { calcResolution = new int[2] { 1, 1 }; };
+                if (calcResolution[0] < 1 || calcResolution[1] < 1) { calcResolution = new decimal[2] { 1, 1 }; };
                 renderImage();
             }
@@ -531 +598 @@
             }
 
-            if (IsActive)
+            if (
+                IsActive // if window is active
+                && !(Window.ClientBounds.Width == 0 || Window.ClientBounds.Height == 0) // and it's not minimized
+                && mouseState.X > 0 && mouseState.Y > 0 // and mouse is 
+                && mouseState.X < graphics.PreferredBackBufferWidth && mouseState.Y < graphics.PreferredBackBufferHeight // in the window
+                )
             {
                 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);
-                    }
+                    downPos = new decimal[2] { mouseState.X, mouseState.Y };
                 }
                 if (mouseState.LeftButton == ButtonState.Released && oldMouseState.LeftButton != ButtonState.Released)
@@ -546 +615 @@
                     if (!(Window.ClientBounds.Width == 0 || Window.ClientBounds.Height == 0) && downPos != null)
                     {
-                        upPos = getMousePos(mouseState);
+                        upPos = new decimal[2] { mouseState.X, mouseState.Y };
                         rezToMouse(downPos, upPos);
                     }
@@ -560 +629 @@
         }
 
-        decimal[] getMousePos(MouseState mouse)
+        decimal[] getMousePos(decimal[] 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]
+                    ((mouse[0] - (decimal)viewportSize.X / 2) / (decimal)viewportSize.X) * gridScale[0] + gridOffset[0],
+                    ((mouse[1] - (decimal)viewportSize.Y / 2) / (decimal)viewportSize.Y) * gridScale[1] + gridOffset[1]
                 };
         }
@@ -570 +639 @@
         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; }
+            //if panorama is not allowed, scale is always a square. Otherwise resolution is bound to scale
+            decimal[] scale = new decimal[2] { Math.Abs(botright[0] - topleft[0]), Math.Abs(botright[1] - topleft[1]) };
+            topleft = getMousePos(topleft);
+            botright = getMousePos(botright);
+            decimal[] gScale = new decimal[2] { Math.Abs(botright[0] - topleft[0]), Math.Abs(botright[1] - topleft[1]) };
+
+            if (gScale[0] == 0 || gScale[1] == 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();
+
+            decimal bigger = Math.Max(gScale[0], gScale[1]);
+            if (allowPanorama)
+            {
+                calcResolution[0] = (int)((scale[0] * (decimal)viewportSize.X) / calcResolution[0]);
+                calcResolution[1] = (int)((scale[1] * (decimal)viewportSize.Y) / calcResolution[1]);
+            }
+            else
+            {
+                gScale = new decimal[2] { bigger, bigger };
+            }
+            gridScale = gScale;
+            if (!allowPanorama) { renderImage(); }
         }
 
@@ -600 +686 @@
         protected override void Draw(GameTime gameTime)
         {
+            if (rendering) { return; }
             GraphicsDevice.Clear(Color.White);
             // TODO: Add your drawing code here
@@ -609 +696 @@
             {
                 spriteBatch.DrawString(command,
-                    "i:" + calcIterations + " r:(" + calcResolution[0] + "," + calcResolution[1] +
+                    "i:" + calcIterations + "/" + iterationColors + 
+                    "\nr:(" + calcResolution[0] + "," + calcResolution[1] +
+                    ")\nRT:(" + (calcResolution[0] * calcResolution[1]) +
                     ")\nP:(" + gridOffset[0] +
                     ",\n" + gridOffset[1] +