Merge pull request #431 from SoPra18-07/Trim

Trim
SoPra18-07 · Jul 11, 2018 · 7222e4b · 7222e4b
2 parents e07d8d9 + 9250e86
commit 7222e4b
Show file tree

Hide file tree

Showing 21 changed files with 63 additions and 60 deletions.
diff --git a/Singularity/Singularity.sln b/Singularity/Singularity.sln
@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Singularity", "Singularity\Singularity.csproj", "{34A890E2-4E4D-4B3C-914F-1316E6461513}"
 EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
 		Release|x86 = Release|x86

diff --git a/Singularity/Singularity/Levels/Skirmish.cs b/Singularity/Singularity/Levels/Skirmish.cs
@@ -19,7 +19,6 @@ namespace Singularity.Levels
     [DataContract]
     internal sealed class Skirmish : BasicLevel
     {
-
         public Skirmish(GraphicsDeviceManager graphics,
             ref Director director,
             ContentManager content,

diff --git a/Singularity/Singularity/Manager/DistributionManager.cs b/Singularity/Singularity/Manager/DistributionManager.cs
@@ -1146,7 +1146,7 @@ public void Unregister(List<PlatformBlank> platforms, bool isDef, bool inactivat
             }
             //If there are any units to redistribute do it now
             AssignUnitsFairly(unitstodistribute, isDef);
-            
+
             //TODO: this is a dirty fix and might cause slider adjustment issues (null propagation added)
             mHandler?.ForceSliderPages();
 

diff --git a/Singularity/Singularity/Manager/MilitaryManager.cs b/Singularity/Singularity/Manager/MilitaryManager.cs
@@ -136,7 +136,7 @@ internal void RemovePlatform(PlatformBlank platform)
                     mHostileDefensePlatforms.Remove(defensePlatform);
                 }
             }
-            
+
             mUnitMap.RemoveUnit(platform);
         }
 
@@ -148,7 +148,7 @@ internal void RemoveUnit(ICollider unit)
         {
             var friendlyMilitary = unit as MilitaryUnit;
             var hostileMilitary = unit as EnemyUnit;
-            
+
             if (friendlyMilitary != null)
             {
                 mFriendlyMilitary.Remove(friendlyMilitary);
@@ -454,4 +454,4 @@ public void Update(GameTime gametime)
             #endregion
         }
     }
-}
+}
diff --git a/Singularity/Singularity/Map/Camera.cs b/Singularity/Singularity/Map/Camera.cs
@@ -61,7 +61,7 @@ private float Zoom
                 mZoom = value;
                 ValidateZoom();
                 ValidatePosition();
-                
+
             }
         }
 
@@ -79,7 +79,7 @@ private float Zoom
 
         private readonly InputManager mInputManager;
 
-        private readonly Vector2 mOrigin; 
+        private readonly Vector2 mOrigin;
 
 
         /// <summary>
@@ -141,7 +141,7 @@ public float GetZoom()
         {
             return mZoom;
         }
-        
+
         /// <summary>
         /// Checks whether the camera would move out of bounds and corrects the camera to
         /// clip to the edge if its the case.
@@ -243,9 +243,9 @@ private void ValidateZoom()
         ///</summary>
         private void UpdateTransformMatrix()
         {
-            mTransform = Matrix.CreateTranslation(new Vector3(-mPosition, 0f)) 
-                         * Matrix.CreateTranslation(new Vector3(-mOrigin, 0f)) 
-                         * Matrix.CreateScale(mZoom, mZoom, 1f) 
+            mTransform = Matrix.CreateTranslation(new Vector3(-mPosition, 0f))
+                         * Matrix.CreateTranslation(new Vector3(-mOrigin, 0f))
+                         * Matrix.CreateScale(mZoom, mZoom, 1f)
                          * Matrix.CreateTranslation(new Vector3(mOrigin, 0f));
             mInputManager.CameraMoved(mTransform);
         }

