Changeset 5651 for 2014/30/MikkoI/frakt/frakt

Timestamp:

2014-07-24 17:58:59 (8 years ago)

Author:

mijoilmo

Message:

 

Location:

2014/30/MikkoI/frakt/frakt

Files:

• frakt/Game1.cs (modified) (4 diffs)
• frakt/bin/x86/Debug/frakt.exe (modified) (previous)
• frakt/bin/x86/Debug/frakt.pdb (modified) (previous)
• frakt/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• frakt/obj/x86/Debug/frakt.csproj.FileListAbsolute.txt (modified) (1 diff)
• frakt/obj/x86/Debug/frakt.csprojResolveAssemblyReference.cache (modified) (previous)
• frakt/obj/x86/Debug/frakt.exe (modified) (previous)
• frakt/obj/x86/Debug/frakt.pdb (modified) (previous)
• fraktContent/obj/x86/Debug/ContentPipeline.xml (added)
• fraktContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• fraktContent/obj/x86/Debug/fraktContent.contentproj.FileListAbsolute.txt (modified) (1 diff)
• fraktContent/obj/x86/Debug/fraktContent.contentprojResolveAssemblyReference.cache (modified) (previous)

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

@@ -122 +122 @@
                         if (doesPointEscape(this.pointData[x, y]))
                         {
-                            this.data[x + y * image.Width] = getColor(iterations, calcIterations+1);
+                            this.data[x + y * image.Width] = getColor(iterations, calcIterations + 1);
                             break;
                         }
@@ -143 +143 @@
         {
             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[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
+            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
             nvec[2] = vec[2];
             nvec[3] = vec[3];
@@ -183 +187 @@
         }
 
-        void commandTypeCheck(){
-            
+        void commandTypeCheck()
+        {
+
         }
 
@@ -305 +310 @@
             spriteBatch.Begin();
             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.DrawString(command, commandStr, new Vector2(0, 0), Color.White);
             spriteBatch.End();
 

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

@@ -6 +6 @@
 C:\MyTemp\MikkoI\frakt\frakt\frakt\obj\x86\Debug\frakt.pdb
 C:\MyTemp\MikkoI\frakt\frakt\frakt\bin\x86\Debug\Content\fonts\c.xnb
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\bin\x86\Debug\Content\fonts\c.xnb
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\bin\x86\Debug\frakt.exe
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\bin\x86\Debug\frakt.pdb
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\obj\x86\Debug\frakt.csprojResolveAssemblyReference.cache
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\obj\x86\Debug\frakt.exe
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\frakt\obj\x86\Debug\frakt.pdb

2014/30/MikkoI/frakt/frakt/fraktContent/obj/x86/Debug/fraktContent.contentproj.FileListAbsolute.txt

@@ -1 +1 @@
 C:\MyTemp\MikkoI\frakt\frakt\fraktContent\obj\x86\Debug\fraktContent.contentprojResolveAssemblyReference.cache
+D:\Csharp feat jypeli\MikkoI\frakt\frakt\fraktContent\obj\x86\Debug\fraktContent.contentprojResolveAssemblyReference.cache