Changeset 5693 for 2014/30/MikkoI/frakt

Timestamp:

2014-07-25 12:35:58 (8 years ago)

Author:

mijoilmo

Message:

 

Location:

2014/30/MikkoI/frakt

Files:

• frakt.sln (modified) (1 diff)
• frakt.suo (modified) (previous)
• frakt/frakt/Game1.cs (modified) (16 diffs)
• frakt/frakt/bin/x86/Debug/BRANCHFRAC1.png (added)
• frakt/frakt/bin/x86/Debug/frakt.exe (modified) (previous)
• frakt/frakt/bin/x86/Debug/frakt.pdb (modified) (previous)
• frakt/frakt/bin/x86/Release (added)
• frakt/frakt/frakt.csproj (modified) (1 diff)
• 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/frakt/obj/x86/Release (added)
• frakt/frakt/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache (added)
• frakt/frakt/obj/x86/Release/TempPE (added)
• frakt/fraktContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• frakt/fraktContent/obj/x86/Debug/fraktContent.contentprojResolveAssemblyReference.cache (modified) (previous)
• frakt/fraktContent/obj/x86/Release (added)
• frakt/fraktContent/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache (added)
• frakt/fraktContent/obj/x86/Release/TempPE (added)

2014/30/MikkoI/frakt/frakt.sln

@@ -4 +4 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "frakt", "frakt\frakt\frakt.csproj", "{F9E4E698-C16A-4607-A0C5-F26305364268}"
 EndProject
-Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "fraktContent", "frakt\fraktContent\fraktContent.contentproj", "{223295BE-ACF3-44C6-B8A3-41C3A9AB2E31}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fraktContent", "frakt\fraktContent\fraktContent.contentproj", "{223295BE-ACF3-44C6-B8A3-41C3A9AB2E31}"
 EndProject
 Global

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

@@ -10 +10 @@
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Media;
+using System.IO;
 
 namespace frakt
@@ -28 +29 @@
         SpriteFont command;
 
+        Vector2 imageSize = Vector2.Zero;
+
         Texture2D pixel;
-        Texture2D image;
+        System.Drawing.Bitmap image;
+        Texture2D referenceImage;
 
         string commandStr = "";
         bool infoHide = false;
+        string errorMessage = "";
 
         decimal[,][] pointData;
@@ -65 +70 @@
             pixel.SetData(new UInt32[] { UInt32.MaxValue });
 
-            image = new Texture2D(GraphicsDevice, 1, 1);
-
             base.Initialize();
 
@@ -76 +79 @@
             GraphicsDevice.Textures[0] = null;
 
-            image = new Texture2D(GraphicsDevice, (int)calcResolution[0], (int)calcResolution[1]);
+            //if (calcResolution[0] > 2048) { calcResolution[0] = 2048; }
+            //if (calcResolution[1] > 2048) { calcResolution[1] = 2048; }
+
+            int threads = 1;
+
+            imageSize = new Vector2(calcResolution[0], calcResolution[1]);
+            if (image!=null) image.Dispose();
+            System.Drawing.Bitmap[] images = new System.Drawing.Bitmap[threads];
 
             //alusta fraktaalin numeerinen data
-            this.pointData = new decimal[image.Width, image.Height][];
-
-            int threads = 4;
+            this.pointData = new decimal[(int)imageSize.X, (int)imageSize.Y][];
+
+            image = new System.Drawing.Bitmap((int)imageSize.X, (int)imageSize.Y);
+
+            
             Thread[] apurit = new Thread[threads];
 
-            this.data = new Color[image.Width * image.Height];
-            image.GetData(data);
+            this.data = new Color[(int)imageSize.X * (int)imageSize.Y];
 
             for (int y = 0; y < threads; y++)
