Commits

Carolyn Van Slyck committed d0345d2

* Added test images
* Beginning to work on start screen and a text sprite

  • Participants
  • Parent commits 4dedde3

Comments (0)

Files changed (57)

OMG.Content/Bunny-BlackAndWhite.png

Added
New image

OMG.Content/Bunny-Brown.png

Added
New image

OMG.Content/Bunny-Grey.png

Added
New image

OMG.Content/Bunny-White.png

Added
New image

OMG.Content/Bunny-WhiteRabbit.png

Added
New image

OMG.Content/Kitty-BlackTiger.png

Added
New image

OMG.Content/Kitty-Bobcat.png

Added
New image

OMG.Content/Kitty-GreyTiger.png

Added
New image

OMG.Content/Kitty-Himalayan.png

Added
New image

OMG.Content/Kitty-Lynx.png

Added
New image

OMG.Content/Kitty-Orange.png

Added
New image

OMG.Content/Kitty-SnowLeopard.png

Added
New image

OMG.Content/Kitty-White.png

Added
New image

OMG.Content/Kitty-WhiteLion.png

Added
New image

OMG.Content/Misc-Donkey.png

Added
New image

OMG.Content/Misc-Penguin.png

Added
New image

OMG.Content/OMG.Content.contentproj

       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Bunny-BlackAndWhite.png">
+      <Name>Bunny-BlackAndWhite</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Bunny-Brown.png">
+      <Name>Bunny-Brown</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Bunny-Grey.png">
+      <Name>Bunny-Grey</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Bunny-White.png">
+      <Name>Bunny-White</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Bunny-WhiteRabbit.png">
+      <Name>Bunny-WhiteRabbit</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Kitty-BlackTiger.png">
+      <Name>Kitty-BlackTiger</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-Bobcat.png">
+      <Name>Kitty-Bobcat</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-GreyTiger.png">
+      <Name>Kitty-GreyTiger</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-Himalayan.png">
+      <Name>Kitty-Himalayan</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-Lynx.png">
+      <Name>Kitty-Lynx</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-Orange.png">
+      <Name>Kitty-Orange</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-SnowLeopard.png">
+      <Name>Kitty-SnowLeopard</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-White.png">
+      <Name>Kitty-White</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Kitty-WhiteLion.png">
+      <Name>Kitty-WhiteLion</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Misc-Donkey.png">
+      <Name>Misc-Donkey</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Misc-Penguin.png">
+      <Name>Misc-Penguin</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Appaloosa.png">
+      <Name>Pony-Appaloosa</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Baby-Appaloosa.png">
+      <Name>Pony-Baby-Appaloosa</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Baby-Black.png">
+      <Name>Pony-Baby-Black</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Baby-Clydesdale.png">
+      <Name>Pony-Baby-Clydesdale</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Baby-LightChestnut.png">
+      <Name>Pony-Baby-LightChestnut</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Baby-Pinto.png">
+      <Name>Pony-Baby-Pinto</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Baby-White.png">
+      <Name>Pony-Baby-White</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Bay.png">
+      <Name>Pony-Bay</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Black.png">
+      <Name>Pony-Black</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-BlackGreyMane.png">
+      <Name>Pony-BlackGreyMane</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-BlackStallion.png">
+      <Name>Pony-BlackStallion</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Clydesdale.png">
+      <Name>Pony-Clydesdale</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-LightBay.png">
+      <Name>Pony-LightBay</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-LightBlue.png">
+      <Name>Pony-LightBlue</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-LightChestnut.png">
+      <Name>Pony-LightChestnut</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-MiniAppaloosa.png">
+      <Name>Pony-MiniAppaloosa</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Pink.png">
+      <Name>Pony-Pink</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Pink1.png">
+      <Name>Pony-Pink1</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Pinto.png">
+      <Name>Pony-Pinto</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Purple.png">
+      <Name>Pony-Purple</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-Silver.png">
+      <Name>Pony-Silver</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Pony-White.png">
+      <Name>Pony-White</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Baby-Golden.png">
+      <Name>Puppy-Baby-Golden</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Baby-Husky.png">
+      <Name>Puppy-Baby-Husky</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Baby-SheepDog.png">
+      <Name>Puppy-Baby-SheepDog</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Baby-ShibaInu.png">
+      <Name>Puppy-Baby-ShibaInu</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Baby-StBenard.png">
+      <Name>Puppy-Baby-StBenard</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Baby-Terrier.png">
+      <Name>Puppy-Baby-Terrier</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-BorderCollie.png">
+      <Name>Puppy-BorderCollie</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Golden.png">
+      <Name>Puppy-Golden</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-SheepDog.png">
+      <Name>Puppy-SheepDog</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-ShibaInu.png">
+      <Name>Puppy-ShibaInu</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-StBenard.png">
+      <Name>Puppy-StBenard</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Puppy-Terrier.png">
+      <Name>Puppy-Terrier</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Title.spritefont">
+      <Name>Title</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. 
        Other similar extension points exist, see Microsoft.Common.targets.

OMG.Content/OMG.Content.contentproj.user

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
+</Project>

OMG.Content/Pony-Appaloosa.png

Added
New image

OMG.Content/Pony-Baby-Appaloosa.png

Added
New image

OMG.Content/Pony-Baby-Black.png

Added
New image

OMG.Content/Pony-Baby-Clydesdale.png

Added
New image

OMG.Content/Pony-Baby-LightChestnut.png

Added
New image

OMG.Content/Pony-Baby-Pinto.png

Added
New image

OMG.Content/Pony-Baby-White.png

Added
New image

OMG.Content/Pony-Bay.png

Added
New image

OMG.Content/Pony-Black.png

Added
New image

OMG.Content/Pony-BlackGreyMane.png

