alysbrooks-public » games » isometric-park-fna

Commit r189:a68150b89f17 public

parent | child
Description:
Add first working renderer! ?
Commit status:
[Not Reviewed]
References:
m3-contracts
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r189:a68150b89f17 -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 8ee6b95dcd628b76a0d5ee914132625645a90707
1 ccf73b859df7dddc357676bd95436a0b13bdd512
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 0d126f771b88f01f6a28944a5ac1d8a59fabfd62
1 eb53a31a465d1700585a27323fb9618e935e3337
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,14 +1,14
1 1 {
2 2 "format": 1,
3 3 "restore": {
4 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
4 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
5 5 },
6 6 "projects": {
7 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
8 8 "restore": {
9 "projectUniqueName": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
10 10 "projectName": "FNA",
11 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
11 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
12 12 "frameworks": {
13 13 "net48": {
14 14 "projectReferences": {}
@@ -19,20 +19,17
19 19 "net48": {}
20 20 }
21 21 },
22 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
22 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
23 23 "version": "1.0.0",
24 24 "restore": {
25 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
25 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
26 26 "projectName": "SpriteFontPlus",
27 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/home/alys/.nuget/packages/",
29 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
27 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/Users/alys/.nuget/packages/",
29 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
30 30 "projectStyle": "PackageReference",
31 "fallbackFolders": [
32 "/usr/share/dotnet/sdk/NuGetFallbackFolder"
33 ],
34 31 "configFilePaths": [
35 "/home/alys/.config/NuGet/NuGet.Config"
32 "/Users/alys/.config/NuGet/NuGet.Config"
36 33 ],
37 34 "originalTargetFrameworks": [
38 35 "net45"
@@ -43,8 +40,8
43 40 "frameworks": {
44 41 "net45": {
45 42 "projectReferences": {
46 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
47 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
43 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
44 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
48 45 }
49 46 }
50 47 }
@@ -56,7 +53,9
56 53 }
57 54 },
58 55 "frameworks": {
59 "net45": {}
56 "net45": {
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
58 }
60 59 }
61 60 }
62 61 }
Show file before | Show file after | Show commentsHide comments
@@ -4,8 +4,8
4 4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5 5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6 6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/alys/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
9 9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10 10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 11 </PropertyGroup>
Show file before | Show file after | Show commentsHide comments
@@ -26,8 +26,7
26 26 ]
27 27 },
28 28 "packageFolders": {
29 "/home/alys/.nuget/packages/": {},
30 "/usr/share/dotnet/sdk/NuGetFallbackFolder": {}
29 "/Users/alys/.nuget/packages/": {}
31 30 },
32 31 "project": {
33 32 "version": "1.0.0",
Show file before | Show file after | Show commentsHide comments
@@ -19,6 +19,7
19 19 using isometricparkfna.UI;
20 20 using isometricparkfna.Engines;
21 21 using isometricparkfna.Components;
22 using isometricparkfna.Renderers;
22 23
23 24 using ImGuiNET.SampleProgram.XNA;
24 25 using ImGuiNET;
@@ -185,7 +186,7
185 186 var dummy_entity = WorldBuilder.CreateEntity();
186 187
187 188
188 // WorldBuilder.AddGeneralRenderer(new BudgetWindowRenderer(this.batch, this.monoFont));
189 WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
189 190 WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height));
190 191 WorldBuilder.AddEngine(new GameBridgeEngine(this));
191 192 WorldBuilder.AddEngine(new SimulationBridgeEngine(this.simulation));
@@ -196,6 +197,9
196 197 // var budgetWindow = WorldBuilder.CreateEntity();
197 198 // WorldBuilder.SetComponent(budgetWindow, new VisibilityComponent{visible = true});
198 199 // WorldBuilder.SetComponent(budgetWindow, new BudgetComponent());
200
201 var area = WorldBuilder.CreateEntity();
202 WorldBuilder.SetComponent(area, new AreaComponent{squares = new[] {new Vector2(4,4), new Vector2(5,4)}});
199 203
200 204 World = WorldBuilder.Build();
201 205
@@ -638,8 +642,8
638 642 //Tile.drawEdge(batch, new Edge {Start=new Vector2(14, 1), End= new Vector2(15, 1)}, Color.Orange);
639 643
640 644 //donut
641 //Tile.DrawOutlinedSquares(batch, new Vector2[] {new Vector2(19, 1), new Vector2(19, 2), new Vector2(20, 1), new Vector2(21, 1),
642 // new Vector2(21, 2), new Vector2(19, 3), new Vector2(20, 3), new Vector2(21, 3)}, Color.Purple);
645 Tile.DrawOutlinedSquares(batch, new Vector2[] {new Vector2(19, 1), new Vector2(19, 2), new Vector2(20, 1), new Vector2(21, 1),
646 new Vector2(21, 2), new Vector2(19, 3), new Vector2(20, 3), new Vector2(21, 3)}, Color.Purple);
643 647 #endif
644 648
645 649
@@ -699,6 +703,7
699 703 drawTileAt(1, 1, 140, 2);
700 704 drawTileAt(3, 2, 140, 2);
701 705
706 World.Draw();
702 707 batch.End();
703 708
704 709 #region draw_header
@@ -836,7 +841,6
836 841
837 842 #endregion debug_window
838 843
839 World.Draw();
840 844
841 845
842 846 stopWatch.Stop();
Show file before | Show file after | Show commentsHide comments
@@ -45,6 +45,7
45 45 <Compile Include="Components\*.cs" />
46 46 <Compile Include="Engines\*.cs" />
47 47 <Compile Include="Messages\*.cs" />
48 <Compile Include="Renderers\*.cs" />
48 49 <Compile Include="Utils\MathUtils.cs" />
49 50 <Compile Include="Utils\Extensions.cs" />
50 51 <Compile Include="Utils\Extensions.cs" />
You need to be logged in to leave comments. Login now