Description:
Visual tweaks mostly for the benefit of a screen shot.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
| @@ -9,6 +9,7 | |||||
|
|
9 | <OutputType>Library</OutputType> |
|
9 | <OutputType>Library</OutputType> |
|
|
10 | <RootNamespace>Microsoft.Xna.Framework</RootNamespace> |
|
10 | <RootNamespace>Microsoft.Xna.Framework</RootNamespace> |
|
|
11 | <AssemblyName>FNA</AssemblyName> |
|
11 | <AssemblyName>FNA</AssemblyName> |
|
|
|
12 | <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> | ||
|
|
12 | </PropertyGroup> |
|
13 | </PropertyGroup> |
|
|
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |
|
14 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> |
|
|
14 | <DebugSymbols>True</DebugSymbols> |
|
15 | <DebugSymbols>True</DebugSymbols> |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -6,3 +6,7 | |||||
|
|
6 | /Users/alys/repos/fna-pong/FNA/bin/Release/FNA.dll |
|
6 | /Users/alys/repos/fna-pong/FNA/bin/Release/FNA.dll |
|
|
7 | /Users/alys/repos/fna-pong/FNA/obj/Release/FNA.csproj.CoreCompileInputs.cache |
|
7 | /Users/alys/repos/fna-pong/FNA/obj/Release/FNA.csproj.CoreCompileInputs.cache |
|
|
8 | /Users/alys/repos/fna-pong/FNA/obj/Release/FNA.dll |
|
8 | /Users/alys/repos/fna-pong/FNA/obj/Release/FNA.dll |
|
|
|
9 | /Users/alys/repos/isometric-park-fna/FNA/bin/Release/FNA.dll.config | ||
|
|
|
10 | /Users/alys/repos/isometric-park-fna/FNA/bin/Release/FNA.dll | ||
|
|
|
11 | /Users/alys/repos/isometric-park-fna/FNA/obj/Release/FNA.csproj.CoreCompileInputs.cache | ||
|
|
|
12 | /Users/alys/repos/isometric-park-fna/FNA/obj/Release/FNA.dll | ||
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -1,9 +1,9 | |||||
|
|
1 | <Project Sdk="Microsoft.NET.Sdk"> |
|
1 | <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk"> |
|
|
2 | <PropertyGroup> |
|
2 | <PropertyGroup> |
|
|
3 | <Description>A .NET wrapper for the Dear ImGui library.</Description> |
|
3 | <Description>A .NET wrapper for the Dear ImGui library.</Description> |
|
|
4 | <AssemblyVersion>1.78.0</AssemblyVersion> |
|
4 | <AssemblyVersion>1.78.0</AssemblyVersion> |
|
|
5 | <Authors>Eric Mellino</Authors> |
|
5 | <Authors>Eric Mellino</Authors> |
|
|
6 |
<TargetFramework>net |
|
6 | <TargetFramework>net472</TargetFramework> |
|
|
7 | <AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
7 | <AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
8 | <DebugType>portable</DebugType> |
|
8 | <DebugType>portable</DebugType> |
|
|
9 | <AssemblyName>ImGui.NET</AssemblyName> |
|
9 | <AssemblyName>ImGui.NET</AssemblyName> |
| @@ -15,9 +15,13 | |||||
|
|
15 | <DocumentationFile Condition="'$(Configuration)' == 'Release'">$(OutputPath)\ImGui.NET.xml</DocumentationFile> |
|
15 | <DocumentationFile Condition="'$(Configuration)' == 'Release'">$(OutputPath)\ImGui.NET.xml</DocumentationFile> |
|
|
16 | <RootNamespace>ImGuiNET</RootNamespace> |
|
16 | <RootNamespace>ImGuiNET</RootNamespace> |
|
|
17 | </PropertyGroup> |
|
17 | </PropertyGroup> |
|
|
|
18 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
|
|
|
19 | <DebugType></DebugType> | ||
|
|
|
20 | <DocumentationFile></DocumentationFile> | ||
|
|
|
21 | </PropertyGroup> | ||
|
|
18 | <ItemGroup> |
|
22 | <ItemGroup> |
|
|
19 |
<PackageReference Include="System.Numerics.Vectors" Version="4.4.0" |
|
23 | <PackageReference Include="System.Numerics.Vectors" Version="4.4.0"/> |
|
|
20 |
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" |
|
24 | <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0"/> |
|
|
21 | <PackageReference Include="System.Buffers" Version="4.4.0" /> |
|
25 | <PackageReference Include="System.Buffers" Version="4.4.0" /> |
|
|
22 | </ItemGroup> |
|
26 | </ItemGroup> |
|
|
23 | <ItemGroup> |
|
27 | <ItemGroup> |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -9,3 +9,14 | |||||
|
|
9 | /Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csproj.CopyComplete |
|
9 | /Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csproj.CopyComplete |
|
|
10 | /Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.dll |
|
10 | /Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.dll |
|
|
11 | /Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.pdb |
|
11 | /Users/alys/repos/fna-pong/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.pdb |
|
|
|
12 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Release/net45/FNA.dll.config | ||
|
|
|
13 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Release/net45/SpriteFontPlus.dll | ||
|
|
|
14 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Release/net45/SpriteFontPlus.pdb | ||
|
|
|
15 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/bin/FNA/Release/net45/FNA.dll | ||
|
|
|
16 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache | ||
|
|
|
17 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.AssemblyInfoInputs.cache | ||
|
|
|
18 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.AssemblyInfo.cs | ||
|
|
|
19 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csproj.CoreCompileInputs.cache | ||
|
|
|
20 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csproj.CopyComplete | ||
|
|
|
21 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.dll | ||
|
|
|
22 | /Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.pdb | ||
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -11,7 +11,7 | |||||
|
|
11 | "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj" |
|
11 | "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj" |
|
|
12 | }, |
|
12 | }, |
|
|
13 | "frameworks": { |
|
13 | "frameworks": { |
|
|
14 |
"net4 |
|
14 | "net48": {} |
|
|
15 | } |
|
15 | } |
|
|
16 | }, |
|
16 | }, |
|
|
17 | "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": { |
|
17 | "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": { |
| @@ -1,6 +1,6 | |||||
|
|
1 | { |
|
1 | { |
|
|
2 | "version": 2, |
|
2 | "version": 2, |
|
|
3 | "dgSpecHash": "K2eZWc96szHBhsBHLdQISlDUCUoBqbOO/kuQg7JxPZ+7eqqDfW+UGRDZiMDlRv4HxmSNa76l7Elv0ZO48kh6uw==", |
|
3 | "dgSpecHash": "sLS5t/lm8+OjmBMUSq4Oa+qj1nmlP4hv1nbhrDkCyh4cFv0feKffMuOUJCnVyo3CemM3wJ8x9kse/rI52oJ1pQ==", |
|
|
4 | "success": true, |
|
4 | "success": true, |
|
|
5 | "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", |
|
5 | "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", |
|
|
6 | "expectedPackageFiles": [], |
|
6 | "expectedPackageFiles": [], |
|
|
1 | NO CONTENT: modified file, binary diff hidden |
|
NO CONTENT: modified file, binary diff hidden |
| @@ -10,8 +10,11 | |||||
|
|
10 | using SpriteFontPlus; |
|
10 | using SpriteFontPlus; |
|
|
11 | using isometricparkfna; |
|
11 | using isometricparkfna; |
|
|
12 | using System.Diagnostics; |
|
12 | using System.Diagnostics; |
|
|
|
13 | |||
|
|
|
14 | #if DEBUG | ||
|
|
13 | using ImGuiNET.SampleProgram.XNA; |
|
15 | using ImGuiNET.SampleProgram.XNA; |
|
|
14 | using ImGuiNET; |
|
16 | using ImGuiNET; |
|
|
|
17 | #endif | ||
|
|
15 |
|
18 | ||
|
|
16 | class FNAGame : Game |
|
19 | class FNAGame : Game |
|
|
17 | { |
|
20 | { |
| @@ -51,9 +54,10 | |||||
|
|
51 | Vector2 mouseGrid; |
|
54 | Vector2 mouseGrid; |
|
|
52 | Vector2 original_point; |
|
55 | Vector2 original_point; |
|
|
53 | Vector2 mousePos; |
|
56 | Vector2 mousePos; |
|
|
54 |
|
57 | #if DEBUG | |
|
|
55 | private ImGuiRenderer _imGuiRenderer; |
|
58 | private ImGuiRenderer _imGuiRenderer; |
|
|
56 | private DebugWindow debugWindow; |
|
59 | private DebugWindow debugWindow; |
|
|
|
60 | #endif | ||
|
|
57 | bool show_another_window; |
|
61 | bool show_another_window; |
|
|
58 | private bool showInitial; |
|
62 | private bool showInitial; |
|
|
59 | int messageIndex; |
|
63 | int messageIndex; |
| @@ -61,6 +65,8 | |||||
|
|
61 | //buggy |
|
65 | //buggy |
|
|
62 | private static bool enableCulling = false; |
|
66 | private static bool enableCulling = false; |
|
|
63 |
|
67 | ||
|
|
|
68 | private bool showGrid = true; | ||
|
|
|
69 | |||
|
|
64 | private static void Main(string[] args) |
|
70 | private static void Main(string[] args) |
|
|
65 | { |
|
71 | { |
|
|
66 | using FNAGame g = new FNAGame(); |
|
72 | using FNAGame g = new FNAGame(); |
| @@ -112,10 +118,10 | |||||
|
|
112 | * loading configuration stuff in the constructor |
|
118 | * loading configuration stuff in the constructor |
|
|
113 | */ |
|
119 | */ |
|
|
114 | this.IsMouseVisible = true; |
|
120 | this.IsMouseVisible = true; |
|
|
115 |
|
121 | #if DEBUG | |
|
|
116 | _imGuiRenderer = new ImGuiRenderer(this); |
|
122 | _imGuiRenderer = new ImGuiRenderer(this); |
|
|
117 | _imGuiRenderer.RebuildFontAtlas(); // Required so fonts are available for rendering |
|
123 | _imGuiRenderer.RebuildFontAtlas(); // Required so fonts are available for rendering |
|
|
118 |
|
124 | #endif | |
|
|
119 | base.Initialize(); |
|
125 | base.Initialize(); |
|
|
120 | } |
|
126 | } |
|
|
121 |
|
127 | ||
| @@ -160,8 +166,9 | |||||
|
|
160 | } |
|
166 | } |
|
|
161 | ); |
|
167 | ); |
|
|
162 |
|
168 | ||
|
|
|
169 | #if DEBUG | ||
|
|
163 | this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice); |
|
170 | this.debugWindow = new DebugWindow(this._imGuiRenderer, GraphicsDevice); |
|
|
164 |
|
171 | #endif | |
|
|
165 | font = fontBakeResult.CreateSpriteFont(GraphicsDevice); |
|
172 | font = fontBakeResult.CreateSpriteFont(GraphicsDevice); |
|
|
166 | monoFont = bakedMono.CreateSpriteFont(GraphicsDevice); |
|
173 | monoFont = bakedMono.CreateSpriteFont(GraphicsDevice); |
|
|
167 | //DynamicSpriteFont font = DynamicSpriteFont.FromTtf(File.ReadAllBytes(@"Content/DroidSans.ttf"), 20); |
|
174 | //DynamicSpriteFont font = DynamicSpriteFont.FromTtf(File.ReadAllBytes(@"Content/DroidSans.ttf"), 20); |
| @@ -258,11 +265,11 | |||||
|
|
258 |
|
265 | ||
|
|
259 | if (keyboardCur.IsKeyDown(Keys.Down)) |
|
266 | if (keyboardCur.IsKeyDown(Keys.Down)) |
|
|
260 | { |
|
267 | { |
|
|
261 |
this.camera.Move(new Vector2(0, |
|
268 | this.camera.Move(new Vector2(0, 2)); |
|
|
262 | } |
|
269 | } |
|
|
263 | else if (keyboardCur.IsKeyDown(Keys.Up)) |
|
270 | else if (keyboardCur.IsKeyDown(Keys.Up)) |
|
|
264 | { |
|
271 | { |
|
|
265 | this.camera.Move(new Vector2(0, 2)); |
|
272 | this.camera.Move(new Vector2(0, -2)); |
|
|
266 |
|
273 | ||
|
|
267 | } |
|
274 | } |
|
|
268 | else if (keyboardCur.IsKeyDown(Keys.Left)) |
|
275 | else if (keyboardCur.IsKeyDown(Keys.Left)) |
| @@ -291,6 +298,12 | |||||
|
|
291 |
|
298 | ||
|
|
292 | } |
|
299 | } |
|
|
293 |
|
300 | ||
|
|
|
301 | if (keyboardCur.IsKeyDown(Keys.G) && keyboardPrev.IsKeyUp(Keys.G)) | ||
|
|
|
302 | { | ||
|
|
|
303 | this.showGrid = !this.showGrid; | ||
|
|
|
304 | |||
|
|
|
305 | } | ||
|
|
|
306 | |||
|
|
294 |
|
307 | ||
|
|
295 |
|
308 | ||
|
|
296 | if (keyboardCur.IsKeyDown(Keys.Space) && keyboardPrev.IsKeyUp(Keys.Space)) |
|
309 | if (keyboardCur.IsKeyDown(Keys.Space) && keyboardPrev.IsKeyUp(Keys.Space)) |
| @@ -457,8 +470,6 | |||||
|
|
457 |
|
470 | ||
|
|
458 | string fps = string.Format("fps: {0}", frameRate); |
|
471 | string fps = string.Format("fps: {0}", frameRate); |
|
|
459 |
|
472 | ||
|
|
460 |
|
|||
|
|
461 |
|
|||
|
|
462 | Stopwatch stopWatch = new Stopwatch(); |
|
473 | Stopwatch stopWatch = new Stopwatch(); |
|
|
463 | stopWatch.Start(); |
|
474 | stopWatch.Start(); |
|
|
464 | GraphicsDevice.Clear(Color.CornflowerBlue); |
|
475 | GraphicsDevice.Clear(Color.CornflowerBlue); |
| @@ -544,34 +555,36 | |||||
|
|
544 |
|
555 | ||
|
|
545 | } |
|
556 | } |
|
|
546 |
|
557 | ||
|
|
547 | //need to go one extra so gridlines include the far side of the final tile: |
|
558 | if (this.showGrid) |
|
|
548 | for (int y = 0; y < (this.squaresDown+1); y++) |
|
||
|
|
549 | { |
|
559 | { |
|
|
550 |
|
560 | //need to go one extra so gridlines include the far side of the final tile: | |
|
|
551 | Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved |
|
561 | for (int y = 0; y < (this.squaresDown + 1); y++) |
|
|
|
562 | { | ||
|
|
552 |
|
563 | ||
|
|
553 | Line.drawLine(batch, |
|
564 | Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved |
|
|
554 | new Vector2(((0-y) * Tile.TileSpriteWidth/2), (0+y)*Tile.TileSpriteHeight/2) + adjust, |
|
||
|
|
555 | //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), |
|
||
|
|
556 | new Vector2((this.squaresAcross - (y)) * Tile.TileSpriteWidth / 2, (this.squaresAcross + (y )) * Tile.TileSpriteHeight / 2) + adjust, |
|
||
|
|
557 | Color.White, 0.8f); |
|
||
|
|
558 |
|
565 | ||
|
|
559 | } |
|
566 | Line.drawLine(batch, |
|
|
|
567 | new Vector2(((0 - y) * Tile.TileSpriteWidth / 2), (0 + y) * Tile.TileSpriteHeight / 2) + adjust, | ||
|
|
|
568 | //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), | ||
|
|
|
569 | new Vector2((this.squaresAcross - (y)) * Tile.TileSpriteWidth / 2, (this.squaresAcross + (y)) * Tile.TileSpriteHeight / 2) + adjust, | ||
|
|
|
570 | Color.White, 0.8f); | ||
|
|
560 |
|
571 | ||
|
|
561 | for (int x = 0; x < (this.squaresAcross+1); x++) |
|
572 | } |
|
|
562 | { |
|
||
|
|
563 |
|
573 | ||
|
|
564 | Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved |
|
574 | for (int x = 0; x < (this.squaresAcross + 1); x++) |
|
|
|
575 | { | ||
|
|
|
576 | |||
|
|
|
577 | Vector2 adjust = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved | ||
|
|
565 |
|
578 | ||
|
|
566 | Line.drawLine(batch, |
|
579 | Line.drawLine(batch, |
|
|
567 | new Vector2(((x - 0) * Tile.TileSpriteWidth / 2), (x + 0) * Tile.TileSpriteHeight / 2) + adjust, |
|
580 | new Vector2(((x - 0) * Tile.TileSpriteWidth / 2), (x + 0) * Tile.TileSpriteHeight / 2) + adjust, |
|
|
568 | //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), |
|
581 | //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), |
|
|
569 | new Vector2((x - this.squaresDown) * Tile.TileSpriteWidth / 2, (x + this.squaresDown) * Tile.TileSpriteHeight / 2) + adjust, |
|
582 | new Vector2((x - this.squaresDown) * Tile.TileSpriteWidth / 2, (x + this.squaresDown) * Tile.TileSpriteHeight / 2) + adjust, |
|
|
570 | Color.White, 0.8f); |
|
583 | Color.White, 0.8f); |
|
|
571 |
|
584 | ||
|
|
|
585 | } | ||
|
|
572 | } |
|
586 | } |
|
|
573 |
|
587 | ||
|
|
574 |
|
|||
|
|
575 | //Gridlines |
|
588 | //Gridlines |
|
|
576 | //Lines going down and to the right: |
|
589 | //Lines going down and to the right: |
|
|
577 | /* |
|
590 | /* |
| @@ -650,12 +663,16 | |||||
|
|
650 | if (this.map.cells[i][j].hasTree) |
|
663 | if (this.map.cells[i][j].hasTree) |
|
|
651 | { |
|
664 | { |
|
|
652 | drawTileAt(i, j, 142, 2); |
|
665 | drawTileAt(i, j, 142, 2); |
|
|
|
666 | |||
|
|
653 | } |
|
667 | } |
|
|
654 |
|
668 | ||
|
|
655 |
|
669 | ||
|
|
656 | } |
|
670 | } |
|
|
657 | } |
|
671 | } |
|
|
658 |
|
672 | ||
|
|
|
673 | drawTileAt(2, 2, 140, 2); | ||
|
|
|
674 | drawTileAt(1, 1, 140, 2); | ||
|
|
|
675 | drawTileAt(3, 2, 140, 2); | ||
|
|
659 |
|
676 | ||
|
|
660 | batch.End(); |
|
677 | batch.End(); |
|
|
661 |
|
678 | ||
| @@ -710,7 +727,7 | |||||
|
|
710 | hasTree = has_tree, |
|
727 | hasTree = has_tree, |
|
|
711 | tilesDrawn = this.tilesDrawn |
|
728 | tilesDrawn = this.tilesDrawn |
|
|
712 | }; |
|
729 | }; |
|
|
713 |
|
730 | #if DEBUG | |
|
|
714 | //Finally, draw the debug window |
|
731 | //Finally, draw the debug window |
|
|
715 | _imGuiRenderer.BeforeLayout(gameTime); |
|
732 | _imGuiRenderer.BeforeLayout(gameTime); |
|
|
716 | debugWindow.Layout(debugInfo, new Dictionary<string, string>(),ref show_another_window); |
|
733 | debugWindow.Layout(debugInfo, new Dictionary<string, string>(),ref show_another_window); |
| @@ -731,6 +748,7 | |||||
|
|
731 | } |
|
748 | } |
|
|
732 |
|
749 | ||
|
|
733 | _imGuiRenderer.AfterLayout(); |
|
750 | _imGuiRenderer.AfterLayout(); |
|
|
|
751 | #endif | ||
|
|
734 |
|
752 | ||
|
|
735 | stopWatch.Stop(); |
|
753 | stopWatch.Stop(); |
|
|
736 | this.drawTime = stopWatch.Elapsed; |
|
754 | this.drawTime = stopWatch.Elapsed; |
| @@ -54,6 +54,7 | |||||
|
|
54 | <ProjectReference Include="..\ImGui.NET\ImGui.NET.csproj"> |
|
54 | <ProjectReference Include="..\ImGui.NET\ImGui.NET.csproj"> |
|
|
55 | <Project>{22ACD385-A146-448C-B82D-0FDB449FB7AD}</Project> |
|
55 | <Project>{22ACD385-A146-448C-B82D-0FDB449FB7AD}</Project> |
|
|
56 | <Name>ImGui.NET</Name> |
|
56 | <Name>ImGui.NET</Name> |
|
|
|
57 | <HintPath>..\packages\ImGui.NET.1.78.0\lib\netstandard2.0\ImGui.NET.dll</HintPath> | ||
|
|
57 | </ProjectReference> |
|
58 | </ProjectReference> |
|
|
58 | </ItemGroup> |
|
59 | </ItemGroup> |
|
|
59 | <ItemGroup> |
|
60 | <ItemGroup> |
| @@ -92,6 +93,27 | |||||
|
|
92 | <Content Include="cimgui/osx-x64/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="libcimgui.dylib" /> |
|
93 | <Content Include="cimgui/osx-x64/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="libcimgui.dylib" /> |
|
|
93 | <Content Include="cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" Link="libcimgui.so" /> |
|
94 | <Content Include="cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" Link="libcimgui.so" /> |
|
|
94 |
|
95 | ||
|
|
|
96 | <None Include="fnalibs\README.txt" /> | ||
|
|
|
97 | <None Include="fnalibs\lib64\libFAudio.so.0" /> | ||
|
|
|
98 | <None Include="fnalibs\lib64\libmojoshader.so" /> | ||
|
|
|
99 | <None Include="fnalibs\lib64\libSDL2-2.0.so.0" /> | ||
|
|
|
100 | <None Include="fnalibs\lib64\libSDL2_image-2.0.so.0" /> | ||
|
|
|
101 | <None Include="fnalibs\lib64\libtheorafile.so" /> | ||
|
|
|
102 | <None Include="fnalibs\osx\libFAudio.0.dylib" /> | ||
|
|
|
103 | <None Include="fnalibs\osx\libmojoshader.dylib" /> | ||
|
|
|
104 | <None Include="fnalibs\osx\libSDL2-2.0.0.dylib" /> | ||
|
|
|
105 | <None Include="fnalibs\osx\libSDL2_image-2.0.0.dylib" /> | ||
|
|
|
106 | <None Include="fnalibs\osx\libtheorafile.dylib" /> | ||
|
|
|
107 | <None Include="fnalibs\x64\FAudio.dll" /> | ||
|
|
|
108 | <None Include="fnalibs\x64\libtheorafile.dll" /> | ||
|
|
|
109 | <None Include="fnalibs\x64\MojoShader.dll" /> | ||
|
|
|
110 | <None Include="fnalibs\x64\SDL2.dll" /> | ||
|
|
|
111 | <None Include="fnalibs\x64\SDL2_image.dll" /> | ||
|
|
|
112 | <None Include="fnalibs\x86\FAudio.dll" /> | ||
|
|
|
113 | <None Include="fnalibs\x86\libtheorafile.dll" /> | ||
|
|
|
114 | <None Include="fnalibs\x86\MojoShader.dll" /> | ||
|
|
|
115 | <None Include="fnalibs\x86\SDL2.dll" /> | ||
|
|
|
116 | <None Include="fnalibs\x86\SDL2_image.dll" /> | ||
|
|
95 | </ItemGroup> |
|
117 | </ItemGroup> |
|
|
96 | <ItemGroup> |
|
118 | <ItemGroup> |
|
|
97 | <Reference Include="System" /> |
|
119 | <Reference Include="System" /> |
| @@ -109,4 +131,5 | |||||
|
|
109 | </Reference> |
|
131 | </Reference> |
|
|
110 | </ItemGroup> |
|
132 | </ItemGroup> |
|
|
111 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
|
133 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> |
|
|
|
134 | <Import Project="..\packages\ImGui.NET.1.78.0\build\net40\ImGui.NET.targets" Condition="Exists('..\packages\ImGui.NET.1.78.0\build\net40\ImGui.NET.targets')" /> | ||
|
|
112 | </Project> |
|
135 | </Project> |
| @@ -1,5 +1,6 | |||||
|
|
1 | <?xml version="1.0" encoding="utf-8"?> |
|
1 | <?xml version="1.0" encoding="utf-8"?> |
|
|
2 | <packages> |
|
2 | <packages> |
|
|
|
3 | <package id="ImGui.NET" version="1.78.0" targetFramework="net472" /> | ||
|
|
3 | <package id="System.Buffers" version="4.4.0" targetFramework="net472" /> |
|
4 | <package id="System.Buffers" version="4.4.0" targetFramework="net472" /> |
|
|
4 | <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" /> |
|
5 | <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net472" /> |
|
|
5 | <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net472" /> |
|
6 | <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net472" /> |
You need to be logged in to leave comments.
Login now