Update source to compile on VS Studio for mac

diff --git a/SuperPolarity/ActorFactory.cs b/SuperPolarity/ActorFactory.cs
index f9c7697b2bb2b3b13f3e12db48d176d2215c85b1..1a8c10eb357c405b3e756ddb6a47d987df378763 100644 (file)
--- a/SuperPolarity/ActorFactory.cs
+++ b/SuperPolarity/ActorFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -132,8 +132,8 @@ namespace SuperPolarity
             ship.MaxVelocity = 0.5f;
             ship.FleeVelocity = 5;
             ship.ChargeVelocity = 1;
             ship.MaxVelocity = 0.5f;
             ship.FleeVelocity = 5;
             ship.ChargeVelocity = 1;

-            ship.Value = 10;
-            ship.HP = 29;
+                       ship.Value = 7;
+                       ship.HP = 39;

             ship.SetPolarity(polarity);
 
             ActorManager.CheckIn(ship);
             ship.SetPolarity(polarity);
 
             ActorManager.CheckIn(ship);

diff --git a/SuperPolarity/ActorManager.cs b/SuperPolarity/ActorManager.cs
index 56db26c1570603128a1d8493cd6081b900e9d7e3..3a9b0db9c826f7448e24ddd4f4cc3344ad70d4cb 100644 (file)
--- a/SuperPolarity/ActorManager.cs
+++ b/SuperPolarity/ActorManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -47,6 +47,11 @@ namespace SuperPolarity
             foreach (Actor actor in Actors)
             {
                 actor.Draw(spriteBatch);
             foreach (Actor actor in Actors)
             {
                 actor.Draw(spriteBatch);

+
+                               if (actor.GetType ().IsAssignableFrom (typeof(MainShip))) {
+                                       var mainActor = (MainShip)actor;
+                                       mainActor.ResetEnemyModification ();
+                               }

             }
         }
 
             }
         }
 


@@ -102,6 +107,16 @@ namespace SuperPolarity
                 var angle = (float) Math.Atan2(dy, dx);
                 var otherAngle = (float)Math.Atan2(-dy, -dx);
 
                 var angle = (float) Math.Atan2(dy, dx);
                 var otherAngle = (float)Math.Atan2(-dy, -dx);
 