Added
New image

OMG.Content/Pony-BlackStallion.png

Added
New image

OMG.Content/Pony-Clydesdale.png

Added
New image

OMG.Content/Pony-LightBay.png

Added
New image

OMG.Content/Pony-LightBlue.png

Added
New image

OMG.Content/Pony-LightChestnut.png

Added
New image

OMG.Content/Pony-MiniAppaloosa.png

Added
New image

OMG.Content/Pony-Pink.png

Added
New image

OMG.Content/Pony-Pink1.png

Added
New image

OMG.Content/Pony-Pinto.png

Added
New image

OMG.Content/Pony-Purple.png

Added
New image

OMG.Content/Pony-Silver.png

Added
New image

OMG.Content/Pony-White.png

Added
New image

OMG.Content/Puppy-Baby-Golden.png

Added
New image

OMG.Content/Puppy-Baby-Husky.png

Added
New image

OMG.Content/Puppy-Baby-SheepDog.png

Added
New image

OMG.Content/Puppy-Baby-ShibaInu.png

Added
New image

OMG.Content/Puppy-Baby-StBenard.png

Added
New image

OMG.Content/Puppy-Baby-Terrier.png

Added
New image

OMG.Content/Puppy-BorderCollie.png

Added
New image

OMG.Content/Puppy-Golden.png

Added
New image

OMG.Content/Puppy-SheepDog.png

Added
New image

OMG.Content/Puppy-ShibaInu.png

Added
New image

OMG.Content/Puppy-StBenard.png

Added
New image

OMG.Content/Puppy-Terrier.png

Added
New image

OMG.Content/Title.spritefont

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file contains an xml description of a font, and will be read by the XNA
+Framework Content Pipeline. Follow the comments to customize the appearance
+of the font in your game, and to change the characters which are available to draw
+with.
+-->
+<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
+  <Asset Type="Graphics:FontDescription">
+
+    <!--
+    Modify this string to change the font that will be imported.
+    -->
+    <FontName>Segoe UI Mono</FontName>
+
+    <!--
+    Size is a float value, measured in points. Modify this value to change
+    the size of the font.
+    -->
+    <Size>14</Size>
+
+    <!--
+    Spacing is a float value, measured in pixels. Modify this value to change
+    the amount of spacing in between characters.
+    -->
+    <Spacing>0</Spacing>
+
+    <!--
+    UseKerning controls the layout of the font. If this value is true, kerning information
+    will be used when placing characters.
+    -->
+    <UseKerning>true</UseKerning>
+
+    <!--
+    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
+    and "Bold, Italic", and are case sensitive.
+    -->
+    <Style>Regular</Style>
+
+    <!--
+    If you uncomment this line, the default character will be substituted if you draw
+    or measure text that contains characters which were not included in the font.
+    -->
+    <!-- <DefaultCharacter>*</DefaultCharacter> -->
+
+    <!--
+    CharacterRegions control what letters are available in the font. Every
+    character from Start to End will be built and made available for drawing. The
+    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
+    character set. The characters are ordered according to the Unicode standard.
+    See the documentation for more information.
+    -->
+    <CharacterRegions>
+      <CharacterRegion>
+        <Start>&#32;</Start>
+        <End>&#126;</End>
+      </CharacterRegion>
+    </CharacterRegions>
+  </Asset>
+</XnaContent>

OMG/OMG.Windows.csproj

     <Compile Include="Sprite\ScrollingBackground.cs" />
     <Compile Include="Sprite\Sprite.cs" />
     <Compile Include="Sprite\SpriteManager.cs" />
+    <Compile Include="Sprite\TextSprite.cs" />
+    <Compile Include="StartScreen.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Game.ico" />

OMG/OMG.Xbox.csproj

     <Compile Include="Sprite\ScrollingBackground.cs" />
     <Compile Include="Sprite\Sprite.cs" />
     <Compile Include="Sprite\SpriteManager.cs" />
+    <Compile Include="Sprite\TextSprite.cs" />
+    <Compile Include="StartScreen.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Game.ico" />

OMG/Sprite/TextSprite.cs

+using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace OMG.Sprite
+{
+    public class TextSprite : ISprite
+    {
+        private readonly string _font;
+        private SpriteFont _spriteFont;
+
+        public TextSprite(string font)
+        {
+            _font = font;
+            DrawOrder = int.MaxValue;
+        }
+
+        public string Text;
+        public Color TextColor = Color.White;
+
+        public Vector2 Position { get; set; }
+        public event SpritePositionChanging PositionChanging;
+
+        public bool AllowCollide(ISprite sprite)
+        {
+            return true;
+        }
+
+        public void Collide(ISprite sprite)
+        {
+            
+        }
+
+        public Rectangle Size { get; private set; }
+        public Rectangle Border { get; private set; }
+        public float Scale { get; set; }
+        public int DrawOrder { get; set; }
+
+        public void LoadContent(ContentManager contentManager)
+        {
+            _spriteFont = contentManager.Load<SpriteFont>(_font);
+        }
+
+        public void Draw(SpriteBatch spriteBatch)
+        {
+            spriteBatch.DrawString(_spriteFont, Text, Position, TextColor);
+        }
+
+        public void Update(GameTime gameTime, GameControllerState gameControllerState)
+        {
+            
+        }
+
+        public void Free(ISprite sprite)
+        {
+            
+        }
+    }
+}

OMG/StartScreen.cs

+using System;
+using OMG.MiniGame;
+
+namespace OMG
+{
+    public class StartScreen : MiniGameBase
+    {
+        protected override void InitializeSprites()
+        {
+            
+        }
+
+        protected override void Draw(Microsoft.Xna.Framework.GameTime gameTime)
+        {
+
+        }
+    }
+}