@@ -92 +103 @@
                 apurit[y] = new Thread(delegate(object o)
                 {
-                    int alku = (image.Height / threads) * yy;
-                    int loppu = (image.Height / threads) * (yy + 1);
-                    if (yy == threads - 1) { loppu = image.Height; }
+                    int alku = ((int)imageSize.Y / threads) * yy;
+                    int loppu = ((int)imageSize.Y / threads) * (yy + 1);
+                    if (yy == threads - 1) { loppu = (int)imageSize.Y; }
+                    
                     Test(alku, loppu);
                 });
@@ -106 +118 @@
             }
 
-            image.SetData(data);
+            /*//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);
+
+            */
+
+            Vector2 refSize = new Vector2(Math.Min(image.Width, 2048), Math.Min(image.Height, 2048));
+
+            Color[] pixels = new Color[(int)(refSize.X * refSize.Y)];
+            for (int y = 0; y < refSize.Y; y++)
+            {
+                for (int x = 0; x < refSize.X; x++)
+                {
+                    System.Drawing.Color c = image.GetPixel(x, y);
+                    pixels[(y * (int)refSize.X) + x] = new Color(c.R, c.G, c.B, c.A);
+                }
+            }
+
+            referenceImage = new Texture2D(GraphicsDevice, (int)refSize.X, (int)refSize.Y);
+            referenceImage.SetData<Color>(pixels);
         }
 
@@ -112 +145 @@
         {
             Random random = new Random();
+
+            System.Drawing.Bitmap thisImage = new System.Drawing.Bitmap((int)imageSize.X, loppu - alku);
+
             for (int y = alku; y < loppu; y++)
             {
-                for (int x = 0; x < image.Width; x++)
-                {
-                    decimal VectorX = (gridScale[0] / image.Width) * x - (gridScale[0] / 2M) + gridOffset[0];
-                    decimal VectorY = (gridScale[1] / image.Height) * y - (gridScale[1] / 2M) + gridOffset[1];
+                for (int x = 0; x < imageSize.X; x++)
+                {
+                    decimal VectorX = (gridScale[0] / (int)imageSize.X) * x - (gridScale[0] / 2M) + gridOffset[0];
+                    decimal VectorY = (gridScale[1] / (int)imageSize.Y) * y - (gridScale[1] / 2M) + gridOffset[1];
                     pointData[x, y] = new decimal[4] { VectorX, VectorY, VectorX, VectorY };
                     for (int iterations = 0; iterations < calcIterations; iterations++)
@@ -123 +159 @@
                         if (doesPointEscape(this.pointData[x, y]))
                         {
-                            this.data[x + y * image.Width] = getColor(iterations, calcIterations + 1);
+                            image.SetPixel(x, y, getColor(iterations, calcIterations + 1));
                             break;
                         }
@@ -144 +180 @@
         {
             decimal[] nvec = new decimal[4];
+            decimal branchLevel = 2M;
             nvec[0] =
-                //1M * vec[0] - vec[1] * vec[1] - 1M * 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] =
-                //1M * vec[1] - vec[0] * vec[0] - 1M * 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];
@@ -197 +234 @@
                 switch (commandSplit[0])
                 {
-                    case "I":
+                    case "I"://set iterations
                         calcIterations = Convert.ToInt32(commandSplit[1]);
                         break;
-                    case "R":
+                    case "R"://set resolution
                         switch (commandSplit[1])
                         {
@@ -213 +250 @@
                                 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] = Convert.ToInt32(commandSplit[1]);
@@ -219 +264 @@
                         }
                         break;
-                    case "P":
+                    case "P"://set position
                         switch (commandSplit[1])
                         {
@@ -238 +283 @@
                         }
                         break;
-                    case "H":
+                    case "H"://hide / show hud
                         infoHide = !infoHide;
                         break;
-                    case "RUN":
+                    case "W"://set window size
+                        graphics.IsFullScreen = false;
+                        switch (commandSplit[1])
+                        {
+                            case "X":
+                                graphics.PreferredBackBufferWidth = Convert.ToInt32(commandSplit[2]);
+                                break;
+                            case "Y":
+                                graphics.PreferredBackBufferHeight = Convert.ToInt32(commandSplit[2]);
+                                break;
+                            case "F":
+                                graphics.PreferredBackBufferWidth = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
+                                graphics.PreferredBackBufferHeight = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
+                                graphics.IsFullScreen = true;
+                                break;
+                            default:
+                                graphics.PreferredBackBufferWidth = Convert.ToInt32(commandSplit[1]);
+                                graphics.PreferredBackBufferHeight = Convert.ToInt32(commandSplit[1]);
+                                break;
+                        }
+                        graphics.ApplyChanges();
+                        break;
+                    case "S"://Save image
+                        string filePath = "";
+                        if (commandSplit.Length == 1)
+                        {
+                            filePath = DateTime.Now.ToString("MM-dd-yy H;mm;ss") + ".png";
+                        }
+                        else
+                        {
+                            filePath = commandSplit[1] + ".png";
+                        }
+                        //Stream stream = File.Create(filePath);
+                        image.Save(filePath);
+                        //stream.Dispose();
+                        break;
+                    case "RUN"://render
                         renderImage();
                         break;
-                }
-            }
-            catch (System.Exception) {}
+                    case "EXIT"://exit
+                        Exit();
+                        break;
+                }
+            }
+            catch (System.Exception e)
+            {
+                errorMessage = e.Message;
+            }
         }
 
