diff --git a/Trunk/MonoGameView/Content/Content.mgcb b/Trunk/MonoGameView/Content/Content.mgcb index ece1dae..342e371 100644 --- a/Trunk/MonoGameView/Content/Content.mgcb +++ b/Trunk/MonoGameView/Content/Content.mgcb @@ -44,6 +44,18 @@ /processorParam:TextureFormat=Color /build:glass.png +#begin glassBar.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:glassBar.png + #begin grass.png /importer:TextureImporter /processor:TextureProcessor @@ -80,6 +92,18 @@ /processorParam:TextureFormat=Color /build:organic.png +#begin organicBar.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:organicBar.png + #begin paper.png /importer:TextureImporter /processor:TextureProcessor @@ -92,6 +116,18 @@ /processorParam:TextureFormat=Color /build:paper.png +#begin paperBar.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:paperBar.png + #begin plasticmetal.png /importer:TextureImporter /processor:TextureProcessor @@ -104,6 +140,18 @@ /processorParam:TextureFormat=Color /build:plasticmetal.png +#begin plasticMetalBar.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:plasticMetalBar.png + #begin road1.png /importer:TextureImporter /processor:TextureProcessor diff --git a/Trunk/MonoGameView/Content/glassBar.png b/Trunk/MonoGameView/Content/glassBar.png new file mode 100644 index 0000000..a168703 Binary files /dev/null and b/Trunk/MonoGameView/Content/glassBar.png differ diff --git a/Trunk/MonoGameView/Content/organicBar.png b/Trunk/MonoGameView/Content/organicBar.png new file mode 100644 index 0000000..a740f94 Binary files /dev/null and b/Trunk/MonoGameView/Content/organicBar.png differ diff --git a/Trunk/MonoGameView/Content/paperBar.png b/Trunk/MonoGameView/Content/paperBar.png new file mode 100644 index 0000000..7aca231 Binary files /dev/null and b/Trunk/MonoGameView/Content/paperBar.png differ diff --git a/Trunk/MonoGameView/Content/plasticMetalBar.png b/Trunk/MonoGameView/Content/plasticMetalBar.png new file mode 100644 index 0000000..b0da35a Binary files /dev/null and b/Trunk/MonoGameView/Content/plasticMetalBar.png differ diff --git a/Trunk/MonoGameView/DataModels/Models/House.cs b/Trunk/MonoGameView/DataModels/Models/House.cs index 5568c56..8e9e1e6 100644 --- a/Trunk/MonoGameView/DataModels/Models/House.cs +++ b/Trunk/MonoGameView/DataModels/Models/House.cs @@ -25,6 +25,11 @@ namespace CzokoŚmieciarka.MonoGameView.DataModels.Models public void Draw(SpriteBatch batch, int size) { batch.Draw(ImageContainer.GetImage("house"), new Rectangle(Coords.X * 500 / size, Coords.Y * 500 / size, 500 / size, 500 / size), Color.White); + batch.Draw(ImageContainer.GetImage("GlassBar"), new Rectangle(Coords.X * 500 / size, Coords.Y * 500 / size, (int)Math.Round(TrashCans.ElementAtOrDefault(0).FillPercent*500) / size, 50 / size), Color.White); + batch.Draw(ImageContainer.GetImage("PaperBar"), new Rectangle(Coords.X * 500 / size, Coords.Y * 500 / size + 5, (int)Math.Round(TrashCans.ElementAtOrDefault(1).FillPercent * 500) / size, 50 / size), Color.White); + batch.Draw(ImageContainer.GetImage("PlasticMetalBar"), new Rectangle(Coords.X * 500 / size, Coords.Y * 500 / size + 10, (int)Math.Round(TrashCans.ElementAtOrDefault(2).FillPercent * 500) / size, 50 / size), Color.White); + batch.Draw(ImageContainer.GetImage("OrganicBar"), new Rectangle(Coords.X * 500 / size, Coords.Y * 500 / size + 15, (int)Math.Round(TrashCans.ElementAtOrDefault(3).FillPercent * 500) / size, 50 / size), Color.White); + } public object Clone() diff --git a/Trunk/MonoGameView/DataModels/Models/ImageContainer.cs b/Trunk/MonoGameView/DataModels/Models/ImageContainer.cs index 7382ae8..3f8ac65 100644 --- a/Trunk/MonoGameView/DataModels/Models/ImageContainer.cs +++ b/Trunk/MonoGameView/DataModels/Models/ImageContainer.cs @@ -25,7 +25,10 @@ namespace MonoGameView.DataModels.Models _container.Images.Add("Paper", content.Load("paper")); _container.Images.Add("PlasticMetal", content.Load("plasticmetal")); _container.Images.Add("Organic", content.Load("organic")); - + _container.Images.Add("GlassBar", content.Load("glassBar")); + _container.Images.Add("PaperBar", content.Load("paperBar")); + _container.Images.Add("PlasticMetalBar", content.Load("plasticMetalBar")); + _container.Images.Add("OrganicBar", content.Load("organicBar")); } public static Texture2D GetImage(string s) diff --git a/Trunk/MonoGameView/Game1.cs b/Trunk/MonoGameView/Game1.cs index f4bed77..87cf0b6 100644 --- a/Trunk/MonoGameView/Game1.cs +++ b/Trunk/MonoGameView/Game1.cs @@ -148,7 +148,15 @@ namespace CzokoŚmieciarka.MonoGameView } */ // TODO: Add your update logic here - + var collectorDictionary = new Dictionary + { + {"Garbage Collector Info", ""}, + {collector.TrashContainers.ElementAtOrDefault(0).TypeOfGarbage.GarbageType.ToString(), collector.TrashContainers.ElementAtOrDefault(0).Garbage.Weight.ToString()}, + {collector.TrashContainers.ElementAtOrDefault(1).TypeOfGarbage.GarbageType.ToString(), collector.TrashContainers.ElementAtOrDefault(1).Garbage.Weight.ToString()}, + {collector.TrashContainers.ElementAtOrDefault(2).TypeOfGarbage.GarbageType.ToString(), collector.TrashContainers.ElementAtOrDefault(2).Garbage.Weight.ToString()}, + {collector.TrashContainers.ElementAtOrDefault(3).TypeOfGarbage.GarbageType.ToString(), collector.TrashContainers.ElementAtOrDefault(3).Garbage.Weight.ToString()} + }; + displayer.Content = collectorDictionary; base.Update(gameTime); } @@ -165,33 +173,10 @@ namespace CzokoŚmieciarka.MonoGameView { for (int y = 0; y < size; y++) { - //if (grid[x, y] is Road1) spriteBatch.Draw(road1, new Rectangle(x*500 / size, y*500 / size, 500/size, 500/size),Color.White); - //else if (grid[x,y] is Road2) spriteBatch.Draw(road2, new Rectangle(x * 500 / size, y * 500 / size, 500 / size, 500 / size), Color.White); - //else if (grid[x, y] is House) spriteBatch.Draw(house, new Rectangle(x * 500 / size, y * 500 / size, 500 / size, 500 / size), Color.White); - //else spriteBatch.Draw(grass, new Rectangle(x * 500 / size, y * 500 / size, 500 / size, 500 / size), Color.White); grid[x, y].Draw(spriteBatch, size); } } collector.Draw(spriteBatch, size); - displayer.Content = new Dictionary(); - try - { - foreach (var item in grid) - { - if (item is House) - { - var house = item as House; - displayer.Content.Add(house.Coords.X.ToString() + ":" + house.Coords.Y.ToString() + house.TrashCans.ElementAtOrDefault(0).Garbage.TypeOfGarbage.GarbageType.ToString(), house.TrashCans.ElementAtOrDefault(0).Garbage.Volume.ToString()); - displayer.Content.Add(house.Coords.X.ToString() + ":" + house.Coords.Y.ToString() + house.TrashCans.ElementAtOrDefault(1).Garbage.TypeOfGarbage.GarbageType.ToString(), house.TrashCans.ElementAtOrDefault(1).Garbage.Volume.ToString()); - displayer.Content.Add(house.Coords.X.ToString() + ":" + house.Coords.Y.ToString() + house.TrashCans.ElementAtOrDefault(2).Garbage.TypeOfGarbage.GarbageType.ToString(), house.TrashCans.ElementAtOrDefault(2).Garbage.Volume.ToString()); - displayer.Content.Add(house.Coords.X.ToString() + ":" + house.Coords.Y.ToString() + house.TrashCans.ElementAtOrDefault(3).Garbage.TypeOfGarbage.GarbageType.ToString(), house.TrashCans.ElementAtOrDefault(3).Garbage.Volume.ToString()); - } - } - } - catch - { - - } Display(displayer.Content); spriteBatch.End(); @@ -209,7 +194,7 @@ namespace CzokoŚmieciarka.MonoGameView int y = 10; foreach (KeyValuePair item in info) { - spriteBatch.DrawString(font, item.Key, new Vector2(x, y),Color.Black); + spriteBatch.DrawString(font, item.Key, new Vector2(x, y), Color.Black); y += 15; spriteBatch.DrawString(font, item.Value, new Vector2(x, y), Color.White); y += 30; diff --git a/Trunk/MonoGameView/map2.xml b/Trunk/MonoGameView/map2.xml index d632bdf..a60ee6a 100644 --- a/Trunk/MonoGameView/map2.xml +++ b/Trunk/MonoGameView/map2.xml @@ -174,20 +174,6 @@ 100 - - - Organic - - - 1 - - - 1 - - - 100 - - Paper @@ -216,6 +202,20 @@ 100 + + + Organic + + + 1 + + + 1 + + + 100 + + @@ -324,20 +324,6 @@ - - Organic - - - 1 - - - 1 - - - 100 - - - Paper @@ -365,6 +351,20 @@ 100 + + + Organic + + + 1 + + + 1 + + + 100 + + @@ -733,7 +733,7 @@ - Glass + Organic 1 @@ -864,7 +864,7 @@ - Glass + Paper 1 @@ -891,7 +891,7 @@ - Glass + PlasticMetal 1 @@ -1257,20 +1257,6 @@ - - Organic - - - 1 - - - 1 - - - 100 - - - Paper @@ -1298,6 +1284,20 @@ 100 + + + Organic + + + 1 + + + 1 + + + 100 + + @@ -1406,20 +1406,6 @@ - - Organic - - - 1 - - - 1 - - - 100 - - - Paper @@ -1447,6 +1433,20 @@ 100 + + + Organic + + + 1 + + + 1 + + + 100 + +