mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-13 09:17:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Messed up many things

Browse Source
This commit is contained in:
Anuken
2018-04-17 20:04:57 -04:00
parent e7a4ce2e19
commit 434256b0a5
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Tue Apr 17 18:52:07 EDT 2018 #Tue Apr 17 19:48:06 EDT 2018
version=release version=release
androidBuildCode=933 androidBuildCode=947
name=Mindustry name=Mindustry
code=3.5 code=3.5
build=custom build build=custom build

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@ -184,8 +184,6 @@ public class Renderer extends RendererModule{
draw(); draw();
camera.position.set(lastx - deltax, lasty - deltay, 0); camera.position.set(lastx - deltax, lasty - deltay, 0);
} }
} }

9
core/src/io/anuke/mindustry/core/World.java
View File

@ -13,6 +13,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.WorldGenerator; import io.anuke.mindustry.world.WorldGenerator;
import io.anuke.ucore.entities.Entities; import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.modules.Module; import io.anuke.ucore.modules.Module;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp; import io.anuke.ucore.util.Tmp;
@ -156,15 +157,16 @@ public class World extends Module{
} }
public void loadMap(Map map, int seed){ public void loadMap(Map map, int seed){
Log.info("--BEGIN LOAD MAP--");
this.currentMap = map; this.currentMap = map;
this.seed = seed; this.seed = seed;
int width = map.meta.width, height = map.meta.height; int width = map.meta.width, height = map.meta.height;
createTiles(width, height); createTiles(width, height);
Entities.resizeTree(0, 0, width * tilesize, height * tilesize); Entities.resizeTree(0, 0, width * tilesize, height * tilesize);
WorldGenerator.generate(tiles, MapIO.readTileData(map, true)); WorldGenerator.generate(tiles, MapIO.readTileData(map, true));
} }
@ -191,8 +193,7 @@ public class World extends Module{
Mathf.scl2(x2, tilesize), Mathf.scl2(y2, tilesize)); Mathf.scl2(x2, tilesize), Mathf.scl2(y2, tilesize));
} }
/** /**Input is in block coordinates, not world coordinates.
* Input is in block coordinates, not world coordinates.
* @return null if no collisions found, block position otherwise.*/ * @return null if no collisions found, block position otherwise.*/
public GridPoint2 raycast(int x0f, int y0f, int x1, int y1){ public GridPoint2 raycast(int x0f, int y0f, int x1, int y1){
int x0 = x0f; int x0 = x0f;

10
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@ -5,16 +5,18 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.StaticBlock; import io.anuke.mindustry.world.blocks.types.StaticBlock;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.CacheBatch; import io.anuke.ucore.graphics.CacheBatch;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines; import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
import java.util.Arrays; import java.util.Arrays;
@ -109,7 +111,7 @@ public class BlockRenderer{
Draw.color(0, 0, 0, 0.15f); Draw.color(0, 0, 0, 0.15f);
Graphics.flushSurface(); Graphics.flushSurface();
Draw.color(); Draw.color();
Graphics.end(); Graphics.end();
drawCache(DrawLayer.walls, crangex, crangey); drawCache(DrawLayer.walls, crangex, crangey);
Graphics.begin(); Graphics.begin();
@ -204,6 +206,8 @@ public class BlockRenderer{
if(cache == null || cache.length != chunksx || cache[0].length != chunksy){ if(cache == null || cache.length != chunksx || cache[0].length != chunksy){
cache = new int[chunksx][chunksy][DrawLayer.values().length]; cache = new int[chunksx][chunksy][DrawLayer.values().length];
Timers.markNs();
for(DrawLayer layer : DrawLayer.values()){ for(DrawLayer layer : DrawLayer.values()){
for(int x = 0; x < chunksx; x++){ for(int x = 0; x < chunksx; x++){
for(int y = 0; y < chunksy; y++){ for(int y = 0; y < chunksy; y++){
@ -211,6 +215,8 @@ public class BlockRenderer{
} }
} }
} }
Log.info("CACHING ELAPSED: {0}", Timers.elapsedNs());
} }
OrthographicCamera camera = Core.camera; OrthographicCamera camera = Core.camera;

2
core/src/io/anuke/mindustry/io/MapIO.java
View File

@ -110,7 +110,7 @@ public class MapIO {
InputStream stream; InputStream stream;
if (!map.custom) { if (!map.custom) {
stream = Gdx.files.local("maps/" + map.name + "." + mapExtension).read(); stream = Gdx.files.internal("maps/" + map.name + "." + mapExtension).read();
} else { } else {
stream = customMapDirectory.child(map.name + "." + mapExtension).read(); stream = customMapDirectory.child(map.name + "." + mapExtension).read();
} }