@@ -427 +514 @@
         /// </summary>
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
-        Color getColor(float index, float size)
+        System.Drawing.Color getColor(float index, float size)
         {
             Color[] palette = { new Color(0, 0, 0), new Color(255, 0, 0), new Color(255, 255, 0), new Color(0, 255, 0), new Color(0, 255, 255), new Color(0, 0, 255), new Color(0, 0, 0) };
@@ -437 +524 @@
             Color col2 = palette[(int)Math.Ceiling(realIndex)];
             float rel = realIndex - (float)Math.Floor(realIndex);
-            return Color.Lerp(col1, col2, rel);
+            return convertColor(Color.Lerp(col1, col2, rel));
+        }
+        System.Drawing.Color convertColor(Color color)
+        {
+            return System.Drawing.Color.FromArgb(color.R, color.G, color.B);
         }
         protected override void Draw(GameTime gameTime)
@@ -445 +536 @@
 
             spriteBatch.Begin();
-            spriteBatch.Draw(image, new Rectangle(0, 0, Window.ClientBounds.Width, Window.ClientBounds.Height), Color.White);
+            spriteBatch.Draw(referenceImage, new Rectangle(0, 0, Window.ClientBounds.Width, Window.ClientBounds.Height), Color.White);
             spriteBatch.DrawString(command, commandStr, new Vector2(0, 0), Color.Gray);
             if (!infoHide)
-            spriteBatch.DrawString(command,
-                "i:" + calcIterations + " r:(" + calcResolution[0] + "," + calcResolution[1] +
-                ")\nP:(" + gridOffset[0] +
-                ",\n" + gridOffset[1] +
-                ")\ns:" + gridScale[0]
-                , new Vector2(0, Window.ClientBounds.Height - command.LineSpacing * 4), Color.Red);
+            {
+                spriteBatch.DrawString(command,
+                    "i:" + calcIterations + " r:(" + calcResolution[0] + "," + calcResolution[1] +
+                    ")\nP:(" + gridOffset[0] +
+                    ",\n" + gridOffset[1] +
+                    ")\ns:" + gridScale[0]
+                    , new Vector2(0, Window.ClientBounds.Height - command.LineSpacing * 4), Color.HotPink);
+                spriteBatch.DrawString(command, errorMessage, new Vector2(Window.ClientBounds.Width - command.MeasureString(errorMessage).X, 0), Color.Red);
+            }
             spriteBatch.End();
 

2014/30/MikkoI/frakt/frakt/frakt/frakt.csproj

@@ -67 +67 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />