alysbrooks-public » games » isometric-park-fna

Commit r124:1ea000e392d0 public

parent | child
Description:
Remove some dead code.
Commit status:
[Not Reviewed]
References:
default
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

r124:1ea000e392d0 -

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 d7f0e37253a74f9e09b0aa45e63a243a5e7640d5
1 ccf73b859df7dddc357676bd95436a0b13bdd512
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 4365fd40af26f6a84e18b3f7cc9703f84189efab
1 eb53a31a465d1700585a27323fb9618e935e3337
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
@@ -5,7 +5,6
5 },
5 },
6 "projects": {
6 "projects": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
8 "version": "1.0.0",
9 "restore": {
8 "restore": {
10 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
11 "projectName": "FNA",
10 "projectName": "FNA",
@@ -54,7 +53,9
54 }
53 }
55 },
54 },
56 "frameworks": {
55 "frameworks": {
57 "net45": {}
56 "net45": {
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
58 }
58 }
59 }
59 }
60 }
60 }
61 }
Show file before | Show file after | Show commentsHide comments
@@ -7,7 +7,7
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.1.0</NuGetToolVersion>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 </PropertyGroup>
11 </PropertyGroup>
12 <PropertyGroup>
12 <PropertyGroup>
13 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
13 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
Show file before | Show file after | Show commentsHide comments
@@ -62,7 +62,9
62 }
62 }
63 },
63 },
64 "frameworks": {
64 "frameworks": {
65 "net45": {}
65 "net45": {
66 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
67 }
66 }
68 }
67 }
69 }
68 } No newline at end of file
70 }
Show file before | Show file after | Show commentsHide comments
@@ -1,13 +1,8
1 {
1 {
2 "version": 2,
2 "version": 2,
3 "dgSpecHash": "Jvo88cLyNvFTWWYROD/x2aycV9834tUcxzVkPfCY2PJ4jsQJZaa+i/VrEjCdsSictNeWCYKaMokGY5EFY72cqg==",
3 "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==",
4 "success": true,
4 "success": true,
5 "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj",
5 "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
6 "expectedPackageFiles": [
6 "expectedPackageFiles": [],
7 "/Users/alys/.nuget/packages/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg.sha512",
8 "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512",
9 "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512",
10 "/Users/alys/.nuget/packages/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg.sha512"
11 ],
12 "logs": []
7 "logs": []
13 } No newline at end of file
8 }
Show file before | Show file after | Show commentsHide comments
@@ -10,10 +10,9
10 //blatantly stolen from XNA resources.com
10 //blatantly stolen from XNA resources.com
11 static public int TileWidth = 64;
11 static public int TileWidth = 64;
12 static public int TileHeight = 64;
12 static public int TileHeight = 64;
13 static public int TileStepX = 64;
13 // static public int TileStepX = 64;
14 static public int TileStepY = 16;
14 // static public int TileStepY = 16;
15 static public int OddRowXOffset = 32;
15 //static public int OddRowXOffset = 32;
16 static public int HeightTileOffset = 32;
17
16
18 static public int TileSpriteWidth = 64;
17 static public int TileSpriteWidth = 64;
19 static public int TileSpriteHeight = 32;
18 static public int TileSpriteHeight = 32;
@@ -40,8 +39,6
40 return new Rectangle(tileX * TileWidth, tileY * TileHeight, TileWidth, TileHeight*height);
39 return new Rectangle(tileX * TileWidth, tileY * TileHeight, TileWidth, TileHeight*height);
41 }
40 }
42
41
43
44
45 static public void OutlineSquare(SpriteBatch batch, float x, float y, Color color)
42 static public void OutlineSquare(SpriteBatch batch, float x, float y, Color color)
46 {
43 {
47 Tile.OutlineSquare(batch, x, y, color, 1);
44 Tile.OutlineSquare(batch, x, y, color, 1);
@@ -82,52 +79,8
82 }
79 }
83
80
84
81
85
86 // protected void drawTileAt(int x, int y, int tileIndex, int height)
87 // {
88 // float maxdepth = ((this.squaresAcross + 1) + ((this.squaresDown + 1) * Tile.TileWidth)) * 10;
89
90 // float depthOffset = 0.7f - ((0 + (0 * Tile.TileWidth)) / maxdepth);
91
92 // Tile.drawTileAt(x, y, tileIndex, height, depthOffset);
93 // }
94
95
96
97 public static void drawTileAt(SpriteBatch batch, int x, int y, int tileIndex, int height, float depth)
82 public static void drawTileAt(SpriteBatch batch, int x, int y, int tileIndex, int height, float depth)
98 {
83 {
99 /*
100 Vector2 firstSquare = Vector2.Zero;
101 Vector2 squareOffset = Vector2.Zero;
102
103 int offsetX = (int)squareOffset.X;
104 int offsetY = (int)squareOffset.Y;
105 int firstX = (int)firstSquare.X;
106 int firstY = (int)firstSquare.Y;
107 int rowOffset = 0;
108 float maxdepth = ((this.squaresAcross + 1) + ((this.squaresDown + 1) * Tile.TileWidth)) * 10;
109
110
111 int mapx = (firstX + x);
112 int mapy = (firstY + y);
113 float depthOffset = 0.7f - ((mapx + (mapy * Tile.TileWidth)) / maxdepth);
114
115 if ((firstY + y) % 2 == 1)
116 rowOffset = Tile.OddRowXOffset;
117
118 batch.Draw(
119 Tile.TileSetTexture,
120 new Rectangle(
121 (x * Tile.TileStepX) - offsetX + rowOffset + baseOffsetX,
122 (y * Tile.TileStepY) - offsetY + baseOffsetY-(Tile.TileHeight*(height-1)),
123 Tile.TileWidth, Tile.TileHeight*height),
124 Tile.GetExtendedSourceRectangle(tileIndex, height),
125 Color.White,
126 0.0f,
127 Vector2.Zero,
128 SpriteEffects.None,
129 depthOffset);
130 */
131
84
132 int height_adjust = 0;
85 int height_adjust = 0;
133
86
You need to be logged in to leave comments. Login now