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

Added recorder module

Browse Source
This commit is contained in:
Anuken
2019-01-27 12:31:14 -05:00
parent 5a9307e9a7
commit da9278ad8d
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -194,6 +194,7 @@ project(":core"){
compile arcModule("arc-core") compile arcModule("arc-core")
compile arcModule("extensions:freetype") compile arcModule("extensions:freetype")
if(localArc()) compile arcModule("extensions:recorder")
compileOnly project(":annotations") compileOnly project(":annotations")
annotationProcessor project(":annotations") annotationProcessor project(":annotations")

BIN
core/assets-raw/sprites/blocks/environment/white-tree-dead.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

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

@@ -54,7 +54,7 @@ public class BlockRenderer{
Draw.proj().setOrtho(0, 0, fog.getWidth(), fog.getHeight()); Draw.proj().setOrtho(0, 0, fog.getWidth(), fog.getHeight());
//TODO highly inefficient, width*height rectangles isn't great //TODO highly inefficient, width*height rectangles isn't great
//TODO handle shadows with GPU //TODO handle shadow rotation generation with GPU blur/erode algorithm
for(int x = 0; x < world.width(); x++){ for(int x = 0; x < world.width(); x++){
for(int y = 0; y < world.height(); y++){ for(int y = 0; y < world.height(); y++){
Tile tile = world.rawTile(x, y); Tile tile = world.rawTile(x, y);

1
settings.gradle
View File

@@ -25,6 +25,7 @@ if(System.properties["release"] == null || System.properties["release"] == "fals
use(':Arc:arc-core', '../Arc/arc-core') use(':Arc:arc-core', '../Arc/arc-core')
use(':Arc:extensions', '../Arc/extensions') use(':Arc:extensions', '../Arc/extensions')
use(':Arc:extensions:freetype', '../Arc/extensions/freetype') use(':Arc:extensions:freetype', '../Arc/extensions/freetype')
use(':Arc:extensions:recorder', '../Arc/extensions/recorder')
use(':Arc:backends', '../Arc/backends') use(':Arc:backends', '../Arc/backends')
use(':Arc:backends:backend-lwjgl3', '../Arc/backends/backend-lwjgl3') use(':Arc:backends:backend-lwjgl3', '../Arc/backends/backend-lwjgl3')
use(':Arc:backends:backend-android', '../Arc/backends/backend-android') use(':Arc:backends:backend-android', '../Arc/backends/backend-android')

6
tests/src/test/java/power/PowerTests.java
View File

@@ -52,7 +52,7 @@ public class PowerTests extends PowerTestFixture{
void simulateDirectConsumption(float producedPower, float requiredPower, float expectedSatisfaction, String parameterDescription){ void simulateDirectConsumption(float producedPower, float requiredPower, float expectedSatisfaction, String parameterDescription){
Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower)); Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 0.5f; // Currently, 0.5f = 100% producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 0.5f; // Currently, 0.5f = 100%
Tile directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requiredPower, 0.6f)); Tile directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requiredPower));
PowerGraph powerGraph = new PowerGraph(); PowerGraph powerGraph = new PowerGraph();
powerGraph.add(producerTile); powerGraph.add(producerTile);
@@ -141,7 +141,7 @@ public class PowerTests extends PowerTestFixture{
} }
Tile directConsumerTile = null; Tile directConsumerTile = null;
if(requestedPower > 0.0f){ if(requestedPower > 0.0f){
directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requestedPower, 0.6f)); directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requestedPower));
powerGraph.add(directConsumerTile); powerGraph.add(directConsumerTile);
} }
float maxCapacity = 100f; float maxCapacity = 100f;
@@ -162,7 +162,7 @@ public class PowerTests extends PowerTestFixture{
void directConsumptionStopsWithNoPower(){ void directConsumptionStopsWithNoPower(){
Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(10.0f)); Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(10.0f));
producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1.0f; producerTile.<PowerGenerator.GeneratorEntity>entity().productionEfficiency = 1.0f;
Tile consumerTile = createFakeTile(0, 1, createFakeDirectConsumer(5.0f, 0.6f)); Tile consumerTile = createFakeTile(0, 1, createFakeDirectConsumer(5.0f));
PowerGraph powerGraph = new PowerGraph(); PowerGraph powerGraph = new PowerGraph();
powerGraph.add(producerTile); powerGraph.add(producerTile);