alysbrooks-public » games » isometric-park-fna

Commit r56:4a106ab89830 public

parent | child
Description:
Make budget window move more easily.
Commit status:
[Not Reviewed]
References:
m1-money
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

r56:4a106ab89830 -

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
@@ -8,7 +8,12
8 "restore": {
8 "restore": {
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/Users/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": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
12 "frameworks": {
13 "net48": {
14 "projectReferences": {}
15 }
16 }
12 },
17 },
13 "frameworks": {
18 "frameworks": {
14 "net48": {}
19 "net48": {}
@@ -34,7 +39,6
34 },
39 },
35 "frameworks": {
40 "frameworks": {
36 "net45": {
41 "net45": {
37 "targetAlias": "net45",
38 "projectReferences": {
42 "projectReferences": {
39 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
43 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
40 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
44 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
@@ -50,8 +54,7
50 },
54 },
51 "frameworks": {
55 "frameworks": {
52 "net45": {
56 "net45": {
53 "targetAlias": "net45",
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
54 "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.102/RuntimeIdentifierGraph.json"
55 }
58 }
56 }
59 }
57 }
60 }
Show file before | Show file after | Show commentsHide comments
@@ -7,11 +7,8
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.8.0</NuGetToolVersion>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 </PropertyGroup>
11 </PropertyGroup>
12 <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
13 <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
14 </ItemGroup>
15 <PropertyGroup>
12 <PropertyGroup>
16 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
13 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
17 </PropertyGroup>
14 </PropertyGroup>
Show file before | Show file after | Show commentsHide comments
@@ -48,7 +48,6
48 },
48 },
49 "frameworks": {
49 "frameworks": {
50 "net45": {
50 "net45": {
51 "targetAlias": "net45",
52 "projectReferences": {
51 "projectReferences": {
53 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
52 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
54 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
53 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
@@ -64,8 +63,7
64 },
63 },
65 "frameworks": {
64 "frameworks": {
66 "net45": {
65 "net45": {
67 "targetAlias": "net45",
66 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
68 "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.102/RuntimeIdentifierGraph.json"
69 }
67 }
70 }
68 }
71 }
69 }
Show file before | Show file after | Show commentsHide comments
@@ -1,6 +1,6
1 {
1 {
2 "version": 2,
2 "version": 2,
3 "dgSpecHash": "QbljAP9YfnlfGt9DK+paIbf2KN67CHfFFP459FIA09f6Vs2u4/bm6jOZkhaagMtqNxlEucQ1En4ss24qjT71BA==",
3 "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==",
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": [],
Show file before | Show file after | Show commentsHide comments
@@ -42,23 +42,18
42 else
42 else
43 {
43 {
44 this.mouseEnd = new Vector2(mouseCur.X, mouseCur.Y);
44 this.mouseEnd = new Vector2(mouseCur.X, mouseCur.Y);
45 this.x = MathUtils.Clamp(this.x + (int)(this.mouseEnd.X - this.mouseStart.X), 0, 700);
46 this.y = MathUtils.Clamp(this.y + (int)(this.mouseEnd.Y - this.mouseStart.Y), 0, 400);
45 }
47 }
46 }
48 }
47 else if (mousePrev.LeftButton == ButtonState.Pressed)
49 else if (mousePrev.LeftButton == ButtonState.Pressed)
48 {
50 {
49 this.x = MathUtils.Clamp(this.x + (int)(this.mouseEnd.X - this.mouseStart.X), 0, 700);
50 this.y = MathUtils.Clamp(this.y + (int)(this.mouseEnd.Y - this.mouseStart.Y), 0, 400);
51
51
52 }
52 }
53 this.mouseStart = new Vector2(mouseCur.X, mouseCur.Y);
53
54
54 this.mousePrev = mouseCur;
55 this.mousePrev = mouseCur;
55
56
56 //if ((mouseCur.LeftButton == ButtonState.Pressed)
57 // && MathUtils.Between(mouseCur.X, x, 700 + x)
58 // && MathUtils.Between(mouseCur.Y, y, 500 + y))
59 //{
60 // this.x += 50;
61 //}
62 }
57 }
63
58
64 public void draw(SpriteBatch batch)
59 public void draw(SpriteBatch batch)
Show file before | Show file after | Show commentsHide comments
@@ -875,8 +875,7
875 debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window);
875 debugWindow.Layout(debugInfo, additionalInfo, ref show_another_window);
876
876
877
877
878 debugWindow.ImGuiLayout();
878 //debugWindow.ImGuiLayout();
879
880 //String[] messages = { "Message1", "Message2" };
879 //String[] messages = { "Message1", "Message2" };
881
880
882 //DialogOption[] dialog = { new DialogOption{ response="Welcome to your new park, director! You can use the mouse or arrow keys to move around, and the plus and minus keys to zoom in and out.", choice="Okay" },
881 //DialogOption[] dialog = { new DialogOption{ response="Welcome to your new park, director! You can use the mouse or arrow keys to move around, and the plus and minus keys to zoom in and out.", choice="Okay" },
@@ -912,7 +911,7
912
911
913 //Upper right
912 //Upper right
914 //float x = this.mouseGrid.X;
913 //float x = this.mouseGrid.X;
915 //float y = this.mouseGrid.Y;
914 //float y = this.mouseGrid.Y;
916 Line.drawLine(batch,
915 Line.drawLine(batch,
917 new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2,
916 new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2,
918 //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
917 //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
You need to be logged in to leave comments. Login now