alysbrooks-public » games » isometric-park-fna

Commit r176:c06f0519b8b2 public

parent | child
Description:
Fix issues with BudgetWindowRenderer. (grafted from 7992ed911c41c462f47c93592abc80854bdcd8fa)
Commit status:
[Not Reviewed]
References:
add-encompass
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

r176:c06f0519b8b2 -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 eb53a31a465d1700585a27323fb9618e935e3337
1 0d126f771b88f01f6a28944a5ac1d8a59fabfd62
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,14 +1,14
1 {
1 {
2 "format": 1,
2 "format": 1,
3 "restore": {
3 "restore": {
4 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
4 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
5 },
5 },
6 "projects": {
6 "projects": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
7 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
8 "restore": {
8 "restore": {
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
10 "projectName": "FNA",
10 "projectName": "FNA",
11 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
11 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
12 "frameworks": {
12 "frameworks": {
13 "net48": {
13 "net48": {
14 "projectReferences": {}
14 "projectReferences": {}
@@ -19,17 +19,20
19 "net48": {}
19 "net48": {}
20 }
20 }
21 },
21 },
22 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
22 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
23 "version": "1.0.0",
23 "version": "1.0.0",
24 "restore": {
24 "restore": {
25 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
25 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
26 "projectName": "SpriteFontPlus",
26 "projectName": "SpriteFontPlus",
27 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
27 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/Users/alys/.nuget/packages/",
28 "packagesPath": "/home/alys/.nuget/packages/",
29 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
29 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
30 "projectStyle": "PackageReference",
30 "projectStyle": "PackageReference",
31 "fallbackFolders": [
32 "/usr/share/dotnet/sdk/NuGetFallbackFolder"
33 ],
31 "configFilePaths": [
34 "configFilePaths": [
32 "/Users/alys/.config/NuGet/NuGet.Config"
35 "/home/alys/.config/NuGet/NuGet.Config"
33 ],
36 ],
34 "originalTargetFrameworks": [
37 "originalTargetFrameworks": [
35 "net45"
38 "net45"
@@ -40,8 +43,8
40 "frameworks": {
43 "frameworks": {
41 "net45": {
44 "net45": {
42 "projectReferences": {
45 "projectReferences": {
43 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
46 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
44 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
47 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
45 }
48 }
46 }
49 }
47 }
50 }
@@ -53,9 +56,7
53 }
56 }
54 },
57 },
55 "frameworks": {
58 "frameworks": {
56 "net45": {
59 "net45": {}
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
58 }
59 }
60 }
60 }
61 }
61 }
62 }
Show file before | Show file after | Show commentsHide comments
@@ -4,8 +4,8
4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/alys/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 </PropertyGroup>
11 </PropertyGroup>
Show file before | Show file after | Show commentsHide comments
@@ -2,8 +2,57
2 "version": 3,
2 "version": 3,
3 "targets": {
3 "targets": {
4 ".NETFramework,Version=v4.5": {
4 ".NETFramework,Version=v4.5": {
5 "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": {
6 "type": "package",
7 "dependencies": {
8 "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.0"
9 }
10 },
11 "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": {
12 "type": "package",
13 "build": {
14 "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets": {}
15 }
16 },
5 "FNA/1.0.0": {
17 "FNA/1.0.0": {
6 "type": "project",
18 "type": "project",
19 "framework": ".NETFramework,Version=v4.0",
20 "compile": {
21 "bin/placeholder/FNA.dll": {}
22 },
23 "runtime": {
24 "bin/placeholder/FNA.dll": {}
25 }
26 }
27 },
28 ".NETStandard,Version=v2.0": {
29 "Microsoft.NETCore.Platforms/1.1.0": {
30 "type": "package",
31 "compile": {
32 "lib/netstandard1.0/_._": {}
33 },
34 "runtime": {
35 "lib/netstandard1.0/_._": {}
36 }
37 },
38 "NETStandard.Library/2.0.3": {
39 "type": "package",
40 "dependencies": {
41 "Microsoft.NETCore.Platforms": "1.1.0"
42 },
43 "compile": {
44 "lib/netstandard1.0/_._": {}
45 },
46 "runtime": {
47 "lib/netstandard1.0/_._": {}
48 },
49 "build": {
50 "build/netstandard2.0/NETStandard.Library.targets": {}
51 }
52 },
53 "FNA/1.0.0": {
54 "type": "project",
55 "framework": ".NETStandard,Version=v2.0",
7 "compile": {
56 "compile": {
8 "bin/placeholder/FNA.dll": {}
57 "bin/placeholder/FNA.dll": {}
9 },
58 },
@@ -26,19 +75,23
26 ]
75 ]
27 },
76 },
28 "packageFolders": {
77 "packageFolders": {
29 "/Users/alys/.nuget/packages/": {}
78 "/home/alys/.nuget/packages/": {},
79 "/usr/share/dotnet/sdk/NuGetFallbackFolder": {}
30 },
80 },
31 "project": {
81 "project": {
32 "version": "1.0.0",
82 "version": "1.0.0",
33 "restore": {
83 "restore": {
34 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
84 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj",
35 "projectName": "SpriteFontPlus",
85 "projectName": "SpriteFontPlus",
36 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
86 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj",
37 "packagesPath": "/Users/alys/.nuget/packages/",
87 "packagesPath": "/home/alys/.nuget/packages/",
38 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
88 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
39 "projectStyle": "PackageReference",
89 "projectStyle": "PackageReference",
90 "fallbackFolders": [
91 "/usr/share/dotnet/sdk/NuGetFallbackFolder"
92 ],
40 "configFilePaths": [
93 "configFilePaths": [
41 "/Users/alys/.config/NuGet/NuGet.Config"
94 "/home/alys/.nuget/NuGet/NuGet.Config"
42 ],
95 ],
43 "originalTargetFrameworks": [
96 "originalTargetFrameworks": [
44 "net45"
97 "net45"
@@ -49,8 +102,16
49 "frameworks": {
102 "frameworks": {
50 "net45": {
103 "net45": {
51 "projectReferences": {
104 "projectReferences": {
52 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
105 "/home/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": {
53 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
106 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj"
107 }
108 }
109 },
110 "netstandard2.0": {
111 "targetAlias": "netstandard2.0",
112 "projectReferences": {
113 "/home/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": {
114 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj"
54 }
115 }
55 }
116 }
56 }
117 }
@@ -63,7 +124,38
63 },
124 },
64 "frameworks": {
125 "frameworks": {
65 "net45": {
126 "net45": {
66 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
127 "targetAlias": "net45",
128 "dependencies": {
129 "Microsoft.NETFramework.ReferenceAssemblies": {
130 "suppressParent": "All",
131 "target": "Package",
132 "version": "[1.0.0, )",
133 "autoReferenced": true
134 }
135 },
136 "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/5.0.201/RuntimeIdentifierGraph.json"
137 },
138 "netstandard2.0": {
139 "targetAlias": "netstandard2.0",
140 "dependencies": {
141 "NETStandard.Library": {
142 "suppressParent": "All",
143 "target": "Package",
144 "version": "[2.0.3, )",
145 "autoReferenced": true
146 }
147 },
148 "imports": [
149 "net461",
150 "net462",
151 "net47",
152 "net471",
153 "net472",
154 "net48"
155 ],
156 "assetTargetFallback": true,
157 "warn": true,
158 "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/5.0.201/RuntimeIdentifierGraph.json"
67 }
159 }
68 }
160 }
69 }
161 }
Show file before | Show file after | Show commentsHide comments
@@ -1,8 +1,13
1 {
1 {
2 "version": 2,
2 "version": 2,
3 "dgSpecHash": "gXgotR+tCdxp4gWFYvWhps0s2BKsFY31aydyACoOYL9xJr9FiD4ECOWwVi1bEymBXyT5aACFJWDSE3RYOB2Krw==",
3 "dgSpecHash": "Efsuks8cHxqhZCyd6XNLGs8LjwzsxGwqE0aseS+1wuxER/2+SRrNXhamVo8xA0RVHGtDCJZbeU5nmyeDAVj5oQ==",
4 "success": true,
4 "success": true,
5 "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
5 "projectFilePath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj",
6 "expectedPackageFiles": [],
6 "expectedPackageFiles": [
7 "/usr/share/dotnet/sdk/NuGetFallbackFolder/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg.sha512",
8 "/home/alys/.nuget/packages/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512",
9 "/home/alys/.nuget/packages/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512",
10 "/usr/share/dotnet/sdk/NuGetFallbackFolder/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg.sha512"
11 ],
7 "logs": []
12 "logs": []
8 }
13 }
Show file before | Show file after | Show commentsHide comments
@@ -1,4 +1,11
1 using Microsoft.Xna.Framework;
2 using Microsoft.Xna.Framework.Graphics;
3
4 using isometricparkfna.UI;
5 using isometricparkfna.Components;
6
1 using Encompass;
7 using Encompass;
8 using SpriteFontPlus;
2
9
3 namespace isometricparkfna.Renderers
10 namespace isometricparkfna.Renderers
4 {
11 {
@@ -18,7 +25,7
18 public override void Render()
25 public override void Render()
19 {
26 {
20
27
21 var budgetWindow = new BudgetWindow(new Budget { }, this.monoFont, 0, 0);
28 var budgetWindow = new BudgetWindow(new Budget { }, this.font, 0, 0);
22
29
23 foreach (ref readonly var entity in ReadEntities<BudgetComponent>())
30 foreach (ref readonly var entity in ReadEntities<BudgetComponent>())
24 {
31 {
You need to be logged in to leave comments. Login now