Changeset 5650 for 2014/30/MikkoI/frakt

Timestamp:

2014-07-24 16:01:43 (7 years ago)

Author:

mijoilmo

Message:

 

Location:

2014/30/MikkoI/frakt/frakt

Files:

• frakt/Game1.cs (modified) (8 diffs)
• frakt/bin/x86/Debug/Content/fonts (added)
• frakt/bin/x86/Debug/Content/fonts/c.xnb (added)
• frakt/bin/x86/Debug/frakt.exe (modified) (previous)
• frakt/bin/x86/Debug/frakt.pdb (modified) (previous)
• frakt/fonts (added)
• frakt/fonts/ARIALN.TTF (added)
• frakt/fonts/ARIALNB.TTF (added)
• frakt/fonts/ARIALNBI.TTF (added)
• frakt/fonts/ARIALNI.TTF (added)
• frakt/fonts/arial.ttf (added)
• frakt/fonts/arialbd.ttf (added)
• frakt/fonts/arialbi.ttf (added)
• frakt/fonts/ariali.ttf (added)
• frakt/fonts/ariblk.ttf (added)
• frakt/fonts/c.spritefont (added)
• frakt/frakt.csproj (modified) (1 diff)
• frakt/frakt.csproj.Debug.cachefile (added)
• frakt/obj/x86/Debug/ContentPipeline-{223295BE-ACF3-44C6-B8A3-41C3A9AB2E31}.xml (modified) (2 diffs)
• frakt/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• frakt/obj/x86/Debug/cachefile-{223295BE-ACF3-44C6-B8A3-41C3A9AB2E31}-targetpath.txt (added)
• frakt/obj/x86/Debug/frakt.csproj.FileListAbsolute.txt (modified) (1 diff)
• frakt/obj/x86/Debug/frakt.exe (modified) (previous)
• frakt/obj/x86/Debug/frakt.pdb (modified) (previous)
• fraktContent/ARIALN.TTF (added)
• fraktContent/ARIALNB.TTF (added)
• fraktContent/ARIALNBI.TTF (added)
• fraktContent/ARIALNI.TTF (added)
• fraktContent/arial.ttf (added)
• fraktContent/arialbd.ttf (added)
• fraktContent/arialbi.ttf (added)
• fraktContent/ariali.ttf (added)
• fraktContent/ariblk.ttf (added)
• fraktContent/bin/x86/Release (added)
• fraktContent/c.spritefont (added)
• fraktContent/fonts (added)
• fraktContent/fonts/c.spritefont (added)
• fraktContent/fraktContent.contentproj (modified) (1 diff)

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Audio;
@@ -20 +21 @@
         SpriteBatch spriteBatch;
         Vector2 viewportSize;
+        KeyboardState keyboardState;
+        KeyboardState oldKeyboardState;
+        MouseState mouseState;
+        MouseState oldMouseState;
+
+        SpriteFont command;
 
         Texture2D pixel;
+        Texture2D image;
+
+        string commandStr = "";
+
+        decimal[,][] pointData;
+
+        decimal[] gridOffset = new decimal[2] { 0, 0 };
+        decimal[] gridScale = new decimal[2] { 4, 4 };
+        int[] calcResolution = new int[2] { 10, 10 };
+        int calcIterations = 1;
+
+        int incr = 2;
+
+        Color[] data;
 
         public WooooFract()
         {
             graphics = new GraphicsDeviceManager(this);
+            graphics.PreferredBackBufferWidth = 1920;
+            graphics.PreferredBackBufferHeight = 1080;
             Content.RootDirectory = "Content";
         }
@@ -40 +63 @@
             pixel = new Texture2D(GraphicsDevice, 1, 1);
             pixel.SetData(new UInt32[] { UInt32.MaxValue });
+
+            image = new Texture2D(GraphicsDevice, 1, 1);
+
             base.Initialize();
 