diff --git a/Singularity/Singularity/Map/Map.cs b/Singularity/Singularity/Map/Map.cs
@@ -51,8 +51,7 @@ public sealed class Map : IDraw, IUpdate
             int height,
             FogOfWar fow,
             Camera camera,
-            ref Director director,
-            IEnumerable<MapResource> initialResources = null)
+            ref Director director)
         {
             mWidth = width;
             mHeight = height;
@@ -63,6 +62,8 @@ public sealed class Map : IDraw, IUpdate
 
             mFow = fow;
 
+            var initialResources = ResourceHelper.GetRandomlyDistributedResources(50);
+
             mCollisionMap = new CollisionMap();
             mStructureMap = new StructureMap(fow, ref director);
             mResourceMap = new ResourceMap(initialResources);

diff --git a/Singularity/Singularity/Map/MiniMap.cs b/Singularity/Singularity/Map/MiniMap.cs
@@ -17,7 +17,7 @@ namespace Singularity.Map
     /// platforms are represented with dots, as are military units (in the future). The original idea was to put
     /// EVERYTHING on the minimap, roads, resources, enemy units, enemy buildings, etc. The
     /// "true" purpose of a minimap is to be able to see everything at once at first glance without having to
-    /// move the games camera to that exact location. 
+    /// move the games camera to that exact location.
     /// </summary>
     public sealed class MiniMap : IWindowItem
     {
@@ -142,7 +142,7 @@ public void Draw(SpriteBatch spriteBatch)
         public void Update(GameTime gametime)
         {
             // only update UpdateMilliInterval milliseconds. The basic idea was to refetch all the gameobjects every second
-            // but I decided to just pass the reference which makes things alot easier. 
+            // but I decided to just pass the reference which makes things alot easier.
 
             // TODO: this could be replaced with an initialize method, that sets the reference as soons as all of them
             // TODO: are actually in the memory. For now this is fine.

diff --git a/Singularity/Singularity/Nature/Puddle.cs b/Singularity/Singularity/Nature/Puddle.cs
@@ -79,7 +79,7 @@ public void Draw(SpriteBatch spriteBatch)
                 spriteBatch.DrawLine(new Vector2(mPosition.X + 89, mPosition.Y + 22), 26, 2.68f, Color.Gray);
 
 
-                // draw the water in the puddle 
+                // draw the water in the puddle
                 for (int i = 0; i < 45; i++)
                 {
                     spriteBatch.DrawLine(
@@ -106,7 +106,7 @@ public void Draw(SpriteBatch spriteBatch)
                 spriteBatch.DrawLine(new Vector2(mPosition.X + 71, mPosition.Y + 16), 23, 2.7f, Color.Gray);
 
 
-                // draw the water in the puddle 
+                // draw the water in the puddle
                 for (int i = 0; i < 38; i++)
                 {
                     spriteBatch.DrawLine(new Vector2(mPosition.X + 71 + (i * 1.959f), mPosition.Y - 20 + i), 63, 2.7f, Color.CornflowerBlue * .7f);
@@ -132,4 +132,4 @@ public void MakeDamage(int damage)
             // does not obtain damage
         }
     }
-}
+}
diff --git a/Singularity/Singularity/Nature/Rock.cs b/Singularity/Singularity/Nature/Rock.cs
@@ -8,7 +8,7 @@
 namespace Singularity.Nature
 {
     public class Rock : ICollider
-    {   
+    {
         public bool[,] ColliderGrid { get; internal set; }
 
         // specifies the angle of the given rock
@@ -65,7 +65,7 @@ public Rock(Vector2 position)
         /// </summary>
         private void CreateRock()
         {
-           
+
 
             // create the rotation and placement chart for rocks
             for (int i = 0; i < 14; i++)
@@ -123,14 +123,14 @@ private void CreateRock()
 
         public void Draw(SpriteBatch spriteBatch)
             {
-                // generate the rotation and placement matrix at the beginning 
+                // generate the rotation and placement matrix at the beginning
                 if (!mNotGenerated)
                 {
                     CreateRock();
                     mNotGenerated = true;
                 }
 
-                // draw the rock formation 
+                // draw the rock formation
 
                 for (int i = 0; i < 18; i++)
                 {
@@ -152,7 +152,7 @@ public void Draw(SpriteBatch spriteBatch)
                                     mDrawSize.X / 18,
                                     20,
                                     (mDrawAngle[j, i] % 2 == 0) ? Color.DimGray * .9f : Color.Gray * .9f,
-                                    1f);                           
+                                    1f);
                             }
 
                             // otherwise draw a square

diff --git a/Singularity/Singularity/Platforms/DefenseBase.cs b/Singularity/Singularity/Platforms/DefenseBase.cs
@@ -49,7 +49,7 @@ internal abstract class DefenseBase : PlatformBlank, IShooting
             type,
             friendly: friendly)
         {
-            
+
             mType = type;
             mSpritename = "Cone";
             Property = JobType.Defense;

diff --git a/Singularity/Singularity/Platforms/Mine.cs b/Singularity/Singularity/Platforms/Mine.cs
@@ -35,7 +35,7 @@ class Mine : PlatformBlank
                 -50,
                 friendly)
         {
-            
+
             mIPlatformActions.Add(new ProduceMineResource(platform: this, resourceMap: resource, director: ref mDirector));
             //Something like "Hello Distributionmanager I exist now(GiveBlueprint)"
             //Add Costs of the platform here if you got them.

diff --git a/Singularity/Singularity/Platforms/PlatformBlank.cs b/Singularity/Singularity/Platforms/PlatformBlank.cs
@@ -1012,7 +1012,7 @@ public void Deactivate(bool manually)
         {
             if (manually)
             {
-                // TODO maybe need to regulate sound a little when put to action 
+                // TODO maybe need to regulate sound a little when put to action
                 mDirector.GetSoundManager.PlaySound("PowerDown",
                     Center.X,
                     Center.Y,
@@ -1026,7 +1026,7 @@ public void Deactivate(bool manually)
             }
 
             mIsActive = false;
-            // TODO: remove this or change it to something more appropriately, this is used by @Ativelox for 
+            // TODO: remove this or change it to something more appropriately, this is used by @Ativelox for
             // TODO: debugging purposes to easily see which platforms are currently deactivated
             mColor = Color.Green;
             //Only unregister if this platform is a defense or production platform

diff --git a/Singularity/Singularity/Screen/ActivationIWindowItem.cs b/Singularity/Singularity/Screen/ActivationIWindowItem.cs
@@ -12,7 +12,7 @@ internal sealed class ActivationIWindowItem : IWindowItem
         private readonly IWindowItem mDeactiveItem;
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="activeItem"></param>
         /// <param name="deactiveItem"></param>

diff --git a/Singularity/Singularity/Screen/InfoBarWindowObject.cs b/Singularity/Singularity/Screen/InfoBarWindowObject.cs
@@ -12,7 +12,7 @@ namespace Singularity.Screen
 {
     /// <summary>
     /// The InfoBar is the UI's top bar.
-    /// It includes the time, mission time, the pause button and buttons to close the given 6 windows 
+    /// It includes the time, mission time, the pause button and buttons to close the given 6 windows
     /// </summary>
     sealed class InfoBarWindowObject : IDraw, IUpdate, IMouseClickListener
     {
@@ -86,9 +86,9 @@ sealed class InfoBarWindowObject : IDraw, IUpdate, IMouseClickListener
         /// <param name="minimapWindow">the minimapWindow to close/open</param>
         /// <param name="director">director</param>
         public InfoBarWindowObject(
-            Color borderColor, 
-            Color fillColor, 
-            SpriteFont spriteFont, 
+            Color borderColor,
+            Color fillColor,
+            SpriteFont spriteFont,
             IScreenManager screenManager,
             WindowObject civilUnitsWindow,
             WindowObject resourceWindow,
@@ -202,7 +202,7 @@ public void Update(GameTime gametime)
         {
             if (Active)
             {
-                // changes in resolution result in changes in width of the info bar and the button locations 
+                // changes in resolution result in changes in width of the info bar and the button locations
                 if (mWidthBackup != Width)
                 {
                     // update backup

diff --git a/Singularity/Singularity/Screen/InfoBoxWindow.cs b/Singularity/Singularity/Screen/InfoBoxWindow.cs
@@ -102,7 +102,7 @@ public virtual void Update(GameTime gametime)
 
                 // shifts the items from the top left corner to their position
                 var yShift = 2;
-                // 
+                //
                 float maxWidth = 0;
                 float maxHeight = 0;
 

diff --git a/Singularity/Singularity/Screen/PlatformActionIWindowItem.cs b/Singularity/Singularity/Screen/PlatformActionIWindowItem.cs
@@ -39,15 +39,15 @@ public PlatformActionIWindowItem(IPlatformAction platformAction, SpriteFont spri
             var name = platformAction.ToString().Split('.')[2];
 
             mNameTextField = new TextField(
-                text: name, 
-                position: Vector2.Zero, 
+                text: name,
+                position: Vector2.Zero,
                 size: new Vector2(spriteFont.MeasureString(name).X, 0), // the size of the textfield should be as big as the string it contains
-                spriteFont: spriteFont, 
+                spriteFont: spriteFont,
                 color: Color.White);
 
             var stateTextField = new TextField(
-                text: platformAction.State.ToString(), 
-                position: Vector2.Zero, 
+                text: platformAction.State.ToString(),
+                position: Vector2.Zero,
                 size: new Vector2(spriteFont.MeasureString(platformAction.State.ToString()).X, 0), // the size of the textfield should be as big as the string it contains
                 spriteFont: spriteFont,
                 color: Color.White);

diff --git a/Singularity/Singularity/Screen/ResourceIWindowItem.cs b/Singularity/Singularity/Screen/ResourceIWindowItem.cs
@@ -74,7 +74,7 @@ public void Draw(SpriteBatch spriteBatch)
                     text: mResourceText,
                     position: mTextPosition,
                     color: Color.White);
-                // draw the amount aligned to the right side 
+                // draw the amount aligned to the right side
                 spriteBatch.DrawString(
                     spriteFont: mSpriteFont,
                     text: Amount.ToString(),

diff --git a/Singularity/Singularity/Screen/ScreenClasses/DebugScreen.cs b/Singularity/Singularity/Screen/ScreenClasses/DebugScreen.cs
@@ -17,7 +17,7 @@
 namespace Singularity.Screen.ScreenClasses
 {
     /// <summary>
-    /// Used to show debug information. This might not be the prettiest, but it definitely does its work... 
+    /// Used to show debug information. This might not be the prettiest, but it definitely does its work...
     /// </summary>
     public sealed class DebugScreen : IScreen, IKeyListener
     {
@@ -188,7 +188,7 @@ public void KeyPressed(KeyEvent keyEvent)
 
         public void KeyReleased(KeyEvent keyEvent)
         {
-            
+
         }
 
         private void FowButtonClicked(object sender, EventArgs args)

diff --git a/Singularity/Singularity/Screen/ScreenClasses/GameScreen.cs b/Singularity/Singularity/Screen/ScreenClasses/GameScreen.cs
@@ -183,7 +183,7 @@ public void LoadContent(ContentManager content)
         {
             AddObject(mMap);
 
-            AddObjects(ResourceHelper.GetRandomlyDistributedResources(50));
+            // AddObjects(ResourceHelper.GetRandomlyDistributedResources(50));
 
             mDirector.GetSoundManager.SetLevelThemeMusic("Tutorial");
             mDirector.GetSoundManager.SetSoundPhase(SoundPhase.Build);
@@ -232,7 +232,7 @@ public bool AddObject<T>(T toAdd)
                 mDirector.GetMilitaryManager.AddPlatform(platform);
                 return true;
             }
-            
+
             // subscribes the game screen the the settler event (to build a command center)
             // TODO unsubscribe / delete settler when event is fired
             if (settler != null)