From da9278ad8dc2e57930985fd37c8938dd215ca811 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 27 Jan 2019 12:31:14 -0500
Subject: [PATCH] Added recorder module

---
 build.gradle                                      |   1 +
 .../blocks/environment/white-tree-dead.png        | Bin 0 -> 323 bytes
 .../anuke/mindustry/graphics/BlockRenderer.java   |   2 +-
 settings.gradle                                   |   1 +
 tests/src/test/java/power/PowerTests.java         |   6 +++---
 5 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/white-tree-dead.png

diff --git a/build.gradle b/build.gradle
index 249dacf7ba..74c2344817 100644
--- a/build.gradle
+++ b/build.gradle
@@ -194,6 +194,7 @@ project(":core"){
 
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
+        if(localArc()) compile arcModule("extensions:recorder")
 
         compileOnly project(":annotations")
         annotationProcessor project(":annotations")
diff --git a/core/assets-raw/sprites/blocks/environment/white-tree-dead.png b/core/assets-raw/sprites/blocks/environment/white-tree-dead.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0b5b06a24dba401f59dcbf76da120485c27ccdf
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^Ob?L@;=6$l5cR
zfq{Xuz$3Dlfk96hgc&QA+LtjfFtC?+`ns||W|S5bFqqza5oF8-PZ!4!kK=no-wGa9
z;NYEi+Em!Yc!QrYv-E~}e}iqaco!V|q+Tv~|MBC-4^?*Cri$sXtN3}$nI@3(;PZ`#
zWlSpf)*YC*W6o)ZDq|0}kG8fFTjzv+u=?iGe?)V-n90nrt-5<xaK4f|vCma^(&rnF
zG5-`N9|-sQeTt!T_RDOojVdu5EF33{&NP@;KbRZ!{zGHA_|^{9&X99o^iDba{QsQ$
zu4Kli&#N@54y>)petz)QqFbr{ix02y(&@H!Hhm=SzUX~r$Dvi1eD<?%_y2U?_`@yf
ZgeC3!oxC=@U|?Wi@O1TaS?83{1ORmOg027n

literal 0
HcmV?d00001

diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index 6d0e80321d..e13eab8424 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -54,7 +54,7 @@ public class BlockRenderer{
             Draw.proj().setOrtho(0, 0, fog.getWidth(), fog.getHeight());
 
             //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 y = 0; y < world.height(); y++){
                     Tile tile = world.rawTile(x, y);
diff --git a/settings.gradle b/settings.gradle
index cb3b08c8fe..2f0aa64e78 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,6 +25,7 @@ if(System.properties["release"] == null || System.properties["release"] == "fals
         use(':Arc:arc-core', '../Arc/arc-core')
         use(':Arc:extensions', '../Arc/extensions')
         use(':Arc:extensions:freetype', '../Arc/extensions/freetype')
+        use(':Arc:extensions:recorder', '../Arc/extensions/recorder')
         use(':Arc:backends', '../Arc/backends')
         use(':Arc:backends:backend-lwjgl3', '../Arc/backends/backend-lwjgl3')
         use(':Arc:backends:backend-android', '../Arc/backends/backend-android')
diff --git a/tests/src/test/java/power/PowerTests.java b/tests/src/test/java/power/PowerTests.java
index eb529e2cc5..4010f10a9c 100644
--- a/tests/src/test/java/power/PowerTests.java
+++ b/tests/src/test/java/power/PowerTests.java
@@ -52,7 +52,7 @@ public class PowerTests extends PowerTestFixture{
         void simulateDirectConsumption(float producedPower, float requiredPower, float expectedSatisfaction, String parameterDescription){
             Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(producedPower));
             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.add(producerTile);
@@ -141,7 +141,7 @@ public class PowerTests extends PowerTestFixture{
             }
             Tile directConsumerTile = null;
             if(requestedPower > 0.0f){
-                directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requestedPower, 0.6f));
+                directConsumerTile = createFakeTile(0, 1, createFakeDirectConsumer(requestedPower));
                 powerGraph.add(directConsumerTile);
             }
             float maxCapacity = 100f;
@@ -162,7 +162,7 @@ public class PowerTests extends PowerTestFixture{
         void directConsumptionStopsWithNoPower(){
             Tile producerTile = createFakeTile(0, 0, createFakeProducerBlock(10.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.add(producerTile);