-            startRender();
+            piirraKuva();
+        }
+
+        void piirraKuva()
+        {
+            GraphicsDevice.Textures[0] = null;
+
+            image = new Texture2D(GraphicsDevice, (int)calcResolution[0], (int)calcResolution[1]);
+
+            //alusta fraktaalin numeerinen data
+            this.pointData = new decimal[image.Width, image.Height][];
+
+            int threads = 4;
+            Thread[] apurit = new Thread[threads];
+
+            this.data = new Color[image.Width * image.Height];
+            image.GetData(data);
+
+            for (int y = 0; y < threads; y++)
+            {
+                int yy = y;
+                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; }
+                    Test(alku, loppu);
+                });
+
+                apurit[y].Start(null);
+            }
+
+            for (int y = 0; y < threads; y++)
+            {
+                apurit[y].Join();
+            }
+
+            image.SetData(data);
+        }
+
+        void Test(int alku, int loppu)
+        {
+            Random random = new Random();
+            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];
+                    pointData[x, y] = new decimal[4] { VectorX, VectorY, VectorX, VectorY };
+                    for (int iterations = 0; iterations < calcIterations; iterations++)
+                    {
+                        if (doesPointEscape(this.pointData[x, y]))
+                        {
+                            this.data[x + y * image.Width] = getColor(iterations, calcIterations+1);
+                            break;
+                        }
+                        else
+                        {
+                            pointData[x, y] = iteration2d(pointData[x, y]);
+                        }
+                    }
+                }
+            }
+        }
+
+        bool doesPointEscape(decimal[] vec)
+        {
+            if (vec[0] * vec[0] + vec[1] * vec[1] > 4) return true;
+            return false;
+        }
+
+        decimal[] iteration2d(decimal[] vec)
+        {
+            decimal[] nvec = new decimal[4];
+            nvec[0] = vec[0] * vec[0] - vec[1] * vec[1] + vec[2];
+            nvec[1] = 2M * vec[0] * vec[1] + vec[3];
+            nvec[2] = vec[2];
+            nvec[3] = vec[3];
+            return nvec;
         }
 
@@ -53 +158 @@
             // Create a new SpriteBatch, which can be used to draw textures.
             spriteBatch = new SpriteBatch(GraphicsDevice);
+            command = Content.Load<SpriteFont>("fonts/c");
 
             // TODO: use this.Content to load your game content here
@@ -63 +169 @@
         protected override void UnloadContent()
         {
-            // TODO: Unload any non ContentManager content here
+
         }
 
@@ -71 +177 @@
         /// </summary>
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
+
+        bool isKeyPressed(Keys key)
+        {
+            return keyboardState.IsKeyDown(key) && oldKeyboardState.IsKeyUp(key);
+        }
+
+        void commandTypeCheck(){
+            
+        }
+
         protected override void Update(GameTime gameTime)
         {
             // Allows the game to exit
-            if (Keyboard.GetState().IsKeyDown(Keys.Escape))
+
+            this.keyboardState = Keyboard.GetState();
+
+            if (isKeyPressed(Keys.Enter))
+            {
+                incr++;
+                piirraKuva();
+            }
+
+            if (isKeyPressed(Keys.Left))
+            {
+                gridOffset[0] -= gridScale[0] / 10M;//kymmenes imagen koosta
+                piirraKuva();
+            }
+            else if (isKeyPressed(Keys.Right))
+            {
+                gridOffset[0] += gridScale[0] / 10M;
+                piirraKuva();
+            }
+            if (isKeyPressed(Keys.Up))
+            {
+                gridOffset[1] -= gridScale[1] / 10M;
+                piirraKuva();
+            }
+            else if (isKeyPressed(Keys.Down))
+            {
+                gridOffset[1] += gridScale[1] / 10M;
+                piirraKuva();
+            }
+
+            if (isKeyPressed(Keys.Add))
+            {
+                calcResolution[0] *= 2;
+                calcResolution[1] *= 2;
+                piirraKuva();
+            }
+            else if (isKeyPressed(Keys.Subtract))
+            {
+                calcResolution[0] /= 2;
+                calcResolution[1] /= 2;
+                if (calcResolution[0] < 1 || calcResolution[1] < 1) { calcResolution = new int[2] { 1, 1 }; };
+                piirraKuva();
+            }
+
+            if (isKeyPressed(Keys.OemPlus))
+            {
+                calcIterations *= 2;
+                piirraKuva();
+            }
+            else if (isKeyPressed(Keys.OemMinus))
+            {
+                calcIterations /= 2;
+                if (calcIterations < 1) { calcIterations = 1; };
+                piirraKuva();
+            }
+
+            if (keyboardState.IsKeyDown(Keys.Escape))
                 this.Exit();
 
+            commandTypeCheck();
+
+            this.mouseState = Mouse.GetState();
+
+            if (this.mouseState.ScrollWheelValue != this.oldMouseState.ScrollWheelValue)
+            {
+                if (this.mouseState.ScrollWheelValue > this.oldMouseState.ScrollWheelValue)
+                {
+                    gridScale[0] /= 1.1M;
+                    gridScale[1] /= 1.1M;
+                }
+                else if (this.mouseState.ScrollWheelValue < this.oldMouseState.ScrollWheelValue)
+                {
+                    gridScale[0] *= 1.1M;
+                    gridScale[1] *= 1.1M;
+                }
+                piirraKuva();
+            }
+
             // TODO: Add your update logic here
+
+            this.oldMouseState = mouseState;
+            this.oldKeyboardState = keyboardState;
 
             base.Update(gameTime);
@@ -92 +286 @@
         /// </summary>
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
-        Color getColor(int index, int size)
+        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) };
+            index = Math.Abs(index);
             index = index % size;
             size--;
