alysbrooks-public/games/isometric-park-fna Commit - r40:c611f0add068

r40:c611f0add068 - Fri, 01 Jan 2021 23:04:44

FNA/bin/Debug/FNA.dll ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

FNA/obj/Debug/FNA.csproj.FileListAbsolute.txt ¶ 0 -1

             /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csproj.CoreCompileInputs.cache
             /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.dll
             /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.pdb
-            /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csprojAssemblyReference.cache

FNA/obj/Debug/FNA.dll ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/FNA.dll ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.dll ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/bin/FNA/Debug/net45/SpriteFontPlus.pdb ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.dll ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.pdb ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

isometric-park-fna/.DS_Store ¶ binary modified 0 0

NO CONTENT: modified file, binary diff hidden

isometric-park-fna/FNAGame.cs ¶ +5 -28

             	private KeyboardState keyboardPrev = new KeyboardState();
             	private SpriteBatch batch;
-            	private Texture2D texture;
             	private SoundEffect sound;
-            	private Song music;
             	private SpriteFont font;
             	private SpriteFont monoFont;
             	private FNAGame()
             	{
             		//this.device = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.)
-            		Console.Out.Write("TEST?");
             #if DEBUG
             		foreach (System.Reflection.Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
             		{
             	protected override void LoadContent()
             	{
-            		// Load textures, sounds, and so on in here...
             		// Create the batch...
             		batch = new SpriteBatch(GraphicsDevice);
-            		// ... then load a texture from ./Content/FNATexture.png
-            		texture = Content.Load<Texture2D>("FNATexture");
             		sound = Content.Load<SoundEffect>("FNASound");
-            		music = Content.Load<Song>("IfImWrong");
             		Tile.TileSetTexture = Content.Load<Texture2D>(@"part4_tileset");
             		Line.initialize(GraphicsDevice);
-            		var fontBakeResult = TtfFontBaker.Bake(File.OpenRead(@"Content/DroidSans.ttf"),
-,
-,
-,
-            				new[]
-            					CharacterRange.BasicLatin,
-            					CharacterRange.Latin1Supplement,
-            					CharacterRange.LatinExtendedA
-            			);
             		var bakedMono = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"),
 ,
 ,
             		this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice);
-            		font = fontBakeResult.CreateSpriteFont(GraphicsDevice);
+            		//font = fontBakeResult.CreateSpriteFont(GraphicsDevice);
             		monoFont = bakedMono.CreateSpriteFont(GraphicsDevice);
-            		//DynamicSpriteFont font = DynamicSpriteFont.FromTtf(File.ReadAllBytes(@"Content/DroidSans.ttf"), 20);
             	}
             	protected override void UnloadContent()
             	{
-            		// Clean up after yourself!
             		batch.Dispose();
-            		texture.Dispose();
             		sound.Dispose();
-            		music.Dispose();
+            		Tile.TileSetTexture.Dispose();
             	}
             	Vector2 calculateMousegrid(Vector2 normalizedMousePos)
             			this.showGrid = !this.showGrid;
             		}
-            		if (keyboardCur.IsKeyDown(Keys.Space) && keyboardPrev.IsKeyUp(Keys.Space))
+            		if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift))
             		{
             			sound.Play(volume, pitch, pan);
             		}
             		#region gamerate_keys
-            		if (keyboardCur.IsKeyDown(Keys.D0) && keyboardPrev.IsKeyUp(Keys.D0))
+            		if (keyboardCur.IsKeyDown(Keys.D0) && keyboardPrev.IsKeyUp(Keys.D0) )
             		{
             			this.simulation.paused = !this.simulation.paused;

isometric-park-fna/isometric-park-fna.csproj ¶ +1 -19

@@ -61,30 +61,12
61	</ProjectReference>	61	</ProjectReference>
62	</ItemGroup>	62	</ItemGroup>
63	<ItemGroup>	63	<ItemGroup>
64	<None Include="Content\FNATexture.png">
65	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
66	</None>
67	<None Include="Content\FNASound.wav">	64	<None Include="Content\FNASound.wav">
68	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>	65	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
69	</None>
70	<None Include="Content\IfImWrong.mp3">
71	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72	</None>
73	<None Include="Content\IfImWrong.ogg">
74	<CopyToOutputDirectory>Always</CopyToOutputDirectory>
75	</None>
76	<None Include="Content\Menlo.ttf">
77	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
78	</None>	66	</None>
79	<None Include="Content\DroidSans.ttf">	67	<None Include="Content\DroidSans.ttf">
80	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>	68	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81	</None>	69	</None>
82	<None Include="Content\ball.png">
83	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
84	</None>
85	<None Include="Content\paddle.png">
86	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
87	</None>
88	<None Include="packages.config" />	70	<None Include="packages.config" />
89	<None Include="Content\part4_tileset.png">	71	<None Include="Content\part4_tileset.png">
90	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>	72	<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Content/FNATexture ¶ removed binary 0 0