+                               if (actor.GetType ().IsAssignableFrom (typeof(MainShip))) {
+                                       var mainActor = (MainShip)actor;
+                                       mainActor.UpdateEnemyModification (other);
+                               }
+
+                               if (other.GetType ().IsAssignableFrom (typeof(MainShip))) {
+                                       var mainOther = (MainShip)other;
+                                       mainOther.UpdateEnemyModification (actor);
+                               }
+

                 if (linearDistance < actor.MagneticRadius || linearDistance < other.MagneticRadius)
                 {
                     actor.Magnetize(other, (float)linearDistance, angle);
                 if (linearDistance < actor.MagneticRadius || linearDistance < other.MagneticRadius)
                 {
                     actor.Magnetize(other, (float)linearDistance, angle);

diff --git a/SuperPolarity/Actors/Actor.cs b/SuperPolarity/Actors/Actor.cs
index 2c6a895e104150d4067cc0233db3cee9363e27a8..b25de42acb309b6e727fc77e89105cde0e5104af 100644 (file)
--- a/SuperPolarity/Actors/Actor.cs
+++ b/SuperPolarity/Actors/Actor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Actors/Bullet.cs b/SuperPolarity/Actors/Bullet.cs
index 13d61c15007950172ca79d1535ef9e11334efb97..780177765a6f4abd79bce6c694e5bfa15873358b 100644 (file)
--- a/SuperPolarity/Actors/Bullet.cs
+++ b/SuperPolarity/Actors/Bullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Actors/GameActor.cs b/SuperPolarity/Actors/GameActor.cs
index 8015ffa30db9547eeefa36b61596cb4908297974..3f426c083fc4fb4f877f5bef3e522938b7da3b54 100644 (file)
--- a/SuperPolarity/Actors/GameActor.cs
+++ b/SuperPolarity/Actors/GameActor.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -55,7 +55,11 @@ namespace SuperPolarity
         {
                        base.Draw(spriteBatch);
 
         {
                        base.Draw(spriteBatch);
 

-            spriteBatch.Draw(Texture, Position, null, Color, Angle, Origin, 1f, SpriteEffects.None, 0f);
+                       try {
+               spriteBatch.Draw(Texture, Position, null, Color, Angle, Origin, 1f, SpriteEffects.None, 0f);
+                       } catch (ArgumentNullException) {
+                               Console.WriteLine ("Where'd the texture go?."); 
+                       }

         }
 
         public override void CleanUp()
         }
 
         public override void CleanUp()

diff --git a/SuperPolarity/Actors/MainShip.cs b/SuperPolarity/Actors/MainShip.cs
index 307bef430e6a1167445074baffe737cf5f84a488..7eef0b7cb10fd2d0bd722bb9e9629eef8f9a4d02 100644 (file)
--- a/SuperPolarity/Actors/MainShip.cs
+++ b/SuperPolarity/Actors/MainShip.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -16,8 +16,6 @@ namespace SuperPolarity
         public static Color BlueColor;
         public static Color RedColor;
 
         public static Color BlueColor;
         public static Color RedColor;
 

-        ParticleEngine particleEngine;
-

         protected bool Shooting;
         protected int ShotCooldown;
 
         protected bool Shooting;
         protected int ShotCooldown;
 


@@ -29,25 +27,52 @@ namespace SuperPolarity
         protected SoundEffect ShootSound;
         protected SoundEffect Hit;
 
         protected SoundEffect ShootSound;
         protected SoundEffect Hit;
 

+               // Aura stuff
+               protected Texture2D AuraPoint;
+               protected double AuraRadius;
+               protected double AuraAmplitude;
+               protected double AuraFrequency;
+               protected double AuraSubAmplitude;
+               protected double AuraWaveSize;
+               protected double AuraSubPhase;
+               protected double AuraSubFrequency;
+               public double[] EnemyModifications;
+               public double MaxEnemyModification;
+               public double EnemyModificationSpread;
+

         public MainShip(SuperPolarity newGame) : base(newGame) {}
 
         ~MainShip()
         {
         public MainShip(SuperPolarity newGame) : base(newGame) {}
 
         ~MainShip()
         {

-            particleEngine = null;

         }
 
         public override void Initialize(Texture2D texture, Vector2 position)
         {
             base.Initialize(texture, position);
 
         }
 
         public override void Initialize(Texture2D texture, Vector2 position)
         {
             base.Initialize(texture, position);
 

-            MainShip.BlueColor = new Color(211, 230, 234);
+                       MainShip.BlueColor = new Color(71, 182, 226);

             MainShip.RedColor = new Color(235, 160, 185);
 
             MainShip.RedColor = new Color(235, 160, 185);
 

+                       AuraPoint = CreateCircle (2);
+
+                       AuraRadius = 75;
+                       AuraAmplitude = 7;
+                       AuraFrequency = 3;
+                       AuraSubAmplitude = 7;
+                       AuraWaveSize = 3;
+                       AuraSubPhase = 0;
+                       AuraSubFrequency = 9 * Math.PI / 180;
+                       MaxEnemyModification = 20;
+                       EnemyModificationSpread = 10;
+                       EnemyModifications = new double[360];
+                       for ( int i = 0; i < EnemyModifications.Length; i++ ) {
+                               EnemyModifications[i] = 0;
+                       }
+

             PolarityChange = game.Content.Load<SoundEffect>("Sound\\polaritychange");
             ShootSound = game.Content.Load<SoundEffect>("Sound\\bullet");
             Hit = game.Content.Load<SoundEffect>("Sound\\hit");
 
             PolarityChange = game.Content.Load<SoundEffect>("Sound\\polaritychange");
             ShootSound = game.Content.Load<SoundEffect>("Sound\\bullet");
             Hit = game.Content.Load<SoundEffect>("Sound\\hit");
 

-            InitParticleEngine();

             SetPolarity(Polarity.Positive);
 
             ActVelocity = 2.5f;
             SetPolarity(Polarity.Positive);
 
             ActVelocity = 2.5f;


@@ -64,11 +89,6 @@ namespace SuperPolarity
             BindInput();
         }
 
             BindInput();
         }
 

-        void InitParticleEngine()
-        {
-            particleEngine = ParticleEffectFactory.CreatePolarCircle(Position);
-        }
-

         void BindInput()
         {
             InputController.Bind("moveX", HandleHorizontalMovement);
         void BindInput()
         {
             InputController.Bind("moveX", HandleHorizontalMovement);


@@ -131,42 +151,28 @@ namespace SuperPolarity
         public override void SwitchPolarity()
         {
             base.SwitchPolarity();
         public override void SwitchPolarity()
         {
             base.SwitchPolarity();

-            SwitchParticleEngine(CurrentPolarity);

             PolarityChange.Play();
             game.Player.ResetMultiplier();
         }
 
         public override void SetPolarity(Polarity newPolarity)
         {
             PolarityChange.Play();
             game.Player.ResetMultiplier();
         }
 
         public override void SetPolarity(Polarity newPolarity)
         {

-            base.SetPolarity(newPolarity);
-            SwitchParticleEngine(newPolarity);
-        }
-
-        protected void SwitchParticleEngine(Polarity polarity)
-        {
-            if (polarity == Polarity.Positive)
-            {
-                particleEngine.Color = MainShip.RedColor;
-            }
-            else if (polarity == Polarity.Negative)
-            {
-                particleEngine.Color = MainShip.BlueColor;
-            }
-            else
-            {
-                particleEngine.Color = Color.Gray;
-            }
+            base.SetPolarity(newPolarity);;

         }
         }

-
+                       

         public override void Update(GameTime gameTime)
         {
             base.Update(gameTime);
         public override void Update(GameTime gameTime)
         {
             base.Update(gameTime);

-            particleEngine.EmitterLocation = Position;
-            particleEngine.Update();

             ConstrainToEdges();
             UpdateImmortality(gameTime);
         }
 
             ConstrainToEdges();
             UpdateImmortality(gameTime);
         }
 

+               public void ResetEnemyModification() {
+                       for ( int i = 0; i < EnemyModifications.Length; i++ ) {
+                               EnemyModifications[i] = 0;
+                       }
+               }
+

         public void UpdateImmortality(GameTime gameTime)
         {
             if (Immortal)
         public void UpdateImmortality(GameTime gameTime)
         {
             if (Immortal)


@@ -270,12 +276,131 @@ namespace SuperPolarity
             }
         }
 
             }
         }
 

-        public override void Draw(SpriteBatch spriteBatch)
+               public void UpdateEnemyModification(Ship enemy) {
+
+                       var dx = enemy.Position.X - Position.X;
+                       var dy = enemy.Position.Y - Position.Y;
+                       var angleInDegrees = ((360 + Math.Round (Math.Atan2 (dy, dx) * 180 / Math.PI)) % 360);
+
+                       for (var i = -EnemyModificationSpread; i < EnemyModificationSpread; i++) {
+                               var strength = MaxEnemyModification - Math.Abs (i * MaxEnemyModification / EnemyModificationSpread);
+
+                               var index = (int)((360 + angleInDegrees + i) % 360);
+
+                               if (enemy.CurrentPolarity == CurrentPolarity) {
+                                       EnemyModifications[index] -= strength;
+                               } else {
+                                       EnemyModifications[index] += strength;
+                               }
+
+                               if (EnemyModifications[index] > MaxEnemyModification) {
+                                       EnemyModifications[index] = MaxEnemyModification;
+                               }
+
+                               if (EnemyModifications[index] < -MaxEnemyModification) {
+                                       EnemyModifications[index] = -MaxEnemyModification;
+                               }
+                       }
+               }
+
+               public override void Draw(SpriteBatch spriteBatch)

         {
         {

-            particleEngine.Draw(spriteBatch);
+                       DrawCircle (spriteBatch);

             base.Draw(spriteBatch);
             base.Draw(spriteBatch);

-                       spriteBatch.Draw(BoxTexture, Box, new Color(255, 0, 255, 25));
+                       //spriteBatch.Draw(BoxTexture, Box, new Color(255, 0, 255, 25));
+        }
+
+               protected void DrawCircle(SpriteBatch spriteBatch) {
+
+                       var j = AuraWaveSize;
+                       var subWaveRadius = 0.0;
+                       var randomPosition = 0.0;
+
+                       for (var i = 0; i < 360; i++) {
+                               var angle = i * Math.PI / 180;
+
+                               if (j == AuraWaveSize) {
+                                       subWaveRadius = AuraSubAmplitude * Math.Sin (randomPosition + AuraSubPhase);
+                                       randomPosition -= (2 * Math.PI / 8);
+                                       j = 0;
+                               }
+                               j++;
+
+                               var radius = EnemyModifications[i] + subWaveRadius + AuraRadius + AuraAmplitude * Math.Sin (i / AuraFrequency);
+                               var x = Position.X + radius * Math.Cos (angle);
+                               var y = Position.Y + radius * Math.Sin (angle);
+
+                               x = Math.Round (x);
+                               y = Math.Round (y);
+                               var pointPosition = new Vector2 ((float)x, (float)y);
+
+                               if (CurrentPolarity == Polarity.Positive) {
+                                       spriteBatch.Draw (AuraPoint, pointPosition, RedColor);
+                               } else {
+                                       spriteBatch.Draw (AuraPoint, pointPosition, BlueColor);
+                               }
+                       }
+
+                       AuraSubPhase += AuraSubFrequency;
+
+                       /*         var r = 50;
+    var wave = 5;
+    var frequency = 1.4;
+    var randomFactor = 5;
+    var randomAreaSize = 4;
+    
+    var j = AuraWaveSize;
+    var rand = 0;
+    var randomPosition = 0;
+
+                       AuraSubPhase = 0;
+    
+    for (var i = 0; i < 360; i++) {
+        var rad = Math.radians(i);
+        if (j == AuraWaveSize) {
+            //rand = Math.random() * 2 * AuraSubAmplitude - AuraSubAmplitude;
+            rand = AuraSubAmplitude * Math.sin(AuraSubPhase + offset);
+            AuraSubPhase -= (2 * Math.PI / 8);
+            j = 0;

         }
         }

+        j++;
+        var radius = polarityModifications[i] + rand + AuraRadius + AuraAmplitude * Math.sin(i / AuraFrequency);
+        var x = Position.x + radius * Math.cos(rad);
+        var y = Position.y + radius * Math.sin(rad);
+        x = Math.round(x);
+        y = Math.round(y);
+    
+    draw
+        //console.log(i, rad, x, y, dataStart);
+    });
+    
+    ctx.putImageData(imgData, 0, 0);*/
+               }
+
+               protected Texture2D CreateCircle(int radius)
+               {
+                       int outerRadius = radius * 2 + 2;
+                       Texture2D texture = new Texture2D (game.GraphicsDevice, outerRadius, outerRadius);
+
+                       Color[] data = new Color[outerRadius * outerRadius];
+
+                       for (int i = 0; i < data.Length; i++) {
+                               data [i] = Color.Transparent;
+                       }
+
+                       double angleStep = 1f / radius;
+
+                       for (double angle = 0; angle < Math.PI * 2; angle += angleStep)
+                       {
+                               int x = (int)Math.Round (radius + radius * Math.Cos (angle));
+                               int y = (int)Math.Round (radius + radius + Math.Sin (angle));
+
+                               data [y * outerRadius + x + 1] = Color.White;
+                       }
+
+                       texture.SetData (data);
+                       return texture;
+               }

 
         public override void Collide(Actor other, Rectangle collision)
         {
 
         public override void Collide(Actor other, Rectangle collision)
         {


@@ -305,7 +430,6 @@ namespace SuperPolarity
         public override void CleanUp()
         {
             base.CleanUp();
         public override void CleanUp()
         {
             base.CleanUp();

-            particleEngine = null;

             InputController.Unbind("moveX", HandleHorizontalMovement);
             InputController.Unbind("moveY", HandleVerticalMovement);
             InputController.Unbind("changePolarity", HandleChangePolarity);
             InputController.Unbind("moveX", HandleHorizontalMovement);
             InputController.Unbind("moveY", HandleVerticalMovement);
             InputController.Unbind("changePolarity", HandleChangePolarity);

diff --git a/SuperPolarity/Actors/Ship.cs b/SuperPolarity/Actors/Ship.cs
index 5a3f6e540d8bbbe33b332259fe8095c2898670c0..590b446754dea8ad1f2efdcced94b74fe757a36d 100644 (file)
--- a/SuperPolarity/Actors/Ship.cs
+++ b/SuperPolarity/Actors/Ship.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Actors/StandardShip.cs b/SuperPolarity/Actors/StandardShip.cs
index ef2fe7f8116c008c17e4c209d34670373d72f0fd..ff04ea06502344eef48c0e051863e7b86040f186 100644 (file)
--- a/SuperPolarity/Actors/StandardShip.cs
+++ b/SuperPolarity/Actors/StandardShip.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -31,9 +31,9 @@ namespace SuperPolarity
             new RNGCryptoServiceProvider().GetBytes(cryptoResult);
 
             ChangeRate = 50;
             new RNGCryptoServiceProvider().GetBytes(cryptoResult);
 
             ChangeRate = 50;

-            AngleChangeProbability = 50;
+                       AngleChangeProbability = 50;

             BouncePadding = 0;
             BouncePadding = 0;

-            MaxVelocity = 2;
+                       MaxVelocity = 3;

             CurrentTime = 0;
             RotationFactor = (float) (3 * Math.PI / 180);
             Random = new Random(BitConverter.ToInt32(cryptoResult, 0));
             CurrentTime = 0;
             RotationFactor = (float) (3 * Math.PI / 180);
             Random = new Random(BitConverter.ToInt32(cryptoResult, 0));

diff --git a/SuperPolarity/BasicGenerator.cs b/SuperPolarity/BasicGenerator.cs
index ba517424dae1834e1d6fcd192e374dfd83829083..fa4edeb21e6fead4e8bc957904cd22498f0ab028 100644 (file)
--- a/SuperPolarity/BasicGenerator.cs
+++ b/SuperPolarity/BasicGenerator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/GameScreen.cs b/SuperPolarity/GameScreen.cs
index 783e3c12a61f57dc8a08e24634b32b142d077018..3fe9c92ab45fe19b2f9475187df7e08a04902e08 100644 (file)
--- a/SuperPolarity/GameScreen.cs
+++ b/SuperPolarity/GameScreen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -10,6 +10,9 @@ using Microsoft.Xna.Framework.Input;
 
 namespace SuperPolarity
 {
 
 namespace SuperPolarity
 {

+
+       using MediaPlayer = Microsoft.Xna.Framework.Media.MediaPlayer;
+

     class GameScreen : Screen
     {
         public GameScreen(SuperPolarity newGame) : base(newGame) {}
     class GameScreen : Screen
     {
         public GameScreen(SuperPolarity newGame) : base(newGame) {}


@@ -33,15 +36,15 @@ namespace SuperPolarity
             Generators = new List<BasicGenerator>();
 
             CurrentBombRate = 1;
             Generators = new List<BasicGenerator>();
 
             CurrentBombRate = 1;

-            BombRate = 6000;
+                       BombRate = 10000;

 
 

-            LivesRate = 10000;
+                       LivesRate = 19000;

             CurrentLivesRate = 1;
 
             CurrentLivesRate = 1;
 

-            InputController.RegisterEventForButton("changePolarity", Buttons.A);
+                       InputController.RegisterEventForButton("changePolarity", Buttons.B);

             InputController.RegisterEventForKey("changePolarity", Keys.Z);
 
             InputController.RegisterEventForKey("changePolarity", Keys.Z);
 

-            InputController.RegisterEventForButton("shoot", Buttons.X);
+                       InputController.RegisterEventForButton("shoot", Buttons.A);

             InputController.RegisterEventForKey("shoot", Keys.X);
 
             InputController.Bind("pause", HandlePause);
             InputController.RegisterEventForKey("shoot", Keys.X);
 
             InputController.Bind("pause", HandlePause);

diff --git a/SuperPolarity/InputController.cs b/SuperPolarity/InputController.cs
index c92bb9c37b8bc7500d8762d35d3c2fcf068428f3..2047ef011b570a120ac011f8cf2af2835fbe6f91 100644 (file)
--- a/SuperPolarity/InputController.cs
+++ b/SuperPolarity/InputController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;


@@ -55,7 +55,7 @@ namespace SuperPolarity
         {
             // OK THIS IS ALL KINDS OF WRONG. THIS IS A PLACEHOLDER BECAUSE DEMO!
             var keyPressed = false;
         {
             // OK THIS IS ALL KINDS OF WRONG. THIS IS A PLACEHOLDER BECAUSE DEMO!
             var keyPressed = false;

-            if ((InputKeyboardState.IsKeyDown(Keys.Enter) || InputGamePadState.IsButtonDown(Buttons.Start))) {
+                       if ((InputKeyboardState.IsKeyDown(Keys.Enter) || InputGamePadState.IsButtonDown(Buttons.RightStick))) {

                 keyPressed = true;
                 if(!BlockedButtons.Contains("pause") && !BlockedKeys.Contains("pause"))
                 {
                 keyPressed = true;
                 if(!BlockedButtons.Contains("pause") && !BlockedKeys.Contains("pause"))
                 {

diff --git a/SuperPolarity/LetterChooseWidget.cs b/SuperPolarity/LetterChooseWidget.cs
index e52733fed17bf3b7e977e8697dcea3e5509138a3..44ca84449e112669729dc4b5c3cdf304cc4a33b5 100644 (file)
--- a/SuperPolarity/LetterChooseWidget.cs
+++ b/SuperPolarity/LetterChooseWidget.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/MenuItem.cs b/SuperPolarity/MenuItem.cs
index 8e24c972f030b487f0efd4a12dbc4b8d744d0014..f7ac5bdc085b2f9ea7ed8402cb27d46de20a72ab 100644 (file)
--- a/SuperPolarity/MenuItem.cs
+++ b/SuperPolarity/MenuItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/MenuWidget.cs b/SuperPolarity/MenuWidget.cs
index 992ef43e87ebf4cf1c8f5398895e2053943c406e..96cabe7bef38197244190c39682837b317a8ca65 100644 (file)
--- a/SuperPolarity/MenuWidget.cs
+++ b/SuperPolarity/MenuWidget.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/NameChooserWidget.cs b/SuperPolarity/NameChooserWidget.cs
index ce7c149c201825b71c89dd78ecf0bb4c53646aa8..4c7797d475a3850c78ac9be9120b647a1da6a094 100644 (file)
--- a/SuperPolarity/NameChooserWidget.cs
+++ b/SuperPolarity/NameChooserWidget.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Particle.cs b/SuperPolarity/Particle.cs
index d65bac62dc63f529b3a44cab562a3a40705093b6..80abb094da280d4b0baed8d12112594030e78333 100644 (file)
--- a/SuperPolarity/Particle.cs
+++ b/SuperPolarity/Particle.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/ParticleEffectFactory.cs b/SuperPolarity/ParticleEffectFactory.cs
index 0cd9ed3a6d9c3d6e3ea92cdf84d257d784217e9f..5efd8d55f016878124723f64b2c2eead7f46f54a 100644 (file)
--- a/SuperPolarity/ParticleEffectFactory.cs
+++ b/SuperPolarity/ParticleEffectFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/ParticleEngine.cs b/SuperPolarity/ParticleEngine.cs
index 51188ae3815e1c90c66f34777c31c90063d90d2c..8cc17c1cd3b45e4a2b3d5f28e65dfc3c34c05618 100644 (file)
--- a/SuperPolarity/ParticleEngine.cs
+++ b/SuperPolarity/ParticleEngine.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Player.cs b/SuperPolarity/Player.cs
index 184abdd5ae3c5c598283cdee38520e6bb2c00faf..ec3842fe25f041276fd55c82783f8ee384312dd1 100644 (file)
--- a/SuperPolarity/Player.cs
+++ b/SuperPolarity/Player.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Properties/AssemblyInfo.cs b/SuperPolarity/Properties/AssemblyInfo.cs
index daa34e82b9dbe39fcac5c4a8d9b6d1eb3eae5c38..1902c128f0ea888b7246e6ebca8224b773829b5d 100644 (file)
--- a/SuperPolarity/Properties/AssemblyInfo.cs
+++ b/SuperPolarity/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;

 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

diff --git a/SuperPolarity/Renderer.cs b/SuperPolarity/Renderer.cs
index 7ca81582f70d7e5a6dcfc5e02f55b40cc8f8e2d9..6dfa642026bb027f351db3b1b324e6546b0ef455 100644 (file)
--- a/SuperPolarity/Renderer.cs
+++ b/SuperPolarity/Renderer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/ScoreScreen.cs b/SuperPolarity/ScoreScreen.cs
index d879db9e2fd6918db308d0096fb94bafda2a1996..63418d87b6793cb4d5a75547062f1efc4206aa9d 100644 (file)
--- a/SuperPolarity/ScoreScreen.cs
+++ b/SuperPolarity/ScoreScreen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Screen.cs b/SuperPolarity/Screen.cs
index 006b0472de07252f28f2e2162fe4ca0c350d53a1..df5c0c4481dfbfa4ce352b2c2e37b601b9101bc3 100644 (file)
--- a/SuperPolarity/Screen.cs
+++ b/SuperPolarity/Screen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/ScreenManager.cs b/SuperPolarity/ScreenManager.cs
index b88741b3ecdea20e2c2b5ff202f47e2120d65ef9..e869035df00303f522da0a298f5fc16160f6f099 100644 (file)
--- a/SuperPolarity/ScreenManager.cs
+++ b/SuperPolarity/ScreenManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/SuperPolarity.cs b/SuperPolarity/SuperPolarity.cs
index 7fa387cb3710926215431e70a772d15959fc801e..f644fa6449d69608537f74291e61c492a9516628 100644 (file)
--- a/SuperPolarity/SuperPolarity.cs
+++ b/SuperPolarity/SuperPolarity.cs
@@ -1,20 +1,18 @@
-#region Using Statements
-using System;
-using System.Collections.Generic;
+#region Using Statements

 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;

-using Microsoft.Xna.Framework.Storage;

 using Microsoft.Xna.Framework.GamerServices;
 using Microsoft.Xna.Framework.GamerServices;

-using Microsoft.Xna.Framework.Media;

 using Microsoft.Xna.Framework.Audio;
 using SuperPolarity;
 using Microsoft.Xna.Framework.Audio;
 using SuperPolarity;

-using Tao.Sdl;

 #endregion
 
 namespace SuperPolarity
 {
 #endregion
 
 namespace SuperPolarity
 {

+
+       using MediaPlayer = Microsoft.Xna.Framework.Media.MediaPlayer;
+

     /// <summary>
     /// This is the main type for your game
     /// </summary>
     /// <summary>
     /// This is the main type for your game
     /// </summary>


@@ -42,7 +40,7 @@ namespace SuperPolarity
             graphics.PreferMultiSampling = true;
             graphics.PreferredBackBufferHeight = 720;
             graphics.PreferredBackBufferWidth = 1280;
             graphics.PreferMultiSampling = true;
             graphics.PreferredBackBufferHeight = 720;
             graphics.PreferredBackBufferWidth = 1280;

-            //graphics.ToggleFullScreen();
+                       //graphics.ToggleFullScreen();

 
             Content.RootDirectory = "Content";
             ActorFactory.SetGame(this);
 
             Content.RootDirectory = "Content";
             ActorFactory.SetGame(this);

diff --git a/SuperPolarity/TitleScreen.cs b/SuperPolarity/TitleScreen.cs
index a953f272188d173742f00cca5ecaf67e9e32a3ec..f97c19a5b4b47e642bd922394903c93c8f103e49 100644 (file)
--- a/SuperPolarity/TitleScreen.cs
+++ b/SuperPolarity/TitleScreen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

diff --git a/SuperPolarity/Vendor/osx/Tao.Sdl.dll.config b/SuperPolarity/Vendor/osx/Tao.Sdl.dll.config
deleted file mode 100644 (file)
index ec83f1e..0000000
--- a/SuperPolarity/Vendor/osx/Tao.Sdl.dll.config
+++ /dev/null
@@ -1,29 +0,0 @@
-<configuration>
-    <dllmap dll="SDL.dll" os="windows" target="SDL.dll"/>
-    <dllmap dll="SDL.dll" os="osx" target="/Library/Frameworks/SDL.framework/SDL" />
-    <dllmap dll="SDL.dll" os="!windows,osx" target="libSDL-1.2.so.0"/>
-
-    <dllmap dll="SDL_image.dll" os="windows" target="SDL_image.dll"/>
-    <dllmap dll="SDL_image.dll" os="osx" target="/Library/Frameworks/SDL_image.framework/SDL_image" />
-    <dllmap dll="SDL_image.dll" os="!windows,osx" target="libSDL_image-1.2.so.0" />
-
-    <dllmap dll="SDL_mixer.dll" os="windows" target="SDL_mixer.dll"/>
-    <dllmap dll="SDL_mixer.dll" os="osx" target="/Library/Frameworks/SDL_mixer.framework/SDL_mixer" />
-    <dllmap dll="SDL_mixer.dll" os="!windows,osx" target="libSDL_mixer-1.2.so.0" />
-
-    <dllmap dll="SDL_ttf.dll" os="windows" target="SDL_ttf.dll"/>
-    <dllmap dll="SDL_ttf.dll" os="osx" target="/Library/Frameworks/SDL_ttf.framework/SDL_ttf" />
-    <dllmap dll="SDL_ttf.dll" os="!windows,osx" target="libSDL_ttf-2.0.so.0" />
-
-    <dllmap dll="SDL_net.dll" os="windows" target="SDL_net.dll"/>
-    <dllmap dll="SDL_net.dll" os="osx" target="/Library/Frameworks/SDL_net.framework/SDL_net" />
-    <dllmap dll="SDL_net.dll" os="!windows,osx" target="libSDL_net-1.2.so.0" />
-
-    <dllmap dll="smpeg.dll" os="windows" target="smpeg.dll"/>
-    <dllmap dll="smpeg.dll" os="osx" target="/Library/Frameworks/smpeg.framework/smpeg" />
-    <dllmap dll="smpeg.dll" os="!windows,osx" target="libsmpeg-0.4.so.0" />
-
-    <dllmap dll="SDL_gfx.dll" os="windows" target="SDL_gfx.dll"/>
-    <dllmap dll="SDL_gfx.dll" os="osx" target="/Library/Frameworks/SDL_gfx.framework/SDL_gfx" />
-    <dllmap dll="SDL_gfx.dll" os="!windows,osx" target="libSDL_gfx.so.13" />
-</configuration>

diff --git a/SuperPolarity/Widget.cs b/SuperPolarity/Widget.cs
index ea92cfd7565fc148ad410643297b3534c72c7ae4..3db42d943b51e6f0553643e0ba1cf0e284daf438 100644 (file)
--- a/SuperPolarity/Widget.cs
+++ b/SuperPolarity/Widget.cs
@@ -1,4 +1,4 @@
-using System;
+using System;

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;