-            float realIndex = (index / size) * (palette.Length - 1);
+            float realIndex = ((float)Math.Floor(index) / size) * (palette.Length - 1);
             Color col1 = palette[(int)Math.Floor(realIndex)];
             Color col2 = palette[(int)Math.Ceiling(realIndex)];
@@ -109 +304 @@
 
             spriteBatch.Begin();
-
-            spriteBatch.Draw(pixel, new Vector2(0, 0), Color.Black);
+            spriteBatch.Draw(image, new Rectangle(0, 0, Window.ClientBounds.Width, Window.ClientBounds.Height), Color.White);
+            spriteBatch.DrawString(command,commandStr,new Vector2(0,0),Color.White);
             spriteBatch.End();
 

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

@@ -116 +116 @@
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="fonts\arial.ttf" />
+    <None Include="fonts\arialbd.ttf" />
+    <None Include="fonts\arialbi.ttf" />
+    <None Include="fonts\ariali.ttf" />
+    <None Include="fonts\ARIALN.TTF" />
+    <None Include="fonts\ARIALNB.TTF" />
+    <None Include="fonts\ARIALNBI.TTF" />
+    <None Include="fonts\ARIALNI.TTF" />
+    <None Include="fonts\ariblk.ttf" />
+    <None Include="fonts\c.spritefont" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />

2014/30/MikkoI/frakt/frakt/frakt/obj/x86/Debug/ContentPipeline-{223295BE-ACF3-44C6-B8A3-41C3A9AB2E31}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>fonts\c.spritefont</Source>
+      <Name>fonts\c</Name>
+      <Importer>FontDescriptionImporter</Importer>
+      <Processor>FontDescriptionProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\MikkoI\frakt\frakt\frakt\bin\x86\Debug\Content\fonts\c.xnb</Output>
+      <Time>2014-07-24T15:56:10.8583036+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -16 +25 @@
     <Assemblies>
       <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
         <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
         <Value>2014-04-22T22:12:48.6351722+03:00</Value>

2014/30/MikkoI/frakt/frakt/frakt/obj/x86/Debug/frakt.csproj.FileListAbsolute.txt

@@ -5 +5 @@
 C:\MyTemp\MikkoI\frakt\frakt\frakt\obj\x86\Debug\frakt.exe
 C:\MyTemp\MikkoI\frakt\frakt\frakt\obj\x86\Debug\frakt.pdb
+C:\MyTemp\MikkoI\frakt\frakt\frakt\bin\x86\Debug\Content\fonts\c.xnb

2014/30/MikkoI/frakt/frakt/fraktContent/fraktContent.contentproj

@@ -30 +30 @@
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.VideoImporters, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=MSIL" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="fonts\c.spritefont">
+      <Name>c</Name>
+      <Importer>FontDescriptionImporter</Importer>
+      <Processor>FontDescriptionProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.