Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-16 20:09:55 -04:00
parent fc1b03f322 91b4fb1c97
commit 962d0729d6
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/src/mindustry/graphics/g3d/PlanetGrid.java
View File

@@ -22,15 +22,16 @@ public class PlanetGrid{
{5, 3, 10, 1, 4}, {2, 5, 4, 0, 11}, {3, 7, 6, 1, 8}, {7, 2, 9, 0, 6} {5, 3, 10, 1, 4}, {2, 5, 4, 0, 11}, {3, 7, 6, 1, 8}, {7, 2, 9, 0, 6}
}; };
public final int size; public int size;
public final Ptile[] tiles; public Ptile[] tiles;
public final Corner[] corners; public Corner[] corners;
public final Edge[] edges; public Edge[] edges;
PlanetGrid(int size){ //this is protected so if you want to make strange grids you should know what you're doing.
protected PlanetGrid(int size){
this.size = size; this.size = size;
tiles = new Ptile[Buildingount(size)]; tiles = new Ptile[tileCount(size)];
for(int i = 0; i < tiles.length; i++){ for(int i = 0; i < tiles.length; i++){
tiles[i] = new Ptile(i, i < 12 ? 5 : 6); tiles[i] = new Ptile(i, i < 12 ? 5 : 6);
} }
@@ -67,7 +68,7 @@ public class PlanetGrid{
return result; return result;
} }
static PlanetGrid initialGrid(){ public static PlanetGrid initialGrid(){
PlanetGrid grid = new PlanetGrid(0); PlanetGrid grid = new PlanetGrid(0);
for(Ptile t : grid.tiles){ for(Ptile t : grid.tiles){
@@ -111,7 +112,7 @@ public class PlanetGrid{
return grid; return grid;
} }
static PlanetGrid subdividedGrid(PlanetGrid prev){ public static PlanetGrid subdividedGrid(PlanetGrid prev){
PlanetGrid grid = new PlanetGrid(prev.size + 1); PlanetGrid grid = new PlanetGrid(prev.size + 1);
int prevTiles = prev.tiles.length; int prevTiles = prev.tiles.length;
@@ -207,7 +208,7 @@ public class PlanetGrid{
return -1; return -1;
} }
static int Buildingount(int size){ static int tileCount(int size){
return 10 * Mathf.pow(3, size) + 2; return 10 * Mathf.pow(3, size) + 2;
} }
@@ -220,12 +221,12 @@ public class PlanetGrid{
} }
public static class Ptile{ public static class Ptile{
public final int id; public int id;
public final int edgeCount; public int edgeCount;
public final Ptile[] tiles; public Ptile[] tiles;
public final Corner[] corners; public Corner[] corners;
public final Edge[] edges; public Edge[] edges;
public Vec3 v = new Vec3(); public Vec3 v = new Vec3();
@@ -240,11 +241,11 @@ public class PlanetGrid{
} }
public static class Corner{ public static class Corner{
public final int id; public int id;
public final Ptile[] tiles = new Ptile[3]; public Ptile[] tiles = new Ptile[3];
public final Corner[] corners = new Corner[3]; public Corner[] corners = new Corner[3];
public final Edge[] edges = new Edge[3]; public Edge[] edges = new Edge[3];
public final Vec3 v = new Vec3(); public Vec3 v = new Vec3();
public Corner(int id){ public Corner(int id){
this.id = id; this.id = id;
@@ -252,9 +253,9 @@ public class PlanetGrid{
} }
public static class Edge{ public static class Edge{
public final int id; public int id;
public final Ptile[] tiles = new Ptile[2]; public Ptile[] tiles = new Ptile[2];
public final Corner[] corners = new Corner[2]; public Corner[] corners = new Corner[2];
public Edge(int id){ public Edge(int id){
this.id = id; this.id = id;