Merge branch 'gradle-migration-1'

This commit is contained in:
minjaesong
2018-12-02 23:01:25 +09:00
19 changed files with 840 additions and 7 deletions

View File

@@ -234,7 +234,7 @@ public class AppLoader implements ApplicationListener {
}
// nested FBOs are just not a thing in GL!
FrameBufferManager.end();
net.torvald.terrarum.FrameBufferManager.end();
PostProcessor.INSTANCE.draw(camera.combined, renderFBO);

View File

@@ -0,0 +1,37 @@
package net.torvald.terrarum.tests
import net.torvald.terrarum.modulebasegame.gameworld.WorldTime
//import org.junit.Test
/**
* Created by minjaesong on 2018-12-02.
*/
class TestWorldTime {
val time = WorldTime(WorldTime.DAY_LENGTH * 118L + 86398)
//@Test
fun testEndOfYear() {
repeat(5) {
println(time.getFormattedTime())
time.addTime(1)
}
println()
time.addTime(86400 - 5)
repeat(5) {
println(time.getFormattedTime())
time.addTime(1)
}
}
}
fun main(args: Array<String>) {
TestWorldTime().testEndOfYear()
}

View File

@@ -37,6 +37,9 @@ import kotlin.system.measureNanoTime
* own ingame renderer
*/
object LightmapRenderer {
// FIXME lightmap shifts to left, ONLY AT x=33.5-34.5
private lateinit var world: GameWorld
/** do not call this yourself! Let your game renderer handle this! */