Description:
Clean up assets.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
|
|
1 | NO CONTENT: modified file, binary diff hidden |
| @@ -18,4 +18,3 | |||
|
|
18 | 18 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csproj.CoreCompileInputs.cache |
|
|
19 | 19 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.dll |
|
|
20 | 20 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.pdb |
|
|
21 | /Users/alys/repos/isometric-park-fna/FNA/obj/Debug/FNA.csprojAssemblyReference.cache | |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
| @@ -27,9 +27,7 | |||
|
|
27 | 27 | private KeyboardState keyboardPrev = new KeyboardState(); |
|
|
28 | 28 | |
|
|
29 | 29 | private SpriteBatch batch; |
|
|
30 | private Texture2D texture; | |
|
|
31 | 30 | private SoundEffect sound; |
|
|
32 | private Song music; | |
|
|
33 | 31 | private SpriteFont font; |
|
|
34 | 32 | private SpriteFont monoFont; |
|
|
35 | 33 | |
| @@ -88,8 +86,6 | |||
|
|
88 | 86 | private FNAGame() |
|
|
89 | 87 | { |
|
|
90 | 88 | //this.device = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.) |
|
|
91 | ||
|
|
92 | Console.Out.Write("TEST?"); | |
|
|
93 | 89 | #if DEBUG |
|
|
94 | 90 | foreach (System.Reflection.Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) |
|
|
95 | 91 | { |
| @@ -160,31 +156,15 | |||
|
|
160 | 156 | |
|
|
161 | 157 | protected override void LoadContent() |
|
|
162 | 158 | { |
|
|
163 | // Load textures, sounds, and so on in here... | |
|
|
164 | 159 | // Create the batch... |
|
|
165 | 160 | batch = new SpriteBatch(GraphicsDevice); |
|
|
166 | 161 | |
|
|
167 | // ... then load a texture from ./Content/FNATexture.png | |
|
|
168 | texture = Content.Load<Texture2D>("FNATexture"); | |
|
|
169 | 162 | sound = Content.Load<SoundEffect>("FNASound"); |
|
|
170 | music = Content.Load<Song>("IfImWrong"); | |
|
|
171 | 163 | Tile.TileSetTexture = Content.Load<Texture2D>(@"part4_tileset"); |
|
|
172 | 164 | |
|
|
173 | 165 | Line.initialize(GraphicsDevice); |
|
|
174 | 166 | |
|
|
175 | var fontBakeResult = TtfFontBaker.Bake(File.OpenRead(@"Content/DroidSans.ttf"), | |
|
|
176 | 25, | |
|
|
177 | 1024, | |
|
|
178 | 1024, | |
|
|
179 | new[] | |
|
|
180 | { | |
|
|
181 | CharacterRange.BasicLatin, | |
|
|
182 | CharacterRange.Latin1Supplement, | |
|
|
183 | CharacterRange.LatinExtendedA | |
|
|
184 | } | |
|
|
185 | ); | |
|
|
186 | ||
|
|
187 | ||
|
|
167 | ||
|
|
188 | 168 | var bakedMono = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"), |
|
|
189 | 169 | 15, |
|
|
190 | 170 | 1024, |
| @@ -204,19 +184,16 | |||
|
|
204 | 184 | |
|
|
205 | 185 | this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice); |
|
|
206 | 186 | |
|
|
207 | font = fontBakeResult.CreateSpriteFont(GraphicsDevice); | |
|
|
187 | //font = fontBakeResult.CreateSpriteFont(GraphicsDevice); | |
|
|
208 | 188 | monoFont = bakedMono.CreateSpriteFont(GraphicsDevice); |
|
|
209 | //DynamicSpriteFont font = DynamicSpriteFont.FromTtf(File.ReadAllBytes(@"Content/DroidSans.ttf"), 20); | |
|
|
210 | 189 | |
|
|
211 | 190 | } |
|
|
212 | 191 | |
|
|
213 | 192 | protected override void UnloadContent() |
|
|
214 | 193 | { |
|
|
215 | // Clean up after yourself! | |
|
|
216 | 194 | batch.Dispose(); |
|
|
217 | texture.Dispose(); | |
|
|
218 | 195 | sound.Dispose(); |
|
|
219 | music.Dispose(); | |
|
|
196 | Tile.TileSetTexture.Dispose(); | |
|
|
220 | 197 | } |
|
|
221 | 198 | |
|
|
222 | 199 | Vector2 calculateMousegrid(Vector2 normalizedMousePos) |
| @@ -341,7 +318,7 | |||
|
|
341 | 318 | this.showGrid = !this.showGrid; |
|
|
342 | 319 | |
|
|
343 | 320 | } |
|
|
344 |
if (keyboardCur.IsKeyDown(Keys. |
|
|
|
321 | if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash) && keyboardCur.IsKeyDown(Keys.LeftShift)) | |
|
|
345 | 322 | { |
|
|
346 | 323 | sound.Play(volume, pitch, pan); |
|
|
347 | 324 | } |
| @@ -349,7 +326,7 | |||
|
|
349 | 326 | |
|
|
350 | 327 | |
|
|
351 | 328 | #region gamerate_keys |
|
|
352 | if (keyboardCur.IsKeyDown(Keys.D0) && keyboardPrev.IsKeyUp(Keys.D0)) | |
|
|
329 | if (keyboardCur.IsKeyDown(Keys.D0) && keyboardPrev.IsKeyUp(Keys.D0) ) | |
|
|
353 | 330 | { |
|
|
354 | 331 | this.simulation.paused = !this.simulation.paused; |
|
|
355 | 332 | |
| @@ -61,30 +61,12 | |||
|
|
61 | 61 | </ProjectReference> |
|
|
62 | 62 | </ItemGroup> |
|
|
63 | 63 | <ItemGroup> |
|
|
64 | <None Include="Content\FNATexture.png"> | |
|
|
65 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |
|
|
66 | </None> | |
|
|
67 | 64 | <None Include="Content\FNASound.wav"> |
|
|
68 | <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> | |
|
|
65 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |
|
|
78 | 66 | </None> |
|
|
79 | 67 | <None Include="Content\DroidSans.ttf"> |
|
|
80 | 68 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
|
|
81 | 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 | 70 | <None Include="packages.config" /> |
|
|
89 | 71 | <None Include="Content\part4_tileset.png"> |
|
|
90 | 72 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
|
|
1 | NO CONTENT: file was removed, binary diff hidden |
You need to be logged in to leave comments.
Login now